0.8.0 Milestone 9 Release

* use names from values for operator/service role #17
eclipse-theia · Apr 20, 2023 · 5049365 · 5049365
1 parent aef6baa
commit 5049365
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 23 deletions.
diff --git a/charts/theia.cloud-base/Chart.yaml b/charts/theia.cloud-base/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.8.0-MS8v2
+version: 0.8.0-MS9v1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.8.0-MS8"
+appVersion: "0.8.0-MS9"
diff --git a/charts/theia.cloud/Chart.yaml b/charts/theia.cloud/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.8.0-MS8v2
+version: 0.8.0-MS9v1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.8.0-MS8"
+appVersion: "0.8.0-MS9"
diff --git a/charts/theia.cloud/crds/appdefinition-spec-resource.yaml b/charts/theia.cloud/crds/appdefinition-spec-resource.yaml
@@ -11,7 +11,7 @@ spec:
     singular: appdefinition
   scope: Namespaced
   versions:
-    - name : v4beta
+    - name: v5beta
       served: true
       storage: true
       schema:
@@ -45,9 +45,9 @@ spec:
                 timeout:
                   type: object
                   properties:
-                    strategy: 
+                    strategy:
                       type: string
-                    limit: 
+                    limit:
                       type: integer
                 requestsMemory:
                   type: string
@@ -75,7 +75,59 @@ spec:
                           type: integer
                         notifyAfter:
                           type: integer
-    - name : v3beta
+    - name: v4beta
+      served: true
+      storage: false
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              properties:
+                name:
+                  type: string
+                image:
+                  type: string
+                imagePullPolicy:
+                  type: string
+                  enum: ["Always", "IfNotPresent", "Never"]
+                pullSecret:
+                  type: string
+                uid:
+                  type: integer
+                port:
+                  type: integer
+                host:
+                  type: string
+                ingressname:
+                  type: string
+                minInstances:
+                  type: integer
+                maxInstances:
+                  type: integer
+                timeout:
+                  type: object
+                  properties:
+                    strategy:
+                      type: string
+                    limit:
+                      type: integer
+                requestsMemory:
+                  type: string
+                requestsCpu:
+                  type: string
+                limitsMemory:
+                  type: string
+                limitsCpu:
+                  type: string
+                downlinkLimit:
+                  type: integer
+                uplinkLimit:
+                  type: integer
+                mountPath:
+                  type: string
+    - name: v3beta
       served: true
       storage: false
       schema:
@@ -106,9 +158,9 @@ spec:
                 timeout:
                   type: object
                   properties:
-                    strategy: 
+                    strategy:
                       type: string
-                    limit: 
+                    limit:
                       type: integer
                 requestsMemory:
                   type: string
@@ -124,7 +176,7 @@ spec:
                   type: integer
                 mountPath:
                   type: string
-    - name : v2beta
+    - name: v2beta
       served: true
       storage: false
       schema:
@@ -168,7 +220,7 @@ spec:
                   type: integer
                 mountPath:
                   type: string
-    - name : v1beta
+    - name: v1beta
       served: true
       storage: false
       schema:
@@ -208,4 +260,3 @@ spec:
                   type: integer
                 uplinkLimit:
                   type: integer
-
diff --git a/charts/theia.cloud/templates/operator-role.yaml b/charts/theia.cloud/templates/operator-role.yaml
@@ -1,12 +1,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: operator-api-access-{{ .Release.Namespace }}
+  name: {{ .Values.operatorrole.name }}-{{ .Release.Namespace }}
   namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: operator-api-access
+  name: {{ .Values.operatorrole.name }}
 subjects:
 - kind: ServiceAccount
   name: operator-api-service-account

diff --git a/charts/theia.cloud/templates/service-role.yaml b/charts/theia.cloud/templates/service-role.yaml
@@ -1,12 +1,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: service-api-access
+  name: {{ .Values.servicerole.name }}
   namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: service-api-access
+  name: {{ .Values.servicerole.name }}
 subjects:
 - kind: ServiceAccount
   name: service-api-service-account

diff --git a/charts/theia.cloud/templates/theia-appdefinition-spec.yaml b/charts/theia.cloud/templates/theia-appdefinition-spec.yaml
@@ -1,4 +1,4 @@
-apiVersion: theia.cloud/v4beta
+apiVersion: theia.cloud/v5beta
 kind: AppDefinition
 metadata:
   name: theia-cloud-demo

diff --git a/charts/theia.cloud/values.yaml b/charts/theia.cloud/values.yaml
@@ -26,7 +26,7 @@ issuer:
 # Docker image of the main application
 image:
   # The name of docker image to be used
-  name: theiacloud/theia-cloud-demo:0.8.0.MS8
+  name: theiacloud/theia-cloud-demo:0.8.0.MS9
 
   # Optional: Override the imagePullPolicy for the main application's docker image.
   # If this is omitted or empty, the root at .Values.imagePullPolicy is used.
@@ -82,7 +82,7 @@ hosts:
 # Values related to the landing page
 landingPage:
   # the landing page image to use
-  image: theiacloud/theia-cloud-landing-page:0.8.0.MS8
+  image: theiacloud/theia-cloud-landing-page:0.8.0.MS9
 
   # Optional: Override the imagePullPolicy for the landing page's docker image.
   # If this is omitted or empty, the root at .Values.imagePullPolicy is used.
@@ -136,7 +136,7 @@ keycloak:
 # Values related to the operator
 operator:
   # The operator image
-  image: theiacloud/theia-cloud-operator:0.8.0.MS8
+  image: theiacloud/theia-cloud-operator:0.8.0.MS9
 
   # Optional: Override the imagePullPolicy for the operator's docker image.
   # If this is omitted or empty, the root at .Values.imagePullPolicy is used.
@@ -165,7 +165,7 @@ operator:
   bandwidthLimiter: "K8SANNOTATION"
 
   # If bandwidthLimiter is set to WONDERSHAPER or K8SANNOTATIONANDWONDERSHAPER this image will be used for the wondershaper init container
-  wondershaperImage: theiacloud/theia-cloud-wondershaper:0.8.0.MS8
+  wondershaperImage: theiacloud/theia-cloud-wondershaper:0.8.0.MS9
 
   # Set the number of active sessions a single user can launch
   sessionsPerUser: "1"
@@ -183,7 +183,7 @@ operator:
 # Values of the Theia.cloud REST service
 service:
   # The image to use
-  image: theiacloud/theia-cloud-service:0.8.0.MS8
+  image: theiacloud/theia-cloud-service:0.8.0.MS9
 
   # Optional: Override the imagePullPolicy for the service's docker image.
   # If this is omitted or empty, the root at .Values.imagePullPolicy is used.