Skip to content

fix(dev): inherit non-expiring sandbox JWT in local gateway scripts #2636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pimlock wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −3
Open

fix(dev): inherit non-expiring sandbox JWT in local gateway scripts #2636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion tasks/scripts/gateway-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ signing_key_path = "${TLS_DIR}/jwt/signing.pem"
public_key_path = "${TLS_DIR}/jwt/public.pem"
kid_path = "${TLS_DIR}/jwt/kid"
gateway_id = "${GATEWAY_NAME}"
ttl_secs = 3600

[openshell.drivers.docker]
default_image = "${SANDBOX_IMAGE}"
Expand Down
1 change: 0 additions & 1 deletion tasks/scripts/gateway-vm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ signing_key_path = "${TLS_DIR}/jwt/signing.pem"
public_key_path = "${TLS_DIR}/jwt/public.pem"
kid_path = "${TLS_DIR}/jwt/kid"
gateway_id = "${GATEWAY_NAME}"
ttl_secs = 3600

[openshell.drivers.vm]
default_image = "${SANDBOX_IMAGE}"
Expand Down
8 changes: 7 additions & 1 deletion tasks/scripts/gateway.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,15 @@ signing_key_path = "${TLS_DIR}/jwt/signing.pem"
public_key_path = "${TLS_DIR}/jwt/public.pem"
kid_path = "${TLS_DIR}/jwt/kid"
gateway_id = "${GATEWAY_NAME}"
ttl_secs = 3600
EOF

# Kubernetes is a shared deployment, so its sandbox JWTs must expire. Local
# drivers omit ttl_secs and inherit the gateway's non-expiring default, so a
# sandbox restarted while the gateway is down can still reconnect.
if [[ "${DRIVER}" == "kubernetes" ]]; then
printf 'ttl_secs = 3600\n' >>"${CONFIG_PATH}"
fi

case "${DRIVER}" in
kubernetes)
cat >>"${CONFIG_PATH}" <<EOF
Expand Down