Skip to content
Merged
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
23 changes: 12 additions & 11 deletions .github/workflows/deploy-theia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -380,21 +380,22 @@ jobs:
fi

# Only override IDE images when a tag is explicitly provided.
# Indices 0 (landing) and 1-10 (IDE + no-ls + langserver preload) are set above / here.
# Index 11 is oauth2-proxy (distroless); keep it only in values.yaml so it is never replaced by a string override.
# Indices 0 (landing) and 1-11 (IDE + no-ls + langserver preload) are set above / here.
# Index 12 is oauth2-proxy (distroless); keep it only in values.yaml so it is never replaced by a string override.
if [ -n "${IDE_IMAGES_TAG}" ]; then
HELM_CMD+=(
--set "theia-cloud.preloading.images[1]=ghcr.io/eduide/eduide/java-17:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[2]=ghcr.io/eduide/eduide/c:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[3]=ghcr.io/eduide/eduide/javascript:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[4]=ghcr.io/eduide/eduide/ocaml:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[5]=ghcr.io/eduide/eduide/rust:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[6]=ghcr.io/eduide/eduide/python:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[2]=ghcr.io/eduide/eduide/java-17-templates:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[3]=ghcr.io/eduide/eduide/c:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[4]=ghcr.io/eduide/eduide/javascript:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[5]=ghcr.io/eduide/eduide/ocaml:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[6]=ghcr.io/eduide/eduide/rust:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[7]=ghcr.io/eduide/eduide/python:${IDE_IMAGES_TAG}"
# Intentionally override no-ls + langserver preload images globally when IDE tag is overridden.
--set "theia-cloud.preloading.images[7]=ghcr.io/eduide/eduide/java-17-no-ls:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[8]=ghcr.io/eduide/eduide/rust-no-ls:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[9]=ghcr.io/eduide/eduide/langserver-java:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[10]=ghcr.io/eduide/eduide/langserver-rust:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[8]=ghcr.io/eduide/eduide/java-17-no-ls:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[9]=ghcr.io/eduide/eduide/rust-no-ls:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[10]=ghcr.io/eduide/eduide/langserver-java:${IDE_IMAGES_TAG}"
--set "theia-cloud.preloading.images[11]=ghcr.io/eduide/eduide/langserver-rust:${IDE_IMAGES_TAG}"
--set theia-appdefinitions.defaultImageTag="${IDE_IMAGES_TAG}"
)
fi
Expand Down
2 changes: 1 addition & 1 deletion charts/theia-cloud-combined/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ theia-cloud:
name: service-admin-api-token
key: ADMIN_API_TOKEN

# Preload indices 0–10 align with .github/workflows/deploy-theia.yml tag overrides; 11 = oauth2-proxy (not overridden there).
# Preload indices 0–11 align with .github/workflows/deploy-theia.yml tag overrides; 12 = oauth2-proxy (not overridden there).
preloading:
images:
- ghcr.io/eduide/eduidec-landing-page:latest
Expand Down
4 changes: 2 additions & 2 deletions deployments/test1.theia-test.artemis.cit.tum.de/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ theia-cloud:
# name: service-admin-api-token
# key: ADMIN_API_TOKEN

# Preload list indices 0–10 must match deploy-theia.yml --set overrides when tags are passed.
# Index 11 is oauth2-proxy (distroless); the workflow does not override it.
# Preload list indices 0–11 must match deploy-theia.yml --set overrides when tags are passed.
# Index 12 is oauth2-proxy (distroless); the workflow does not override it.
preloading:
images:
- ghcr.io/eduide/eduidec-landing-page:latest
Expand Down
4 changes: 2 additions & 2 deletions deployments/test2.theia-test.artemis.cit.tum.de/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ theia-cloud:
# name: service-admin-api-token
# key: ADMIN_API_TOKEN

# Preload list indices 0–10 must match deploy-theia.yml --set overrides when tags are passed.
# Index 11 is oauth2-proxy (distroless); the workflow does not override it.
# Preload list indices 0–11 must match deploy-theia.yml --set overrides when tags are passed.
# Index 12 is oauth2-proxy (distroless); the workflow does not override it.
preloading:
images:
- ghcr.io/eduide/eduidec-landing-page:latest
Expand Down
4 changes: 2 additions & 2 deletions deployments/test3.theia-test.artemis.cit.tum.de/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ theia-cloud:
name: service-admin-api-token
key: ADMIN_API_TOKEN

# Preload list indices 0–10 must match deploy-theia.yml --set overrides when tags are passed.
# Index 11 is oauth2-proxy (distroless); the workflow does not override it.
# Preload list indices 0–11 must match deploy-theia.yml --set overrides when tags are passed.
# Index 12 is oauth2-proxy (distroless); the workflow does not override it.
preloading:
images:
- ghcr.io/eduide/eduidec-landing-page:latest
Expand Down
6 changes: 3 additions & 3 deletions deployments/theia-staging.artemis.cit.tum.de/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ theia-cloud:
name: service-admin-api-token
key: ADMIN_API_TOKEN

# Preload list indices 0–10 must match deploy-theia.yml --set overrides when tags are passed.
# Index 11 is oauth2-proxy (distroless); the workflow does not override it.
# Preload list indices 0–11 must match deploy-theia.yml --set overrides when tags are passed.
# Index 12 is oauth2-proxy (distroless); the workflow does not override it.
preloading:
images:
- ghcr.io/eduide/eduidec-landing-page:latest
- ghcr.io/eduide/eduide/java-17:latest
- ghcr.io/eduide/eduide/java-latest-17:latest
- ghcr.io/eduide/eduide/java-17-templates:latest
- ghcr.io/eduide/eduide/c:latest
- ghcr.io/eduide/eduide/javascript:latest
- ghcr.io/eduide/eduide/ocaml:latest
Expand Down
4 changes: 2 additions & 2 deletions deployments/theia.artemis.cit.tum.de/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ theia-cloud:
name: service-admin-api-token
key: ADMIN_API_TOKEN

# Preload list indices 0–10 must match deploy-theia.yml --set overrides when tags are passed.
# Index 11 is oauth2-proxy (distroless); the workflow does not override it.
# Preload list indices 0–11 must match deploy-theia.yml --set overrides when tags are passed.
# Index 12 is oauth2-proxy (distroless); the workflow does not override it.
preloading:
images:
- ghcr.io/eduide/eduidec-landing-page:latest-c51d7c0
Expand Down
Loading