install operator option added

Author: ctartici

prow/config/sail-operator/istio-cni.yaml

@@ -1,8 +1,8 @@
-apiVersion: sailoperator.io/v1alpha1
+apiVersion: sailoperator.io/v1
 kind: IstioCNI
 metadata:
   name: default
 spec:
-  namespace: ${ISTIOCNI_NAESPACE}
+  namespace: ${ISTIOCNI_NAMESPACE}
   version: ${ISTIO_VERSION}
   profile: openshift

prow/integ-suite-ocp.sh

@@ -29,7 +29,9 @@ SKIP_TESTS="${2:-""}"
 TEST_SUITE="${1:-"pilot"}"
 SKIP_SETUP="${SKIP_SETUP:-"false"}"
 INSTALL_METALLB="${INSTALL_METALLB:-"false"}"
+OPERATOR_NAMESPACE="${OPERATOR_NAMESPACE:-"sail-operator"}"
 CONTROL_PLANE_SOURCE="${CONTROL_PLANE_SOURCE:-"istio"}"
+INSTALL_SAIL_OPERATOR="${INSTALL_SAIL_OPERATOR:-"true"}"
 # Important: SKIP_TEST_RUN is a workaround until downstream tests can be executed by using this script. 
 # To execute the tests in downstream, set SKIP_TEST_RUN to true
 # Jira: https://issues.redhat.com/browse/OSSM-8029
@@ -97,6 +99,11 @@ else
     echo "Skipping the setup"
 fi
 
+# Install Sail Operator
+if [ "${INSTALL_SAIL_OPERATOR}" == "true" ]; then
+    deploy_operator
+fi
+
 # Check if the test run should be skipped
 # This is a workaround until downstream tests can be executed by using this script.
 # Jira: https://issues.redhat.com/browse/OSSM-8029

prow/setup/ocp_setup.sh

@@ -31,6 +31,7 @@ WD=$(dirname "$0")
 WD=$(cd "$WD"; pwd)
 TIMEOUT=300
 export NAMESPACE="${NAMESPACE:-"istio-system"}"
+SAIL_REPO_URL="https://github.com/istio-ecosystem/sail-operator.git"
 
 function setup_internal_registry() {
   # Validate that the internal registry is running in the OCP Cluster, configure the variable to be used in the make target. 
@@ -177,4 +178,32 @@ spec:
   timeout --foreground -v -s SIGHUP -k ${TIMEOUT} ${TIMEOUT} bash -c 'until oc get IPAddressPool default -n metallb-system; do sleep 5; done && echo "The IP address pool has been created."'
 
   echo "MetalLB has been deployed and configured with the IP address pool."
+}
+
+#need to change env variables since make deploy of sail-operator uses them
+function env_save(){
+  INICIAL_NAMESPACE="$NAMESPACE"
+  INICIAL_HUB="$HUB"
+  INITIAL_TAG="$TAG"
+}
+function cleanup_sail_repo() {
+    echo "Cleaning up..."
+    cd .. 2>/dev/null || true
+    rm -rf sail-operator
+    export NAMESPACE="$INICIAL_NAMESPACE"
+    export HUB="$INICIAL_HUB"
+    export TAG="$INITIAL_TAG"
+}
+
+function deploy_operator(){
+  env_save
+  unset HUB
+  unset TAG
+  unset NAMESPACE
+  git clone --depth 1 --branch main $SAIL_REPO_URL || { echo "Failed to clone sail-operator repo"; exit 1; }
+  cd sail-operator
+  make deploy || { echo "sail-operator make deploy failed"; cleanup_sail_repo ; exit 1; }
+  cleanup_sail_repo
+  echo "Sail operator deployed"
+
 }

prow/setup/sail-operator-setup.sh

@@ -21,6 +21,7 @@
 # Upstream WoW to call this script is documented in here: https://github.com/openshift-service-mesh/istio/tree/master/tests/integration#running-tests-on-custom-deployment
 
 exec > >(tee -a "$2"/sail-operator-setup.log) 2>&1
+
 # Exit immediately for non zero status
 set -e
 # Check unset variables
@@ -60,8 +61,8 @@ WORKDIR="$2"
 IOP_FILE="$2"/iop.yaml
 SAIL_IOP_FILE="$(basename "${IOP_FILE%.yaml}")-sail.yaml"
 
-ISTIO_VERSION="${ISTIO_VERSION:-latest}"
-INGRESS_GATEWAY_SVC_NAMESPACE="${INGRESS_GATEWAY_SVC_NAMESPACE:-istio-system}"
+ISTIO_VERSION="${ISTIO_VERSION:-v1.24.1}"
+NAMESPACE="${NAMESPACE:-istio-system}"
 ISTIOCNI_NAMESPACE="${ISTIOCNI_NAMESPACE:-istio-cni}"
 
 ISTIOCNI="${PROW}/config/sail-operator/istio-cni.yaml"
@@ -75,7 +76,7 @@ function download_execute_converter(){
   cd "${PROW}"
   curl -fsSL "$CONVERTER_ADDRESS" -o "$CONVERTER_SCRIPT" || { echo "Failed to download converter script"; exit 1; }
   chmod +x "$CONVERTER_SCRIPT"
-  bash "$CONVERTER_SCRIPT" "$IOP_FILE" -v "$ISTIO_VERSION" -n "$INGRESS_GATEWAY_SVC_NAMESPACE" || { echo "Failed to execute converter script"; exit 1; }
+  bash "$CONVERTER_SCRIPT" "$IOP_FILE" -v "$ISTIO_VERSION" -n "$NAMESPACE" || { echo "Failed to execute converter script"; exit 1; }
   rm "$CONVERTER_SCRIPT"
 }
 
@@ -94,28 +95,29 @@ function install_istiod(){
   if [ "${SAIL_API_VERSION:-}" != "" ]; then
     yq -i eval ".apiVersion = \"sailoperator.io/$SAIL_API_VERSION\"" "$WORKDIR/$SAIL_IOP_FILE"
   fi
-  oc apply -f "$WORKDIR/$SAIL_IOP_FILE"
-  oc wait --for=condition=Available=True deployment/istiod --timeout=30s
+  oc apply -f "$WORKDIR/$SAIL_IOP_FILE" || { echo "Failed to install istiod"; exit 1; }
+  oc -n "$NAMESPACE" wait --for=condition=Available deployment/istiod --timeout=120s || { echo "Failed to start istiod"; exit 1; }
+
   echo "istiod created."
 }
 
 # Install ingress and egress gateways
 function install_gateways(){
-  helm template -n "$INGRESS_GATEWAY_SVC_NAMESPACE" istio-ingressgateway "${ROOT}"/manifests/charts/gateway --values "$INGRESS_GATEWAY_VALUES" > "${WORKDIR}"/istio-ingressgateway.yaml
+  helm template -n "$NAMESPACE" istio-ingressgateway "${ROOT}"/manifests/charts/gateway --values "$INGRESS_GATEWAY_VALUES" > "${WORKDIR}"/istio-ingressgateway.yaml
   oc apply -f "${WORKDIR}"/istio-ingressgateway.yaml
-  helm template -n "$INGRESS_GATEWAY_SVC_NAMESPACE" istio-egressgateway "${ROOT}"/manifests/charts/gateway --values "$EGRESS_GATEWAY_VALUES" > "${WORKDIR}"/istio-egressgateway.yaml
+  helm template -n "$NAMESPACE" istio-egressgateway "${ROOT}"/manifests/charts/gateway --values "$EGRESS_GATEWAY_VALUES" > "${WORKDIR}"/istio-egressgateway.yaml
   oc apply -f "${WORKDIR}"/istio-egressgateway.yaml
-  oc wait --for=condition=Available=True deployment/istio-ingressgateway --timeout=30s
-  oc wait --for=condition=Available=True deployment/istio-egressgateway --timeout=30s
+  oc -n "$NAMESPACE" wait --for=condition=Available deployment/istio-ingressgateway --timeout=30s || { echo "Failed to start istio-ingressgateway"; exit 1; }
+  oc -n "$NAMESPACE" wait --for=condition=Available deployment/istio-egressgateway --timeout=30s || { echo "Failed to start istio-egressgateway"; exit 1; }
   echo "Gateways created."
 
 }
 
 function cleanup_istio(){
   oc delete istio/default
   oc delete istioCNI/default
-  oc delete all --selector app=istio-egressgateway -n "$INGRESS_GATEWAY_SVC_NAMESPACE"
-  oc delete all --selector app=istio-ingressgateway -n "$INGRESS_GATEWAY_SVC_NAMESPACE"
+  oc delete all --selector app=istio-egressgateway -n "$NAMESPACE"
+  oc delete all --selector app=istio-ingressgateway -n "$NAMESPACE"
   echo "Cleanup completed."
 }