install operator option added

Author: ctartici

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

@@ -1,4 +1,4 @@
-apiVersion: sailoperator.io/v1alpha1
+apiVersion: sailoperator.io/v1
 kind: IstioCNI
 metadata:
   name: default

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,15 @@ else
     echo "Skipping the setup"
 fi
 
+# Install Sail Operator
+if [ "${INSTALL_SAIL_OPERATOR}" == "true" ]; then
+    install_crds
+    install_operator
+    oc -n $OPERATOR_NAMESPACE wait --for=condition=Available deployment/sail-operator --timeout=60s
+    #delete downloaded crd files
+    rm -rf crds/
+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"}"
+OPERATOR_NAMESPACE="${OPERATOR_NAMESPACE:-"sail-operator"}"
 
 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,26 @@ 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."
+}
+
+# Downloads and applies crds for sail-operator
+function install_crds(){
+  oc create namespace "$OPERATOR_NAMESPACE" || true
+  curl -L https://codeload.github.com/istio-ecosystem/sail-operator/tar.gz/main | \
+  tar -xz --strip=2 sail-operator-main/chart/crds || { echo "Failed to download crds"; exit 1; }
+  find "crds/" -type f -name "*.yaml" | while read -r file; do
+    echo "Applying: $file"
+    kubectl apply --server-side -n "$OPERATOR_NAMESPACE" -f "$file"
+  done
+}
+
+
+# Installs sail operator with the version in Helm Chart in upstream.
+function install_operator(){
+  helm repo add sail-operator https://istio-ecosystem.github.io/sail-operator
+  helm repo update
+  oc apply -f <(helm template sail-operator sail-operator/sail-operator \
+  --namespace $OPERATOR_NAMESPACE \
+  --set operatorLogLevel=3 \
+  --set image="quay.io/sail-dev/sail-operator:$(curl -s https://raw.githubusercontent.com/istio-ecosystem/sail-operator/main/chart/Chart.yaml | grep 'version:' | sed 's/version: //' | cut -d'.' -f1,2)-latest")
 }

prow/setup/sail-operator-setup.sh

@@ -60,8 +60,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 +75,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 +94,27 @@ 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; }
   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
+  oc -n "$NAMESPACE" wait --for=condition=Available deployment/istio-egressgateway --timeout=30s
   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."
 }