skip extra create cluster

Author: camrynl

.pipelines/cni/pipeline.yaml

@@ -610,6 +610,7 @@ stages:
         scaleup: ${SCALEUP_WIN}
         iterations: ${ITERATIONS_WIN}
         upgradeScenario: true
+        dependsOn: windows_podsubnet_HNS
 
     - template: singletenancy/cniv2-template.yaml
       parameters:
@@ -627,6 +628,7 @@ stages:
         scaleup: ${SCALEUP_WIN}
         iterations: ${ITERATIONS_WIN}
         upgradeScenario: true
+        dependsOn: windows_overlay_HNS
 
   - stage: delete_resources
     displayName: "Delete Resources"
@@ -670,6 +672,8 @@ stages:
         - rdma_linux_overlay_upgrade
         - windows_podsubnet_upgrade
         - windows_overlay_upgrade
+        - windows_podsubnet_upgrade_HNS
+        - windows_overlay_upgrade_HNS
     variables:
       commitID: $[ stagedependencies.setup.env.outputs['SetEnvVars.commitID'] ]
     jobs:

.pipelines/cni/singletenancy/cniv2-template.yaml

@@ -62,7 +62,7 @@ stages:
 # Condition confirms that:
 # Previous job has reported Succeeded. Previous job is currently setup which controls variable assignment and we are dependent on its success.
 # CONTROL_OS either contains 'windows' or 'all' and CONTROL_CNI either contains 'cniv2' or 'all'. Both must be true and are not case sensitive
-  - ${{ if eq(parameters.os, 'windows') }}:
+  - ${{ if and(eq(parameters.os, 'windows'), eq(parameters.upgradeScenario, false)) }}:
     - stage: create_${{ parameters.name }}
       condition: and( succeeded(), and( or( contains(variables.CONTROL_CNI, 'cniv2'), contains(variables.CONTROL_CNI, 'all') ), or( contains(variables.CONTROL_OS, 'windows'), contains(variables.CONTROL_OS, 'all') ) ) )
       variables:
@@ -367,7 +367,10 @@ stages:
       dependsOn:
         - ${{ parameters.name }}
         - setup
-      displayName: "HNS Test - ${{ parameters.clusterName }}"
+      ${{ if eq(parameters.upgradeScenario, true) }}:
+        displayName: "HNS Test w/ Upgrade - ${{ parameters.name }}"
+      ${{ else }}:
+        displayName: "HNS Test - ${{ parameters.name }}"
       jobs:
         - job: restart_hns
           displayName: "Restart and Validate HNS"

test/integration/manifests/cilium/v1.17/cilium-config/cilium-config.yaml

@@ -70,7 +70,7 @@ data:
   tofqdns-max-deferred-connection-deletes: "10000"
   tofqdns-min-ttl: "0"
   tofqdns-proxy-response-max-delay: 100ms
-  routing-mode: tunnel
+  routing-mode: native
   unmanaged-pod-watcher-interval: "15"
   vtep-cidr: ""
   vtep-endpoint: ""