make deploy cns independent job from deploy cilium

Author: camrynl

.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml

@@ -122,53 +122,7 @@ stages:
 
                   envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
                   kubectl get po -owide -A
-
-                  if [ ${{parameters.upgradeScenario}} = "true" ]
-                  then
-                    echo "Upgrade scenario is true, using upgrade azure ipam and cns version from pipeline variables"
-                    if [ -z "$UPGRADE_AZURE_IPAM_VERSION" ]
-                    then
-                      echo "UPGRADE_AZURE_IPAM_VERSION is not set, using default value"
-                      IPAM=$(make azure-ipam-version)
-                    else
-                      IPAM=$(UPGRADE_AZURE_IPAM_VERSION)
-                      echo "UPGRADE_AZURE_IPAM_VERSION is set to $IPAM"
-                    fi
-                    
-                    if [ -z "$UPGRADE_CNS_VERSION" ]
-                    then
-                      echo "UPGRADE_CNS_VERSION is not set, using default value"
-                      CNS=$(make cns-version)
-                    else
-                      CNS=$(UPGRADE_CNS_VERSION)
-                      echo "UPGRADE_CNS_VERSION is set to $CNS"
-                    fi
-                    IPAM_IMAGE_REPO=$(UPGRADE_IPAM_IMAGE_REPO)
-                    CNS_IMAGE_REPO=$(UPGRADE_CNS_IMAGE_REPO)
-                    echo Deploying with Azure Ipam version $IPAM from $IPAM_IMAGE_REPO and CNS version $CNS from $CNS_IMAGE_REPO
-                  else
-                    if [ -z "$TEST_AZURE_IPAM_VERSION" ]
-                    then
-                      echo "TEST_AZURE_IPAM_VERSION is not set, using default value"
-                      IPAM=$(make azure-ipam-version)
-                    else
-                      IPAM=$(TEST_AZURE_IPAM_VERSION)
-                      echo "TEST_AZURE_IPAM_VERSION is set to $IPAM"
-                    fi
-                    if [ -z "$TEST_CNS_VERSION" ]
-                    then
-                      echo "TEST_CNS_VERSION is not set, using default value"
-                      CNS=$(make cns-version)
-                    else
-                      CNS=$(TEST_CNS_VERSION)
-                      echo "TEST_CNS_VERSION is set to $CNS"
-                    fi
-                  fi
                   
-                  echo "Deploy Azure-CNS"
-                  sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=${IPAM} CNS_VERSION=${CNS} INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) IPAM_IMAGE_REPO=$(IPAM_IMAGE_REPO) 
-                  kubectl get po -owide -A
-                  kubectl get crd -A
       - ${{if eq(parameters.hubbleEnabled, true)}}:
         - job: deploy_cilium_components
           displayName: Deploy Cilium with Hubble
@@ -200,8 +154,27 @@ stages:
                   envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
                   kubectl get po -owide -A
 
-                  if [ ${{parameters.upgradeScenario}} = "true" ]
-                  then
+      - job: deploy_cns_and_ipam
+        displayName: "Deploy CNS and IPAM"
+        dependsOn: deploy_cilium_components
+        steps:
+          - task: AzureCLI@2
+            displayName: "Install CNS and IPAM"
+            inputs:
+              azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+              scriptLocation: "inlineScript"
+              scriptType: "bash"
+              addSpnToEnvironment: true
+              inlineScript: |
+                set -ex
+                az extension add --name aks-preview
+                make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
+                ls -lah
+                pwd
+                kubectl cluster-info
+                kubectl get po -owide -A
+                if [ ${{parameters.upgradeScenario}} = "true" ]
+                then
                     echo "Upgrade scenario is true, using upgrade azure ipam and cns version from pipeline variables"
                     if [ -z "$UPGRADE_AZURE_IPAM_VERSION" ]
                     then
@@ -223,7 +196,7 @@ stages:
                     IPAM_IMAGE_REPO=$(UPGRADE_IPAM_IMAGE_REPO)
                     CNS_IMAGE_REPO=$(UPGRADE_CNS_IMAGE_REPO)
                     echo Deploying with Azure Ipam version $IPAM from $IPAM_IMAGE_REPO and CNS version $CNS from $CNS_IMAGE_REPO
-                  else
+                else
                     if [ -z "$TEST_AZURE_IPAM_VERSION" ]
                     then
                       echo "TEST_AZURE_IPAM_VERSION is not set, using default value"
@@ -240,12 +213,12 @@ stages:
                       CNS=$(TEST_CNS_VERSION)
                       echo "TEST_CNS_VERSION is set to $CNS"
                     fi
-                  fi
-
-                  echo "Deploy Azure-CNS"
-                  sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=${IPAM} CNS_VERSION=${CNS} INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) IPAM_IMAGE_REPO=$(IPAM_IMAGE_REPO) 
-                  kubectl get po -owide -A
-                  kubectl get crd -A
+                fi
+                  
+                echo "Deploy Azure-CNS"
+                sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=${IPAM} CNS_VERSION=${CNS} INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) IPAM_IMAGE_REPO=$(IPAM_IMAGE_REPO) 
+                kubectl get po -owide -A
+                kubectl get crd -A
 
       - job: deploy_pods
         condition: and( and( not(canceled()), not(failed()) ), or( contains(variables.CONTROL_SCENARIO, 'scaleTest') , contains(variables.CONTROL_SCENARIO, 'all') ) )