Skip to content

Commit

Permalink
Add operator.oAuth2ProxyVersion to main chart and update to applicati…
Browse files Browse the repository at this point in the history 
…on 0.8.1.MS3 (#44)

- Add operator.oAuth2ProxyVersion to theia cloud helm chart
  - This can be used to configure the version of the quay.io/oauth2-proxy/oauth2-proxy docker image.
    This is used for the oauth proxy of the session pods.
- Update version and regenerate README
- Update application version to Theia Cloud 0.8.1.MS3
  • Loading branch information
@sgraband
sgraband authored Oct 27, 2023
1 parent 2c7fe9e commit 4b0260f
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 30 deletions.
4 changes: 2 additions & 2 deletions charts/theia-cloud-crds/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.1-v004-MS2
version: 0.8.1-v004-MS3

# 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.1.MS2"
appVersion: "0.8.1.MS3"
4 changes: 2 additions & 2 deletions charts/theia.cloud-base/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.1-v004-MS2
version: 0.8.1-v004-MS3

# 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.1.MS2"
appVersion: "0.8.1.MS3"
4 changes: 2 additions & 2 deletions charts/theia.cloud-base/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# theia-cloud-base

![Version: 0.8.1-v004-MS2](https://img.shields.io/badge/Version-0.8.1--v004--MS2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.1.MS2](https://img.shields.io/badge/AppVersion-0.8.1.MS2-informational?style=flat-square)
![Version: 0.8.1-v004-MS3](https://img.shields.io/badge/Version-0.8.1--v004--MS3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.1.MS3](https://img.shields.io/badge/AppVersion-0.8.1.MS3-informational?style=flat-square)

Theia-cloud base chart

Expand All @@ -15,4 +15,4 @@ Theia-cloud base chart
| servicerole.name | string | `"service-api-access"` | name for the services' cluster role |

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3)
4 changes: 2 additions & 2 deletions charts/theia.cloud/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.1-v008-MS2
version: 0.8.1-v009-MS3

# 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.1.MS2"
appVersion: "0.8.1.MS3"
18 changes: 10 additions & 8 deletions charts/theia.cloud/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# theia-cloud

![Version: 0.8.1-v008-MS2](https://img.shields.io/badge/Version-0.8.1--v008--MS2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.1.MS2](https://img.shields.io/badge/AppVersion-0.8.1.MS2-informational?style=flat-square)
![Version: 0.8.1-v009-MS3](https://img.shields.io/badge/Version-0.8.1--v009--MS3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.1.MS3](https://img.shields.io/badge/AppVersion-0.8.1.MS3-informational?style=flat-square)

A Helm chart for Theia.cloud

Expand All @@ -16,6 +16,7 @@ A Helm chart for Theia.cloud
| hosts | object | (see details below) | You may adjust the hostname below. |
| hosts.instance | string | `"ws.192.168.39.173.nip.io"` | hostname for the launched Theia-applications |
| hosts.landing | string | `"theia.cloud.192.168.39.173.nip.io"` | hostname of the landing page |
| hosts.paths | object | (see details below) | Only needed when usePaths == true. Contains the baseHost and paths for all services |
| hosts.paths.baseHost | string | `"192.168.39.173.nip.io"` | baseHost configures the host for all services when usePaths == true. Otherwise the explicit host definitions of the services are used. |
| hosts.paths.instance | string | `"instances"` | path for deployed instances |
| hosts.paths.landing | string | `"trynow"` | path of the landing page |
Expand All @@ -28,7 +29,7 @@ A Helm chart for Theia.cloud
| hosts.useServicePortInHostname | bool | `false` | whether the service port needs to be part of the service URL (default: false) |
| image | object | (see details below) | Docker image of the main application |
| image.imagePullPolicy | string | `nil` | Optional: Override the imagePullPolicy for the main application's docker image. If this is omitted or empty, the root at .Values.imagePullPolicy is used. |
| image.name | string | `"theiacloud/theia-cloud-demo:0.8.1.MS2"` | The name of docker image to be used |
| image.name | string | `"theiacloud/theia-cloud-demo:0.8.1.MS3"` | The name of docker image to be used |
| image.pullSecret | string | `""` | the image pull secret. Leave empty if registry is public |
| image.timeoutLimit | string | `"30"` | Limit in minutes |
| image.timeoutStrategy | string | `"FIXEDTIME"` | 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 |
Expand All @@ -50,10 +51,10 @@ A Helm chart for Theia.cloud
| keycloak.enable | bool | `false` | Whether keycloak authentication shall be used |
| keycloak.realm | string | `"TheiaCloud"` | The Keycloak Realm. Only has to be specified when enable: true |
| landingPage | object | (see details below) | Values related to the landing page |
| landingPage.additionalApps | string | `nil` | The page may show these additional apps in a drop down. This is a map. The key maps to the app definition name The value is the label that is supposed to be shown in the UI Example: different-app-definition: label: "Different App Definition" further-app-definition: label: "Further App Definition" |
| landingPage.additionalApps | string | `nil` | The page may show these additional apps in a drop down. This is a map. The key maps to the app definition name The value is the label that is supposed to be shown in the UI Example: different-app-definition: label: "Different App Definition" further-app-definition: label: "Further App Definition" |
| landingPage.appDefinition | string | `"theia-cloud-demo"` | the app id to launch |
| landingPage.ephemeralStorage | bool | `true` | If set to true no persisted storage is used when creating sessions on the landing page. Set to false if you want to use persisted storage. |
| landingPage.image | string | `"theiacloud/theia-cloud-landing-page:0.8.1.MS2"` | the landing page image to use |
| landingPage.image | string | `"theiacloud/theia-cloud-landing-page:0.8.1.MS3"` | the landing page image to use |
| landingPage.imagePullPolicy | string | `nil` | Optional: Override the imagePullPolicy for the landing page's docker image. If this is omitted or empty, the root at .Values.imagePullPolicy is used. |
| landingPage.imagePullSecret | string | `nil` | Optional: the image pull secret |
| monitor | object | (see details below) | Values to influence the monitor |
Expand All @@ -69,23 +70,24 @@ A Helm chart for Theia.cloud
| operator.cloudProvider | string | `"K8S"` | Select your cloud provider. Possible values: - K8S Plain Kubernetes - MINIKUBE Local deployment on Minikube |
| operator.continueOnException | bool | `false` | Whether the operator should stop in cases where an exception is not handled |
| operator.eagerStart | bool | `false` | Whether theia applications shall be started eager. This means that the application is already running without a user. When a user requests a new session, one of the already launched ones is assigned. Currently only false is fully supported. |
| operator.image | string | `"theiacloud/theia-cloud-operator:0.8.1.MS2v2"` | The operator image |
| operator.image | string | `"theiacloud/theia-cloud-operator:0.8.1.MS3v2"` | The operator image |
| operator.imagePullPolicy | string | `nil` | Optional: Override the imagePullPolicy for the operator's docker image. If this is omitted or empty, the root at .Values.imagePullPolicy is used. |
| operator.imagePullSecret | string | `nil` | Optional: the image pull secret |
| operator.leaderElection | object | (see details below) | Options to influence the operator's leader election |
| operator.logging | object | (see details below) | Allows to override the operator's log4j configuration |
| operator.maxWatchIdleTime | string | `"3600000"` | Configures the timeout in milliseconds when a watcher for either AppDefinitions, Workspaces, or Sessions is assumed to be not working. When this is detected the operator instance will stop and a new operator will set up fresh watchers. |
| operator.oAuth2ProxyVersion | string | `"v7.5.1"` | The version to use of the quay.io/oauth2-proxy/oauth2-proxy image |
| operator.replicas | int | `2` | Number of operator instances to create |
| operator.requestedStorage | string | `"250Mi"` | The amount of requested storage for each persistent volume claim (PVC) for workspaces. This is directly passed to created PVCs and must be a valid Kubernetes quantity. See https://kubernetes.io/docs/reference/kubernetes-api/common-definitions/quantity/ |
| operator.sessionsPerUser | string | `"1"` | Set the number of active sessions a single user can launch |
| operator.storageClassName | string | `"default"` | The name of the storage class for persistent volume claims for workspaces. This storage class must be present on the cluster. Most cloud providers offer a default storage class without additional configuration. |
| operator.wondershaperImage | string | `"theiacloud/theia-cloud-wondershaper:0.8.1.MS2"` | If bandwidthLimiter is set to WONDERSHAPER or K8SANNOTATIONANDWONDERSHAPER this image will be used for the wondershaper init container |
| operator.wondershaperImage | string | `"theiacloud/theia-cloud-wondershaper:0.8.1.MS3"` | If bandwidthLimiter is set to WONDERSHAPER or K8SANNOTATIONANDWONDERSHAPER this image will be used for the wondershaper init container |
| operatorrole.name | string | `"operator-api-access"` | |
| service | object | (see details below) | Values of the Theia.cloud REST service |
| service.image | string | `"theiacloud/theia-cloud-service:0.8.1.MS2"` | The image to use |
| service.image | string | `"theiacloud/theia-cloud-service:0.8.1.MS3"` | The image to use |
| service.imagePullPolicy | string | `nil` | Optional: Override the imagePullPolicy for the service's docker image. If this is omitted or empty, the root at .Values.imagePullPolicy is used. |
| service.imagePullSecret | string | `nil` | Optional: the image pull secret |
| servicerole.name | string | `"service-api-access"` | |

----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3)
4 changes: 4 additions & 0 deletions charts/theia.cloud/templates/operator.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ spec:
- "{{ tpl (.Values.operator.leaderElection.retryPeriod | toString) . }}"
- "--maxWatchIdleTime"
- "{{ tpl (.Values.operator.maxWatchIdleTime | toString) . }}"
{{- if .Values.operator.oAuth2ProxyVersion }}
- "--oAuth2ProxyVersion"
- "{{ tpl (.Values.operator.oAuth2ProxyVersion | toString) . }}"
{{- end }}
{{- if .Values.operator.continueOnException }}
- "--continueOnException"
{{- end }}
Expand Down
31 changes: 17 additions & 14 deletions charts/theia.cloud/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ issuer:
# @default -- (see details below)
image:
# -- The name of docker image to be used
name: theiacloud/theia-cloud-demo:0.8.1.MS2
name: theiacloud/theia-cloud-demo:0.8.1.MS3

# -- Optional: Override the imagePullPolicy for the main application's docker image.
# If this is omitted or empty, the root at .Values.imagePullPolicy is used.
imagePullPolicy:
imagePullPolicy:

# -- the image pull secret. Leave empty if registry is public
pullSecret: ""
Expand All @@ -66,7 +66,7 @@ hosts:
tls: true

# -- Only needed when usePaths == true. Contains the baseHost and paths for all services
# @default -- (see details below)
# @default -- (see details below)
paths:
# -- baseHost configures the host for all services when usePaths == true. Otherwise the explicit host definitions of the services are used.
baseHost: 192.168.39.173.nip.io
Expand Down Expand Up @@ -99,14 +99,14 @@ hosts:
# @default -- (see details below)
landingPage:
# -- the landing page image to use
image: theiacloud/theia-cloud-landing-page:0.8.1.MS2
image: theiacloud/theia-cloud-landing-page:0.8.1.MS3

# -- Optional: Override the imagePullPolicy for the landing page's docker image.
# If this is omitted or empty, the root at .Values.imagePullPolicy is used.
imagePullPolicy:
imagePullPolicy:

# -- Optional: the image pull secret
imagePullSecret:
imagePullSecret:

# -- the app id to launch
appDefinition: "theia-cloud-demo"
Expand All @@ -119,7 +119,7 @@ landingPage:
# The key maps to the app definition name
# The value is the label that is supposed to be shown in the UI
#
# Example:
# Example:
# different-app-definition:
# label: "Different App Definition"
# further-app-definition:
Expand Down Expand Up @@ -161,14 +161,14 @@ keycloak:
# @default -- (see details below)
operator:
# -- The operator image
image: theiacloud/theia-cloud-operator:0.8.1.MS2v2
image: theiacloud/theia-cloud-operator:0.8.1.MS3

# -- Optional: Override the imagePullPolicy for the operator's docker image.
# If this is omitted or empty, the root at .Values.imagePullPolicy is used.
imagePullPolicy:
imagePullPolicy:

# -- Optional: the image pull secret
imagePullSecret:
imagePullSecret:

# -- Whether theia applications shall be started eager. This means that the application is already
# running without a user. When a user requests a new session, one of the already launched ones
Expand All @@ -190,7 +190,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.1.MS2
wondershaperImage: theiacloud/theia-cloud-wondershaper:0.8.1.MS3

# -- Set the number of active sessions a single user can launch
sessionsPerUser: "1"
Expand Down Expand Up @@ -246,18 +246,21 @@ operator:
</Loggers>
</Configuration>
# -- The version to use of the quay.io/oauth2-proxy/oauth2-proxy image
oAuth2ProxyVersion: "v7.5.1"

# -- Values of the Theia.cloud REST service
# @default -- (see details below)
service:
# -- The image to use
image: theiacloud/theia-cloud-service:0.8.1.MS2
image: theiacloud/theia-cloud-service:0.8.1.MS3

# -- Optional: Override the imagePullPolicy for the service's docker image.
# If this is omitted or empty, the root at .Values.imagePullPolicy is used.
imagePullPolicy:
imagePullPolicy:

# -- Optional: the image pull secret
imagePullSecret:
imagePullSecret:

# -- Values to influence the ingresses
# @default -- (see details below)
Expand Down

0 comments on commit 4b0260f

Please sign in to comment.