0.8.0 Milestone 9 Release

* add values to configure monitor * use names from values for operator/service role #17
eclipse-theia · Mar 28, 2023 · 71d81cb · 71d81cb
1 parent 045cb98
commit 71d81cb
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 19 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:
@@ -72,6 +72,58 @@ spec:
                       type: integer
                     port:
                       type: integer
+    - 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

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
@@ -28,6 +28,6 @@ spec:
   uplinkLimit: 30000
   mountPath: "/home/project/persisted"
   monitor:
-    timeoutAfter: 30
-    notifyAfter: 25
-    port: 8081
+    timeoutAfter: {{ tpl (.Values.image.monitor.timeoutAfter | toString) . }}
+    notifyAfter: {{ tpl (.Values.image.monitor.notifyAfter | toString) . }}
+    port: {{ tpl (.Values.image.monitor.port | toString) . }}
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.
@@ -35,15 +35,29 @@ image:
   # the image pull secret. Leave empty if registry is public
   pullSecret: ""
 
+  # Deprecated! Will be replaced by monitor in AppDefinition.
+  # 
   # Configures how sessions will be stopped. This defines the strategy and the limit in minutes and will override any specification from an appDefinition.
   # Possible values for strategy:
   # - FIXEDTIME   Sessions will be stopped after a fixed limit
-  # - INACTIVITY  Sessions will be stopped after user inactivity limit
+  # - INACTIVITY  Non-functional because of deprecation: Sessions will be stopped after user inactivity limit
   timeoutStrategy: "FIXEDTIME"
 
   # Limit in minutes
   timeoutLimit: "30"
 
+  # Configures the monitor options
+  monitor:
+
+    # Timeout after inactivity
+    timeoutAfter: 30
+
+    # Warn users about shutdown after inactivity
+    notifyAfter: 25
+
+    # Port of the monitor extension
+    port: 8081
+
 # You may adjust the hostname below.
 hosts:
 
@@ -84,7 +98,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.
@@ -138,7 +152,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.
@@ -167,7 +181,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"
@@ -185,7 +199,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.
@@ -210,6 +224,19 @@ ingress:
   # common-name
   theiaCloudCommonName: false
 
+# Theia Cloud Monitor
+monitor:
+
+  # Whether to enable the monitor
+  enable: true
+
+  activityTracker:
+    # Whether to enable the activity tracker
+    enable: false
+
+    # Internal in minutes to check for activity
+    interval: 1
+
 operatorrole:
   name: operator-api-access