Skip to content

Commit a4af3b8

Browse files
committed
fix(e2e): pass supervisor image tag through helmchart
1 parent 8be0be6 commit a4af3b8

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎deploy/docker/cluster-entrypoint.sh‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,15 +431,17 @@ fi
431431

432432
# In push mode, use the exact image references that were imported into cluster
433433
# containerd so the Helm release cannot drift back to remote ":latest" tags.
434-
# Only the gateway image is pushed; sandbox images are pulled from the
435-
# community registry at runtime.
434+
# Gateway and supervisor images may be pushed; sandbox base images are pulled
435+
# from the community registry at runtime.
436436
if [ -n "${PUSH_IMAGE_REFS:-}" ] && [ -f "$HELMCHART" ]; then
437437
server_image=""
438+
supervisor_image=""
438439
old_ifs="$IFS"
439440
IFS=','
440441
for ref in $PUSH_IMAGE_REFS; do
441442
case "$ref" in
442443
*/gateway:*) server_image="$ref" ;;
444+
*/supervisor:*) supervisor_image="$ref" ;;
443445
esac
444446
done
445447
IFS="$old_ifs"
@@ -452,6 +454,11 @@ if [ -n "${PUSH_IMAGE_REFS:-}" ] && [ -f "$HELMCHART" ]; then
452454
sed -i -E "s|repository:[[:space:]]*[^[:space:]]+|repository: ${server_repo}|" "$HELMCHART"
453455
sed -i -E "s|tag:[[:space:]]*\"?[^\"[:space:]]+\"?|tag: \"${server_tag}\"|" "$HELMCHART"
454456
fi
457+
458+
if [ -n "$supervisor_image" ]; then
459+
echo "Setting supervisor image: ${supervisor_image}"
460+
sed -i -E "s|supervisorImage:[[:space:]]*\"?[^\"]+\"?|supervisorImage: ${supervisor_image}|" "$HELMCHART"
461+
fi
455462
fi
456463

457464
if [ -n "${IMAGE_TAG:-}" ] && [ -f "$HELMCHART" ]; then

‎deploy/kube/manifests/openshell-helmchart.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ spec:
3131
server:
3232
sandboxImage: ghcr.io/nvidia/openshell-community/sandboxes/base:latest
3333
sandboxImagePullPolicy: __SANDBOX_IMAGE_PULL_POLICY__
34+
supervisorImage: ghcr.io/nvidia/openshell/supervisor:latest
3435
dbUrl: __DB_URL__
3536
sshGatewayHost: __SSH_GATEWAY_HOST__
3637
sshGatewayPort: __SSH_GATEWAY_PORT__

0 commit comments

Comments
 (0)