From 6f1c466768cd3838e5be1410d387a5f9f72de937 Mon Sep 17 00:00:00 2001 From: Adam Cattermole Date: Wed, 17 Jan 2024 14:05:20 +0000 Subject: [PATCH] Update quickstart to no longer use sail by default --- hack/quickstart-setup.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/hack/quickstart-setup.sh b/hack/quickstart-setup.sh index cfa5667b5..73d3a588a 100755 --- a/hack/quickstart-setup.sh +++ b/hack/quickstart-setup.sh @@ -26,16 +26,22 @@ if [ -z $MGC_REF ]; then MGC_REF=${MGC_REF:="main"} fi +if [ -z $ISTIO_INSTALL_SAIL]; then + ISTIO_INSTALL_SAIL=${ISTIO_INSTALL_SAIL:=false} +fi + SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" source /dev/stdin <<< "$(curl -s https://raw.githubusercontent.com/${KUADRANT_ORG}/multicluster-gateway-controller/${MGC_REF}/hack/.quickstartEnv)" source /dev/stdin <<< "$(curl -s https://raw.githubusercontent.com/${KUADRANT_ORG}/multicluster-gateway-controller/${MGC_REF}/hack/.deployUtils)" KUADRANT_IMAGE="quay.io/${KUADRANT_ORG}/kuadrant-operator:latest" KUADRANT_REPO="github.com/${KUADRANT_ORG}/kuadrant-operator.git" +MGC_REPO="github.com/${KUADRANT_ORG}/multicluster-gateway-controller.git" KUADRANT_REPO_RAW="https://raw.githubusercontent.com/${KUADRANT_ORG}/kuadrant-operator/${KUADRANT_REF}" KUADRANT_DEPLOY_KUSTOMIZATION="${KUADRANT_REPO}/config/deploy" KUADRANT_GATEWAY_API_KUSTOMIZATION="${KUADRANT_REPO}/config/dependencies/gateway-api" KUADRANT_ISTIO_KUSTOMIZATION="${KUADRANT_REPO}/config/dependencies/istio/sail" +MGC_ISTIO_KUSTOMIZATION="${MGC_REPO}/config/istio" KUADRANT_CERT_MANAGER_KUSTOMIZATION="${KUADRANT_REPO}/config/dependencies/cert-manager" KUADRANT_METALLB_KUSTOMIZATION="${KUADRANT_REPO}/config/metallb" @@ -48,6 +54,7 @@ if [[ "${KUADRANT_REF}" != "main" ]]; then KUADRANT_ISTIO_KUSTOMIZATION=${KUADRANT_ISTIO_KUSTOMIZATION}?ref=${KUADRANT_REF} KUADRANT_CERT_MANAGER_KUSTOMIZATION=${KUADRANT_CERT_MANAGER_KUSTOMIZATION}?ref=${KUADRANT_REF} KUADRANT_METALLB_KUSTOMIZATION=${KUADRANT_METALLB_KUSTOMIZATION}?ref=${KUADRANT_REF} + MGC_ISTIO_KUSTOMIZATION=${MGC_ISTIO_KUSTOMIZATION}?ref=${MGC_REF} fi # Make temporary directory @@ -78,9 +85,13 @@ ${KUSTOMIZE_BIN} build ${KUADRANT_GATEWAY_API_KUSTOMIZATION} | kubectl apply -f # Install istio echo "Installing Istio in ${KUADRANT_CLUSTER_NAME}" -${KUSTOMIZE_BIN} build ${KUADRANT_ISTIO_KUSTOMIZATION} | kubectl apply -f - -kubectl -n istio-system wait --for=condition=Available deployment istio-operator --timeout=300s -kubectl apply -f ${KUADRANT_REPO_RAW}/config/dependencies/istio/sail/istio.yaml +if [ "$ISTIO_INSTALL_SAIL" = true ]; then + ${KUSTOMIZE_BIN} build ${KUADRANT_ISTIO_KUSTOMIZATION} | kubectl apply -f - + kubectl -n istio-system wait --for=condition=Available deployment istio-operator --timeout=300s + kubectl apply -f ${KUADRANT_REPO_RAW}/config/dependencies/istio/sail/istio.yaml +else + ${KUSTOMIZE_BIN} build ${MGC_ISTIO_KUSTOMIZATION} | kubectl apply -f - +fi # Install cert-manager echo "Installing cert-manager in ${KUADRANT_CLUSTER_NAME}"