Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/deploy-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ on:
workflow_dispatch:
inputs:
theia_cloud_tag:
description: 'Theia Cloud components tag (operator, service, landing-page). Leave empty to use the tag defined in values.yaml (no override).'
description: 'Theia Cloud components tag (operator, service). Leave empty to use the tag defined in values.yaml (no override).'
required: false
default: ''
landing_page_tag:
description: 'EduTheia landing page tag. Leave empty to use the tag defined in values.yaml (no override).'
required: false
default: ''
ide_images_tag:
Expand All @@ -46,6 +50,7 @@ jobs:
with:
environment: test1
theia_cloud_tag: ${{ inputs.theia_cloud_tag }}
landing_page_tag: ${{ inputs.landing_page_tag }}
ide_images_tag: ${{ inputs.ide_images_tag }}
helm_chart_tag: ${{ inputs.helm_chart_tag || '' }}
deploy_shared_gateway: false
Expand All @@ -64,6 +69,7 @@ jobs:
with:
environment: test2
theia_cloud_tag: ${{ inputs.theia_cloud_tag }}
landing_page_tag: ${{ inputs.landing_page_tag }}
ide_images_tag: ${{ inputs.ide_images_tag }}
helm_chart_tag: ${{ inputs.helm_chart_tag || '' }}
deploy_shared_gateway: false
Expand All @@ -82,6 +88,7 @@ jobs:
with:
environment: test3
theia_cloud_tag: ${{ inputs.theia_cloud_tag }}
landing_page_tag: ${{ inputs.landing_page_tag }}
ide_images_tag: ${{ inputs.ide_images_tag }}
helm_chart_tag: ${{ inputs.helm_chart_tag || '' }}
deploy_shared_gateway: false
Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/deploy-theia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@ on:
required: true
type: string
theia_cloud_tag:
description: "Image tag for Theia Cloud components (operator, service, landing-page). Leave empty to use the tag defined in values.yaml (no override)."
description: "Image tag for Theia Cloud components (operator, service). Leave empty to use the tag defined in values.yaml (no override)."
required: false
type: string
default: ""
landing_page_tag:
description: "Image tag for EduTheia landing page. Leave empty to use the tag defined in values.yaml (no override)."
required: false
type: string
default: ""
Expand Down Expand Up @@ -229,6 +234,7 @@ jobs:

# Define image tag variables for cleaner command
THEIA_CLOUD_TAG="${{ inputs.theia_cloud_tag }}"
LANDING_PAGE_TAG="${{ inputs.landing_page_tag }}"
IDE_IMAGES_TAG="${{ inputs.ide_images_tag }}"

# Build base helm command with always-present flags
Expand All @@ -244,10 +250,16 @@ jobs:
# Only override Theia Cloud component images when a tag is explicitly provided
if [ -n "${THEIA_CLOUD_TAG}" ]; then
HELM_CMD+=(
--set theia-cloud.landingPage.image="ghcr.io/eduide/eduide-cloud/landing-page:${THEIA_CLOUD_TAG}"
--set theia-cloud.operator.image="ghcr.io/eduide/eduide-cloud/operator:${THEIA_CLOUD_TAG}"
--set theia-cloud.service.image="ghcr.io/eduide/eduide-cloud/service:${THEIA_CLOUD_TAG}"
--set "theia-cloud.preloading.images[0]=ghcr.io/eduide/eduide-cloud/landing-page:${THEIA_CLOUD_TAG}"
)
fi

# Only override landing page image when a tag is explicitly provided
if [ -n "${LANDING_PAGE_TAG}" ]; then
HELM_CMD+=(
--set theia-cloud.landingPage.image="ghcr.io/eduide/eduidec-landing-page:${LANDING_PAGE_TAG}"
--set "theia-cloud.preloading.images[0]=ghcr.io/eduide/eduidec-landing-page:${LANDING_PAGE_TAG}"
Comment on lines +261 to +262
)
fi

Expand Down
4 changes: 2 additions & 2 deletions charts/theia-cloud-combined/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ theia-cloud:
interval: 3

operator:
image: ghcr.io/eduide/eduide/operator:latest
image: ghcr.io/eduide/eduide-cloud/operator:latest
replicas: 1
sessionsPerUser: 10
storageClassName: csi-rbd-sc
eagerStart: true

service:
image: ghcr.io/eduide/eduide/service:latest
image: ghcr.io/eduide/eduide-cloud/service:latest
Comment on lines 46 to +54
# Public token (must match app.id or be set explicitly)
authToken: nJV3nKZmpxTD4wu2
# Secret containing the admin API token, created by the theia-certificates chart
Expand Down
8 changes: 4 additions & 4 deletions deployments/test1.theia-test.artemis.cit.tum.de/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@ theia-cloud:
interval: 3

operator:
#image: ghcr.io/eduide/eduide/operator:latest
#image: ghcr.io/eduide/eduide-cloud/operator:latest
#eagerStart: false
replicas: 1
sessionsPerUser: 1000 # Needed for load tests - not recommended for production
storageClassName: csi-rbd-sc

# service:
# image: ghcr.io/eduide/eduide/service:latest
# image: ghcr.io/eduide/eduide-cloud/service:latest
# adminApiTokenSecret:
# name: service-admin-api-token
# key: ADMIN_API_TOKEN

preloading:
images:
- ghcr.io/eduide/eduide/landing-page:latest
- ghcr.io/eduide/eduidec-landing-page:latest
- ghcr.io/eduide/eduide/java-17:latest
- ghcr.io/eduide/eduide/c:latest
- ghcr.io/eduide/eduide/javascript:latest
Expand All @@ -73,7 +73,7 @@ theia-cloud:

landingPage:
# We use the try now page as landing page since the default does not support mutliple apps -> https://github.com/eclipsesource/theia-cloud/discussions/301
image: ghcr.io/eduide/eduide/landing-page
image: ghcr.io/eduide/eduidec-landing-page
# We can define a default blueprint
appDefinition: "java-17-latest"
ephemeralStorage: true
Expand Down
8 changes: 4 additions & 4 deletions deployments/test2.theia-test.artemis.cit.tum.de/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@ theia-cloud:
interval: 3

operator:
#image: ghcr.io/eduide/eduide/operator:latest
#image: ghcr.io/eduide/eduide-cloud/operator:latest
#eagerStart: false
replicas: 1
sessionsPerUser: 10
storageClassName: csi-rbd-sc

# service:
# image: ghcr.io/eduide/eduide/service:latest
# image: ghcr.io/eduide/eduide-cloud/service:latest
# adminApiTokenSecret:
# name: service-admin-api-token
# key: ADMIN_API_TOKEN

preloading:
images:
- ghcr.io/eduide/eduide/landing-page:latest
- ghcr.io/eduide/eduidec-landing-page:latest
- ghcr.io/eduide/eduide/java-17:latest
- ghcr.io/eduide/eduide/c:latest
- ghcr.io/eduide/eduide/javascript:latest
Expand All @@ -73,7 +73,7 @@ theia-cloud:

landingPage:
# We use the try now page as landing page since the default does not support multiple apps -> https://github.com/eclipsesource/theia-cloud/discussions/301
image: ghcr.io/eduide/eduide/landing-page
image: ghcr.io/eduide/eduidec-landing-page
# We can define a default blueprint
appDefinition: "java-17-latest"
ephemeralStorage: true
Expand Down
16 changes: 8 additions & 8 deletions deployments/test3.theia-test.artemis.cit.tum.de/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ theia-cloud:
interval: 3

operator:
image: ghcr.io/eduide/eduide/operator:latest
image: ghcr.io/eduide/eduide-cloud/operator:latest
#eagerStart: false
replicas: 1
sessionsPerUser: 10
Expand All @@ -55,22 +55,22 @@ theia-cloud:
ephemeral-storage: "256Mi"

# service:
# image: ghcr.io/eduide/eduide/service:latest
# image: ghcr.io/eduide/eduide-cloud/service:latest
# adminApiTokenSecret:
# name: service-admin-api-token
# key: ADMIN_API_TOKEN

preloading:
images:
- ghcr.io/eduide/eduide/landing-page:latest
- ghcr.io/eduide/eduidec-landing-page:latest
- ghcr.io/eduide/eduide/java-17:latest
- ghcr.io/eduide/eduide/c:latest
- ghcr.io/eduide/eduide/javascript:latest
- ghcr.io/eduide/eduide/ocaml:latest
- ghcr.io/eduide/eduide/rust:latest
- ghcr.io/eduide/eduide/python:latest
- ghcr.io/eduide/eduide/theia-no-ls:pr-46
- ghcr.io/eduide/eduide/langserver-java:pr-46
- ghcr.io/eduide/eduide/theia-no-ls:pr-80
- ghcr.io/eduide/eduide/langserver-java:pr-80

imagePullPolicy: Always

Expand All @@ -80,7 +80,7 @@ theia-cloud:

landingPage:
# We use the try now page as landing page since the default does not support mutliple apps -> https://github.com/eclipsesource/theia-cloud/discussions/301
image: ghcr.io/eduide/eduide/landing-page
image: ghcr.io/eduide/eduidec-landing-page
# We can define a default blueprint

# 1. The actual image data (Must be a Base64 encoded string)
Expand Down Expand Up @@ -141,9 +141,9 @@ theia-appdefinitions:
apps:
- name: java-ls-test
image: ghcr.io/eduide/eduide/theia-no-ls
imageTag: pr-46
imageTag: pr-80
options:
langserver-image: ghcr.io/eduide/eduide/langserver-java:pr-46
langserver-image: ghcr.io/eduide/eduide/langserver-java:pr-80

monitoring:
targetNamespaces:
Expand Down
8 changes: 4 additions & 4 deletions deployments/theia-staging.artemis.cit.tum.de/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@ theia-cloud:
interval: 3

operator:
#image: ghcr.io/eduide/eduide/operator:latest
#image: ghcr.io/eduide/eduide-cloud/operator:latest
#eagerStart: false
replicas: 1
sessionsPerUser: 10
storageClassName: csi-rbd-sc

# service:
# image: ghcr.io/eduide/eduide/service:latest
# image: ghcr.io/eduide/eduide-cloud/service:latest
# adminApiTokenSecret:
# name: service-admin-api-token
# key: ADMIN_API_TOKEN

preloading:
images:
- ghcr.io/eduide/eduide/landing-page:latest
- ghcr.io/eduide/eduidec-landing-page:latest
- ghcr.io/eduide/eduide/java-17:latest
- ghcr.io/eduide/eduide/c:latest
- ghcr.io/eduide/eduide/javascript:latest
Expand All @@ -72,7 +72,7 @@ theia-cloud:

landingPage:
# We use the try now page as landing page since the default does not support mutliple apps -> https://github.com/eclipsesource/theia-cloud/discussions/301
image: ghcr.io/eduide/eduide/landing-page
image: ghcr.io/eduide/eduidec-landing-page
logoFileExtension: "png"
# We can define a default blueprint
appDefinition: "java-17-latest"
Expand Down
8 changes: 4 additions & 4 deletions deployments/theia.artemis.cit.tum.de/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@ theia-cloud:
interval: 3

operator:
#image: ghcr.io/eduide/eduide/operator:latest
#image: ghcr.io/eduide/eduide-cloud/operator:latest
#eagerStart: false
replicas: 3
sessionsPerUser: 10
storageClassName: csi-rbd-sc

# service:
# image: ghcr.io/eduide/eduide/service:latest
# image: ghcr.io/eduide/eduide-cloud/service:latest
# adminApiTokenSecret:
# name: service-admin-api-token
# key: ADMIN_API_TOKEN

preloading:
images:
- ghcr.io/eduide/eduide/landing-page:latest
- ghcr.io/eduide/eduidec-landing-page:latest
- ghcr.io/eduide/eduide/java-17:latest
- ghcr.io/eduide/eduide/c:latest
- ghcr.io/eduide/eduide/javascript:latest
Expand All @@ -72,7 +72,7 @@ theia-cloud:

landingPage:
# We use the try now page as landing page since the default does not support mutliple apps -> https://github.com/eclipsesource/theia-cloud/discussions/301
image: ghcr.io/eduide/eduide/landing-page
image: ghcr.io/eduide/eduidec-landing-page
logoFileExtension: "png"
# We can define a default blueprint
appDefinition: "java-17-latest"
Expand Down
4 changes: 2 additions & 2 deletions value-reference-files/tum-theia-cloud-helm-test-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ theia-cloud:
interval: 3

operator:
image: ghcr.io/eduide/eduide/operator:pr-22
image: ghcr.io/eduide/eduide-cloud/operator:pr-22
eagerStart: false
replicas: 1
sessionsPerUser: 10
storageClassName: csi-rbd-sc

service:
image: ghcr.io/eduide/eduide/service:pr-22
image: ghcr.io/eduide/eduide-cloud/service:pr-22
Comment on lines 42 to +50
adminApiTokenSecret:
name: service-admin-api-token
key: ADMIN_API_TOKEN
Expand Down
Loading