Skip to content

fix(demo): support empty engine image overrides on macOS Bash #700

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

Merged
benjaminch merged 1 commit into from
Aug 28, 2026
+11 −2
Merged

fix(demo): support empty engine image overrides on macOS Bash #700

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
4 changes: 2 additions & 2 deletions cmd/demo_scripts/create_qovery_demo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,15 @@ install_or_upgrade_helm_charts() {
--set services.qovery.qovery-cluster-agent.enabled=false \
--set services.qovery.qovery-engine.enabled=false \
--set services.qovery.qovery-operator.enabled=false \
"${engine_image_overrides[@]}" qovery "$chart_source"
"${engine_image_overrides[@]+"${engine_image_overrides[@]}"}" qovery "$chart_source"
fi

for i in $(seq 1 3); do
set -x
helm upgrade --install --create-namespace ${HELM_DEBUG} --timeout=15m -n qovery "${helm_values_args[@]}" --wait --atomic \
--set services.ingress.envoy-gateway-crd.enabled=false \
--set services.qovery.qovery-operator.enabled=false \
"${engine_image_overrides[@]}" qovery "$chart_source" && break
"${engine_image_overrides[@]+"${engine_image_overrides[@]}"}" qovery "$chart_source" && break
set +x
echo "Install failed. Retrying in 10 seconds. To let the cluster initialize"
sleep 10
Expand Down
9 changes: 9 additions & 0 deletions cmd/demo_up_local_overrides_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cmd
import (
"os"
"path/filepath"
"strings"
"testing"
)

Expand Down Expand Up @@ -32,3 +33,11 @@ func TestDemoEngineImageOverride(t *testing.T) {
t.Fatalf("expected docker.io/library/qovery-demo-engine:local, got %s:%s", repository, tag)
}
}

func TestDemoScriptUsesNounsetSafeEmptyEngineImageOverrides(t *testing.T) {
const nounsetSafeOverrides = `"${engine_image_overrides[@]+"${engine_image_overrides[@]}"}"`

if count := strings.Count(string(demoScriptsCreate), nounsetSafeOverrides); count != 2 {
t.Fatalf("expected both Helm invocations to use a Bash 3.2 nounset-safe engine image override expansion, found %d", count)
}
}
Loading