From 0c8106a20a04409d629e8c4dd8480394982e4b08 Mon Sep 17 00:00:00 2001 From: Evan Baker Date: Tue, 26 Sep 2023 23:37:06 +0000 Subject: [PATCH] fix os_sku and vm_size env vars Signed-off-by: Evan Baker --- .../load-test-templates/create-cluster-template.yaml | 2 +- .pipelines/cni/pipeline.yaml | 12 ++++++------ .pipelines/templates/create-cluster.yaml | 2 +- Makefile | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.pipelines/cni/load-test-templates/create-cluster-template.yaml b/.pipelines/cni/load-test-templates/create-cluster-template.yaml index ae2b9951c5..6f5cfe52d2 100644 --- a/.pipelines/cni/load-test-templates/create-cluster-template.yaml +++ b/.pipelines/cni/load-test-templates/create-cluster-template.yaml @@ -15,6 +15,6 @@ 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.windowsVMSize }} WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD} name: "CreateAksCluster" displayName: "Create AKS Cluster" diff --git a/.pipelines/cni/pipeline.yaml b/.pipelines/cni/pipeline.yaml index 5039fa8d6c..01b065d017 100644 --- a/.pipelines/cni/pipeline.yaml +++ b/.pipelines/cni/pipeline.yaml @@ -107,7 +107,7 @@ stages: clusterType: overlay-byocni-nokubeproxy-up clusterName: "cilium-overlay" nodeCount: ${CILIUM_NODE_COUNT} - vmSize: ${CILIUM_VM_SKU} + vmSize: ${CILIUM_VM_SIZE} - template: singletenancy/cniv1-template.yaml parameters: @@ -115,8 +115,8 @@ stages: clusterType: windows-cniv1-up clusterName: win22-cniv1 nodeCount: ${WINDOWS_NODE_COUNT} - vmSize: ${WINDOWS_LINUX_VM_SKU} - windowsVMSize: ${WINDOWS_VM_SKU} + vmSize: ${WINDOWS_LINUX_VM_SIZE} + windowsVMSize: ${WINDOWS_VM_SIZE} os: windows os_version: 'ltsc2022' arch: amd64 @@ -129,7 +129,7 @@ stages: clusterType: linux-cniv1-up clusterName: linux-cniv1 nodeCount: ${LINUX_NODE_COUNT} - vmSize: ${LINUX_VM_SKU} + vmSize: ${VM_SIZE_LINUX} os: linux arch: amd64 scaleup: ${LINUX_SCALEUP} @@ -141,7 +141,7 @@ stages: clusterType: swift-byocni-up clusterName: linux-cniv2-podsubnet nodeCount: ${LINUX_NODE_COUNT} - vmSize: ${LINUX_VM_SKU} + vmSize: ${VM_SIZE_LINUX} arch: amd64 - template: singletenancy/linux-cniv2-template.yaml @@ -150,7 +150,7 @@ stages: clusterType: overlay-byocni-up clusterName: linux-cniv2-overlay nodeCount: ${LINUX_NODE_COUNT} - vmSize: ${LINUX_VM_SKU} + vmSize: ${VM_SIZE_LINUX} arch: amd64 - stage: delete_resources diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml index ea2c007764..75c1054663 100644 --- a/.pipelines/templates/create-cluster.yaml +++ b/.pipelines/templates/create-cluster.yaml @@ -31,7 +31,7 @@ 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 }} OS_SKU_WIN=${{ parameters.windowsOsSku }} VM_SIZE_WIN=${{ parameters.vmSize }} 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 index ae3ea2cb27..05481cfe6a 100644 --- 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)