From 5ed7c4918a384c861e6577e12a761ce44844eb54 Mon Sep 17 00:00:00 2001 From: Adam Cattermole Date: Mon, 4 Nov 2024 09:49:41 +0000 Subject: [PATCH] Update quickstart sail installation Signed-off-by: Adam Cattermole --- hack/quickstart-setup.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hack/quickstart-setup.sh b/hack/quickstart-setup.sh index fd111c265..c9051f05b 100755 --- a/hack/quickstart-setup.sh +++ b/hack/quickstart-setup.sh @@ -61,6 +61,7 @@ fi if [ -z $ISTIO_INSTALL_SAIL ]; then ISTIO_INSTALL_SAIL=${ISTIO_INSTALL_SAIL:=true} + SAIL_VERSION=${SAIL_VERSION:="0.1.0"} fi export TOOLS_IMAGE=quay.io/kuadrant/mgc-tools:latest @@ -402,8 +403,12 @@ success "Gateway API installed successfully." info "Installing Istio as a Gateway API provider... 🛫" if [ "$ISTIO_INSTALL_SAIL" = true ]; then info "Installing Istio via Sail" - kubectl apply -k ${KUADRANT_ISTIO_KUSTOMIZATION} - kubectl -n istio-system wait --for=condition=Available deployment istio-operator --timeout=300s + ${HELM_BIN} install sail-operator \ + --create-namespace \ + --namespace istio-system \ + --wait \ + --timeout=300s \ + https://github.com/istio-ecosystem/sail-operator/releases/download/$(SAIL_VERSION)/sail-operator-$(SAIL_VERSION).tgz kubectl apply -f ${KUADRANT_REPO_RAW}/config/dependencies/istio/sail/istio.yaml else # Create CRD first to prevent race condition with creating CR