Merge branch 'master' into isaiahraya/npm-cilium-migration-script

Author: rayaisaiah

.github/workflows/cyclonus-netpol-extended-nightly-test.yaml

@@ -29,11 +29,12 @@ jobs:
           go-version: "^1.23"
 
       - name: Setup Kind
-        uses: engineerd/setup-kind@v0.6.2
+        uses: helm/kind-action@v1
         with:
-          version: "v0.11.1"
+          version: "v0.22.0"
+          kubectl_version: "v1.27.7"
           config: ./test/kind/kind.yaml
-          name: npm-kind
+          cluster_name: npm-kind
 
       - name: Check Kind
         run: |

.pipelines/cni/cilium/nightly-release-test.yml

@@ -174,6 +174,10 @@ stages:
               name: cilium_overlay_nightly
               clusterName: ciliumnightly
         steps:
+          - template: ../../templates/k8s-yaml-test.yaml
+            parameters:
+              clusterName: $(clusterName)-$(commitID)
+
           - template: ../../templates/delete-cluster.yaml
             parameters:
               name: $(name)

.pipelines/cni/load-test-templates/create-cluster-template.yaml

@@ -23,7 +23,6 @@ steps:
         AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) \
         CLUSTER=${{ parameters.clusterName }} NODE_COUNT=${{ parameters.nodeCount }} NODE_COUNT_WIN=${{ parameters.nodeCountWin }} \
         VM_SIZE=${{ parameters.vmSize }} VM_SIZE_WIN=${{ parameters.vmSizeWin }} \
-        WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD} \
         OS_SKU=${{ parameters.osSKU }} OS_SKU_WIN=${{ parameters.osSkuWin }} OS=${{ parameters.os }}
         echo "Cluster successfully created"
 

.pipelines/cni/pipeline.yaml

@@ -164,7 +164,7 @@ stages:
   - template: singletenancy/cniv1-template.yaml
     parameters:
       name: win22_cniv1
-      clusterType: windows-cniv1-up
+      clusterType: cniv1-up
       clusterName: "win22-cniv1"
       nodeCount: ${NODE_COUNT_WINCLUSTER_SYSTEMPOOL}
       nodeCountWin: ${NODE_COUNT_WIN}
@@ -229,7 +229,7 @@ stages:
   - template: singletenancy/cniv1-template.yaml
     parameters:
       name: linux_cniv1
-      clusterType: linux-cniv1-up
+      clusterType: cniv1-up
       clusterName: "linux-cniv1"
       nodeCount: ${NODE_COUNT_LINUX}
       vmSize: ${VM_SIZE}

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

@@ -57,6 +57,7 @@ stages:
                 vmSizeWin: ${{ parameters.vmSizeWin }}
                 region: $(location)
                 osSKU: ${{ parameters.osSKU }}
+                os: ${{ parameters.os }}
 
 # If ensures that only windows template calls are compared against the below condition
 # Condition confirms that:

.pipelines/pipeline.yaml

@@ -347,7 +347,7 @@ stages:
         displayName: AKS Ubuntu 22
         arch: "amd64"
         os: "linux"
-        clusterType: linux-cniv1-up
+        clusterType: cniv1-up
         clusterName: "ubuntu22e2e"
         vmSize: Standard_B2s
         k8sVersion: 1.25
@@ -359,8 +359,8 @@ stages:
         name: "aks_windows_22_e2e"
         displayName: AKS Windows 2022
         arch: amd64
-        os: windows
-        clusterType: windows-cniv1-up
+        os: "windows"
+        clusterType: cniv1-up
         clusterName: "win22e2e"
         vmSize: Standard_B2ms
         os_version: "ltsc2022"

.pipelines/singletenancy/aks-swift/e2e-job-template.yaml

@@ -5,6 +5,7 @@ parameters:
   clusterName: ""
   vmSize: ""
   k8sVersion: ""
+  os: ""
   dependsOn: ""
 
 stages:
@@ -27,6 +28,7 @@ stages:
           vmSize: ${{ parameters.vmSize }}
           k8sVersion: ${{ parameters.k8sVersion }}
           dependsOn: ${{ parameters.dependsOn }}
+          os: ${{ parameters.os }}
           region: $(REGION_AKS_CLUSTER_TEST)
 
   - stage: ${{ parameters.name }}

.pipelines/singletenancy/aks/e2e-job-template.yaml

@@ -32,6 +32,7 @@ stages:
           vmSizeWin: ${{ parameters.vmSize }} # Matching linux vmSize
           k8sVersion: ${{ parameters.k8sVersion }}
           dependsOn: ${{ parameters.dependsOn }}
+          os: ${{ parameters.os }}
           region: $(REGION_AKS_CLUSTER_TEST)
 
   - stage: ${{ parameters.name }}

.pipelines/templates/create-cluster.yaml

@@ -38,8 +38,7 @@ jobs:
             AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) \
             CLUSTER=${{ parameters.clusterName }} \
             VM_SIZE=${{ parameters.vmSize }} VM_SIZE_WIN=${{ parameters.vmSizeWin }} \
-            OS_SKU_WIN=${{ parameters.osSkuWin }} OS=${{parameters.os}} \
-            WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD}
+            OS_SKU_WIN=${{ parameters.osSkuWin }} OS=${{ parameters.os }}
 
             echo "Cluster successfully created"
         displayName: Cluster - ${{ parameters.clusterType }}

.pipelines/templates/delete-cluster.yaml

@@ -18,3 +18,4 @@ steps:
         echo "Cluster and resources down"
     name: delete
     displayName: Delete - ${{ parameters.name }}
+    condition: always()