Skip launching ironic in case of capm3 e2e tests

Signed-off-by: Muhammad Adil Ghaffar <[email protected]>

Author: adilGhaffarDev

03_launch_mgmt_cluster.sh

@@ -829,24 +829,30 @@ fi
 patch_ipam
 launch_cluster_api_provider_metal3
 BMO_NAME_PREFIX="${NAMEPREFIX}"
-launch_baremetal_operator
+if [[ "${SKIP_APPLY_BMH:-false}" != "true" ]]; then
+    launch_baremetal_operator
+fi
 if [[ "${USE_IRSO}" = true ]]; then
-    launch_ironic_standalone_operator
-    launch_ironic_via_irso
+    if [[ "${SKIP_APPLY_BMH:-false}" = "false" ]]; then
+        launch_ironic_standalone_operator
+        launch_ironic_via_irso
+    fi
 else
     launch_ironic
 fi
 
-if [[ "${BMO_RUN_LOCAL}" != true ]]; then
-    if ! kubectl rollout status deployment "${BMO_NAME_PREFIX}"-controller-manager -n "${IRONIC_NAMESPACE}" --timeout="${BMO_ROLLOUT_WAIT}"m; then
-        echo "baremetal-operator-controller-manager deployment can not be rollout"
-        exit 1
+if [[ "${SKIP_APPLY_BMH:-false}" != "true" ]]; then
+    if [[ "${BMO_RUN_LOCAL}" != true ]]; then
+        if ! kubectl rollout status deployment "${BMO_NAME_PREFIX}"-controller-manager -n "${IRONIC_NAMESPACE}" --timeout="${BMO_ROLLOUT_WAIT}"m; then
+            echo "baremetal-operator-controller-manager deployment can not be rollout"
+            exit 1
+        fi
+    else
+        # There is no certificate to run validation webhook on local.
+        # Thus we are deleting validatingwebhookconfiguration resource if exists
+        # to let BMO is working properly on local runs.
+        kubectl delete validatingwebhookconfiguration/"${BMO_NAME_PREFIX}"-validating-webhook-configuration --ignore-not-found=true
     fi
-else
-    # There is no certificate to run validation webhook on local.
-    # Thus we are deleting validatingwebhookconfiguration resource if exists
-    # to let BMO is working properly on local runs.
-    kubectl delete validatingwebhookconfiguration/"${BMO_NAME_PREFIX}"-validating-webhook-configuration --ignore-not-found=true
 fi
 
 # Tests might want to apply bmh inside the test scipt

03_launch_mgmt_cluster_pre_1_10.sh

@@ -744,24 +744,30 @@ kubectl create namespace metal3
 patch_clusterctl
 launch_cluster_api_provider_metal3
 BMO_NAME_PREFIX="${NAMEPREFIX}"
-launch_baremetal_operator
+if [[ "${SKIP_APPLY_BMH:-false}" != "true" ]]; then
+    launch_baremetal_operator
+fi
 if [[ "${USE_IRSO}" = true ]]; then
-    launch_ironic_standalone_operator
-    launch_ironic_via_irso
+    if [[ "${SKIP_APPLY_BMH:-false}" = "false" ]]; then
+        launch_ironic_standalone_operator
+        launch_ironic_via_irso
+    fi
 else
     launch_ironic
 fi
 
-if [[ "${BMO_RUN_LOCAL}" != true ]]; then
-    if ! kubectl rollout status deployment "${BMO_NAME_PREFIX}"-controller-manager -n "${IRONIC_NAMESPACE}" --timeout="${BMO_ROLLOUT_WAIT}"m; then
-        echo "baremetal-operator-controller-manager deployment can not be rollout"
-        exit 1
+if [[ "${SKIP_APPLY_BMH:-false}" != "true" ]]; then
+    if [[ "${BMO_RUN_LOCAL}" != true ]]; then
+        if ! kubectl rollout status deployment "${BMO_NAME_PREFIX}"-controller-manager -n "${IRONIC_NAMESPACE}" --timeout="${BMO_ROLLOUT_WAIT}"m; then
+            echo "baremetal-operator-controller-manager deployment can not be rollout"
+            exit 1
+        fi
+    else
+        # There is no certificate to run validation webhook on local.
+        # Thus we are deleting validatingwebhookconfiguration resource if exists
+        # to let BMO is working properly on local runs.
+        kubectl delete validatingwebhookconfiguration/"${BMO_NAME_PREFIX}"-validating-webhook-configuration --ignore-not-found=true
     fi
-else
-    # There is no certificate to run validation webhook on local.
-    # Thus we are deleting validatingwebhookconfiguration resource if exists
-    # to let BMO is working properly on local runs.
-    kubectl delete validatingwebhookconfiguration/"${BMO_NAME_PREFIX}"-validating-webhook-configuration --ignore-not-found=true
 fi
 
 # Tests might want to apply bmh inside the test scipt

04_verify.sh

@@ -192,17 +192,27 @@ EXPTD_V1ALPHAX_V1BETAX_CRDS="clusters.cluster.x-k8s.io \
 EXPTD_DEPLOYMENTS="capm3-system:capm3-controller-manager \
     capi-system:capi-controller-manager \
     capi-kubeadm-bootstrap-system:capi-kubeadm-bootstrap-controller-manager \
-    capi-kubeadm-control-plane-system:capi-kubeadm-control-plane-controller-manager \
+    capi-kubeadm-control-plane-system:capi-kubeadm-control-plane-controller-manager"
+
+# Only expect BMO related deployments in dev-env tests and not in CAPM3 e2e tests.
+# CAPM3 will apply BMO and IRSO.
+if [[ "${SKIP_APPLY_BMH:-false}" != "true" ]]; then
+  EXPTD_DEPLOYMENTS+=" \
     baremetal-operator-system:baremetal-operator-controller-manager"
+fi
 
 if [[ "${BOOTSTRAP_CLUSTER}" == "minikube" ]]; then
-  if [[ "${USE_IRSO}" == "true" ]]; then
-    EXPTD_DEPLOYMENTS+=" \
-      baremetal-operator-system:ironic-service \
-      ironic-standalone-operator-system:ironic-standalone-operator-controller-manager"
-  else
-    EXPTD_DEPLOYMENTS+=" \
-      baremetal-operator-system:baremetal-operator-ironic"
+  # Only expect IRSO related deployments in dev-env tests and not in CAPM3 e2e tests.
+  # CAPM3 will apply BMO and IRSO.
+  if [[ "${SKIP_APPLY_BMH:-false}" != "true" ]]; then
+    if [[ "${USE_IRSO}" == "true" ]]; then
+      EXPTD_DEPLOYMENTS+=" \
+        baremetal-operator-system:ironic-service \
+        ironic-standalone-operator-system:ironic-standalone-operator-controller-manager"
+    else
+      EXPTD_DEPLOYMENTS+=" \
+        baremetal-operator-system:baremetal-operator-ironic"
+    fi
   fi
 fi
 
@@ -309,15 +319,17 @@ for container in ${EXPTD_CONTAINERS}; do
 done
 
 IRONIC_NODES_ENDPOINT="${IRONIC_URL}nodes"
-status="$(curl -sk -o /dev/null -I -w "%{http_code}" "${IRONIC_NODES_ENDPOINT}")"
-if [[ $status == 200 ]]; then
-    echo "⚠️  ⚠️  ⚠️   WARNING: Ironic endpoint is exposed for unauthenticated users"
-    exit 1
-elif [[ $status == 401 ]]; then
-    echo "OK - Ironic endpoint is secured"
-else
-    echo "FAIL- got $status from ${IRONIC_NODES_ENDPOINT}, expected 401"
-    exit 1
+if [[ "${SKIP_APPLY_BMH:-false}" != "true" ]]; then
+  status="$(curl -sk -o /dev/null -I -w "%{http_code}" "${IRONIC_NODES_ENDPOINT}")"
+  if [[ $status == 200 ]]; then
+      echo "⚠️  ⚠️  ⚠️   WARNING: Ironic endpoint is exposed for unauthenticated users"
+      exit 1
+  elif [[ $status == 401 ]]; then
+      echo "OK - Ironic endpoint is secured"
+  else
+      echo "FAIL- got $status from ${IRONIC_NODES_ENDPOINT}, expected 401"
+      exit 1
+  fi
 fi
 echo ""