fix: cluster template env vars (#2258)

* fix: cluster templates * cherry-pick: 0c8106a * chore: addressing comments
Azure · Sep 27, 2023 · f0021b5 · f0021b5
1 parent 982b794
commit f0021b5
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 33 deletions.
diff --git a/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml b/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
@@ -80,9 +80,9 @@ stages:
           - template: ../load-test-templates/pod-deployment-template.yaml
             parameters:
               clusterName: ${{ parameters.clusterName }}-$(commitID)
-              scaleup: ${CILIUM_SCALEUP}
+              scaleup: ${SCALEUP_CILIUM}
               os: linux
-              iterations: ${CILIUM_ITERATIONS}
+              iterations: ${ITERATIONS_CILIUM}
               nodeCount: ${{ parameters.nodeCount }}
           - template: ../load-test-templates/validate-state-template.yaml
             parameters:
@@ -95,7 +95,7 @@ stages:
             parameters:
               clusterName: ${{ parameters.clusterName }}-$(commitID)
               nodeCount: ${{ parameters.nodeCount }}
-              scaleup: ${CILIUM_SCALEUP}
+              scaleup: ${SCALEUP_CILIUM}
           - template: ../load-test-templates/validate-state-template.yaml
             parameters:
               clusterName: ${{ parameters.clusterName }}-$(commitID)
@@ -108,7 +108,7 @@ stages:
           - template: ../load-test-templates/restart-cns-template.yaml
             parameters:
               clusterName: ${{ parameters.clusterName }}-$(commitID)
-              scaleup: ${CILIUM_SCALEUP}
+              scaleup: ${SCALEUP_CILIUM}
               nodeCount: ${{ parameters.nodeCount }}
       - job: cni_tests
         displayName: "Cilium Test"

diff --git a/.pipelines/cni/load-test-templates/create-cluster-template.yaml b/.pipelines/cni/load-test-templates/create-cluster-template.yaml
@@ -3,7 +3,7 @@ parameters:
   clusterName: ""
   nodeCount: ""
   vmSize: ""
-  windowsVMSize: ""
+  vmSizeWin: ""
 
 steps:
   - task: AzureCLI@1
@@ -15,6 +15,13 @@ steps:
       inlineScript: |
         set -ex
         make -C ./hack/aks azcfg AZCLI=az REGION=${{ parameters.region }}
-        make -C ./hack/aks ${{ parameters.clusterType }} AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }} NODE_COUNT=${{ parameters.nodeCount }} VM_SIZE=${{ parameters.vmSize }} WINDOWS_VM_SKU=${{ parameters.windowsVMSize }} WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD}
+
+        make -C ./hack/aks ${{ parameters.clusterType }} \
+        AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) \
+        CLUSTER=${{ parameters.clusterName }} NODE_COUNT=${{ parameters.nodeCount }} \
+        VM_SIZE=${{ parameters.vmSize }} VM_SIZE_WIN=${{ parameters.vmSizeWin }} \
+        WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD}
+
+        echo "Cluster successfully created"
     name: "CreateAksCluster"
     displayName: "Create AKS Cluster"
diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml
@@ -106,51 +106,51 @@ stages:
       name: cilium_overlay
       clusterType: overlay-byocni-nokubeproxy-up
       clusterName: "cilium-overlay"
-      nodeCount: ${CILIUM_NODE_COUNT}
-      vmSize: ${CILIUM_VM_SKU}
+      nodeCount: ${NODE_COUNT_CILIUM}
+      vmSize: ${VM_SIZE_CILIUM}
 
   - template: singletenancy/cniv1-template.yaml
     parameters:
       name: win22_cniv1
       clusterType: windows-cniv1-up
       clusterName: win22-cniv1
-      nodeCount: ${WINDOWS_NODE_COUNT}
-      vmSize: ${WINDOWS_LINUX_VM_SKU}
-      windowsVMSize: ${WINDOWS_VM_SKU}
+      nodeCount: ${NODE_COUNT_WIN}
+      vmSize: ${VM_SIZE_WINCLUSTER_SYSTEMPOOL}
+      vmSizeWin: ${VM_SIZE_WIN}
       os: windows
       os_version: 'ltsc2022'
       arch: amd64
-      scaleup: ${WINDOWS_SCALEUP}
-      iterations: ${WINDOWS_ITERATIONS}
+      scaleup: ${SCALEUP_WIN}
+      iterations: ${ITERATIONS_WIN}
 
   - template: singletenancy/cniv1-template.yaml
     parameters:
       name: linux_cniv1
       clusterType: linux-cniv1-up
       clusterName: linux-cniv1
-      nodeCount: ${LINUX_NODE_COUNT}
-      vmSize: ${LINUX_VM_SKU}
+      nodeCount: ${NODE_COUNT_LINUX}
+      vmSize: ${VM_SIZE}
       os: linux
       arch: amd64
-      scaleup: ${LINUX_SCALEUP}
-      iterations: ${LINUX_ITERATIONS}
+      scaleup: ${SCALEUP_LINUX}
+      iterations: ${ITERATIONS_LINUX}
 
   - template: singletenancy/linux-cniv2-template.yaml
     parameters:
       name: linux_podsubnet
       clusterType: swift-byocni-up
       clusterName: linux-cniv2-podsubnet
-      nodeCount: ${LINUX_NODE_COUNT}
-      vmSize: ${LINUX_VM_SKU}
+      nodeCount: ${NODE_COUNT_LINUX}
+      vmSize: ${VM_SIZE}
       arch: amd64
 
   - template: singletenancy/linux-cniv2-template.yaml
     parameters:
       name: linux_overlay
       clusterType: overlay-byocni-up
       clusterName: linux-cniv2-overlay
-      nodeCount: ${LINUX_NODE_COUNT}
-      vmSize: ${LINUX_VM_SKU}
+      nodeCount: ${NODE_COUNT_LINUX}
+      vmSize: ${VM_SIZE}
       arch: amd64
 
   - stage: delete_resources

diff --git a/.pipelines/cni/singletenancy/cniv1-template.yaml b/.pipelines/cni/singletenancy/cniv1-template.yaml
@@ -5,7 +5,7 @@ parameters:
   clusterName: ""
   nodeCount: ""
   vmSize: ""
-  windowsVMSize: ""
+  vmSizeWin: ""
   os: ""
   arch: ""
   scaleup: 100
@@ -40,7 +40,7 @@ stages:
               clusterName: ${{ parameters.clusterName }}-$(commitID)
               nodeCount: ${{ parameters.nodeCount }}
               vmSize: ${{ parameters.vmSize }}
-              windowsVMSize: ${{ parameters.windowsVMSize }}
+              vmSizeWin: ${{ parameters.vmSizeWin }}
               region: $(LOCATION)
 
   - stage: ${{ parameters.name }}

diff --git a/.pipelines/cni/singletenancy/linux-cniv2-template.yaml b/.pipelines/cni/singletenancy/linux-cniv2-template.yaml
@@ -102,9 +102,9 @@ stages:
           - template: ../load-test-templates/pod-deployment-template.yaml
             parameters:
               clusterName: ${{ parameters.clusterName }}-$(commitID)
-              scaleup: ${LINUX_SCALEUP}
+              scaleup: ${SCALEUP_LINUX}
               os: ${{ parameters.os }}
-              iterations: ${LINUX_ITERATIONS}
+              iterations: ${ITERATIONS_LINUX}
               nodeCount: ${{ parameters.nodeCount }}
           - template: ../load-test-templates/validate-state-template.yaml
             parameters:
@@ -119,7 +119,7 @@ stages:
             parameters:
               clusterName: ${{ parameters.clusterName }}-$(commitID)
               nodeCount: ${{ parameters.nodeCount }}
-              scaleup: ${LINUX_SCALEUP}
+              scaleup: ${SCALEUP_LINUX}
           - template: ../load-test-templates/validate-state-template.yaml
             parameters:
               clusterName: ${{ parameters.clusterName }}-$(commitID)
@@ -134,7 +134,7 @@ stages:
             parameters:
               clusterName: ${{ parameters.clusterName }}-$(commitID)
               cni: cniv2
-              scaleup: ${LINUX_SCALEUP}
+              scaleup: ${SCALEUP_LINUX}
               nodeCount: ${{ parameters.nodeCount }}
       - job: recover
         displayName: "Recover Resources"

diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
@@ -349,7 +349,6 @@ stages:
       clusterName: "ciliumpodsubnetcnie2e"
       vmSize: Standard_B2ms
       k8sVersion: ""
-      windowsOsSku: ""
       dependsOn: "containerize"
 
   # Cilium Overlay E2E tests
@@ -373,7 +372,6 @@ stages:
       clusterName: "ciliumoverlaycnie2e"
       vmSize: Standard_B2ms
       k8sVersion: ""
-      windowsOsSku: ""
       dependsOn: "containerize"
 
   # Azure Overlay E2E tests
@@ -420,7 +418,6 @@ stages:
       clusterName: "swiftcnie2e"
       vmSize: Standard_B2ms
       k8sVersion: ""
-      windowsOsSku: ""
       dependsOn: "containerize"
 
   # CNIv1 E2E tests

diff --git a/.pipelines/singletenancy/aks/e2e-job-template.yaml b/.pipelines/singletenancy/aks/e2e-job-template.yaml
@@ -29,6 +29,7 @@ stages:
           clusterType: ${{ parameters.clusterType }}
           clusterName: ${{ parameters.clusterName }}-$(commitID)
           vmSize: ${{ parameters.vmSize }}
+          vmSizeWin: ${{ parameters.vmSize }} # Matching linux vmSize
           k8sVersion: ${{ parameters.k8sVersion }}
           dependsOn: ${{ parameters.dependsOn }}
           region: $(REGION_AKS_CLUSTER_TEST)

diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml
@@ -4,8 +4,9 @@ parameters:
   clusterType: ""
   clusterName: "" # Recommended to pass in unique identifier
   vmSize: ""
+  vmSizeWin: ""
   k8sVersion: ""
-  windowsOsSku: "Windows2022" # Currently we only support Windows2022
+  osSkuWin: "Windows2022" # Currently we only support Windows2022
   dependsOn: ""
   region: ""
 
@@ -31,7 +32,14 @@ jobs:
             fi
             mkdir -p ~/.kube/
             make -C ./hack/aks azcfg AZCLI=az REGION=${{ parameters.region }}
-            make -C ./hack/aks ${{ parameters.clusterType }} AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) CLUSTER=${{ parameters.clusterName }} K8S_VER=${{ parameters.k8sVersion }} VM_SIZE=${{ parameters.vmSize }} WINDOWS_OS_SKU=${{ parameters.windowsOsSku }} WINDOWS_VM_SKU=${{ parameters.vmSize }} WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD}
+
+            make -C ./hack/aks ${{ parameters.clusterType }} \
+            AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) \
+            CLUSTER=${{ parameters.clusterName }} K8S_VER=${{ parameters.k8sVersion }} \
+            VM_SIZE=${{ parameters.vmSize }} VM_SIZE_WIN=${{ parameters.vmSizeWin }} \
+            OS_SKU_WIN=${{ parameters.osSkuWin }} \
+            WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD}
+
             echo "Cluster successfully created"
         displayName: Cluster - ${{ parameters.clusterType }}
         continueOnError: ${{ contains(parameters.clusterType, 'dualstack') }}
diff --git a/Makefile b/Makefile
@@ -257,7 +257,7 @@ ACNCLI_PLATFORM_TAG    		 ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VE
 CNI_DROPGZ_PLATFORM_TAG 	 ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNI_DROPGZ_VERSION)
 CNI_DROPGZ_TEST_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNI_DROPGZ_TEST_VERSION)
 CNS_PLATFORM_TAG        	 ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNS_VERSION)
-CNS_WINDOWS_PLATFORM_TAG 	 ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNS_VERSION)-$(WINDOWS_OS_SKU)
+CNS_WINDOWS_PLATFORM_TAG 	 ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNS_VERSION)-$(OS_SKU_WIN)
 NPM_PLATFORM_TAG        	 ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(NPM_VERSION)