From 7f55ca97de1595484ae3bfaa104ba053f8759123 Mon Sep 17 00:00:00 2001 From: alegal Date: Mon, 17 Oct 2022 16:39:24 -0700 Subject: [PATCH 1/3] remove akse linux and pass ossku to cluster create --- .pipelines/pipeline.yaml | 25 ++----------------- .../aks-swift/e2e-job-template.yaml | 3 ++- .../aks-swift/e2e-step-template.yaml | 3 ++- hack/swift/Makefile | 2 ++ 4 files changed, 8 insertions(+), 25 deletions(-) diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index f24a75e853..ef8bd0e3e6 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -286,20 +286,11 @@ stages: - template: singletenancy/aks-swift/e2e-job-template.yaml parameters: name: "aks_swift_e2e" - displayName: AKS Swift + displayName: AKS Swift Ubuntu pipelineBuildImage: "$(BUILD_IMAGE)" testDropgz: "" clusterName: "swifte2e" - - - template: singletenancy/aks-engine/e2e-job-template.yaml - parameters: - name: "ubuntu_18_04_linux_e2e" - displayName: Ubuntu 18.04 - pipelineBuildImage: "$(BUILD_IMAGE)" - clusterDefinition: "cniLinux1804.json" - clusterDefinitionCniTypeKey: "azureCNIURLLinux" - clusterDefinitionCniBuildOS: "linux" - clusterDefinitionCniBuildExt: ".tgz" + osSku: "Ubuntu" - template: singletenancy/aks-engine/e2e-job-template.yaml parameters: @@ -321,25 +312,13 @@ stages: clusterDefinitionCniBuildOS: "windows" clusterDefinitionCniBuildExt: ".zip" - # - template: singletenancy/aks-engine/e2e-job-template.yaml - # parameters: - # name: "windows_20_22_e2e" - # displayName: "Windows 2022" - # pipelineBuildImage: "$(BUILD_IMAGE)" - # clusterDefinition: "cniWindows2022.json" - # clusterDefinitionCniTypeKey: "azureCNIURLWindows" - # clusterDefinitionCniBuildOS: "windows" - # clusterDefinitionCniBuildExt: ".zip" - - stage: cleanup displayName: Cleanup dependsOn: - "aks_swift_e2e" - "cilium_e2e" - - "ubuntu_18_04_linux_e2e" - "windows_19_03_e2e" - "windows_20_04_e2e" - # - "windows_20_22_e2e" jobs: - job: delete_remote_artifacts displayName: Delete remote artifacts diff --git a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml index f79c23f867..0e3134f1e7 100644 --- a/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml +++ b/.pipelines/singletenancy/aks-swift/e2e-job-template.yaml @@ -4,7 +4,7 @@ parameters: pipelineBuildImage: "$(BUILD_IMAGE)" testDropgz: "" clusterName: "" - + osSku: "" stages: - stage: ${{ parameters.name }} displayName: E2E - ${{ parameters.displayName }} @@ -30,3 +30,4 @@ stages: name: ${{ parameters.name }} testDropgz: ${{ parameters.testDropgz }} clusterName: ${{ parameters.clusterName }} + osSku: ${{ parameters.osSku }} diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml index b7138ca53f..51423cfae4 100644 --- a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml +++ b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml @@ -2,6 +2,7 @@ parameters: name: "" testDropgz: "" clusterName: "" + osSku: "" steps: - bash: | @@ -32,7 +33,7 @@ steps: mkdir -p ~/.kube/ echo "Create AKS cluster" make -C ./hack/swift azcfg AZCLI=az - make -C ./hack/swift byocni-up SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(make revision) + make -C ./hack/swift byocni-up SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) AZCLI=az CLUSTER=${{ parameters.clusterName }}-${{ parameters.osSku }-$(make revision) OSSKU=${{ parameters.osSku } echo "Cluster successfully created" displayName: Create test cluster condition: succeeded() diff --git a/hack/swift/Makefile b/hack/swift/Makefile index 4f816a3ec5..30eec6eea1 100644 --- a/hack/swift/Makefile +++ b/hack/swift/Makefile @@ -9,6 +9,7 @@ AZCLI ?= docker run -v $(AZCFG):/root/.azure -v $(KUBECFG):/root/.kube -v $(SS # overrideable variables USER ?= $(whoami) +OSSKU ?= Ubuntu CLUSTER ?= $(USER)-$(REGION) GROUP ?= $(CLUSTER) REGION ?= centraluseuap @@ -84,6 +85,7 @@ byocni-up: rg-up net-up ## Brings up a swift cluster $name in $SUB/$REGION --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ --pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \ --generate-ssh-keys \ + --os-sku $(OSSKU) --yes @$(MAKE) set-kubeconf From 9f88d0c7147c2f7d972bc534d21644c1b46a0fa3 Mon Sep 17 00:00:00 2001 From: aegal Date: Wed, 19 Oct 2022 10:16:22 -0700 Subject: [PATCH 2/3] Update .pipelines/singletenancy/aks-swift/e2e-step-template.yaml Co-authored-by: Evan Baker --- .pipelines/singletenancy/aks-swift/e2e-step-template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml index 51423cfae4..0586ba1d66 100644 --- a/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml +++ b/.pipelines/singletenancy/aks-swift/e2e-step-template.yaml @@ -33,7 +33,7 @@ steps: mkdir -p ~/.kube/ echo "Create AKS cluster" make -C ./hack/swift azcfg AZCLI=az - make -C ./hack/swift byocni-up SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) AZCLI=az CLUSTER=${{ parameters.clusterName }}-${{ parameters.osSku }-$(make revision) OSSKU=${{ parameters.osSku } + make -C ./hack/swift byocni-up SUB=$(SUB_AZURE_NETWORK_AGENT_TEST) AZCLI=az CLUSTER=${{ parameters.clusterName }}-${{ parameters.osSku }}-$(make revision) OSSKU=${{ parameters.osSku }} echo "Cluster successfully created" displayName: Create test cluster condition: succeeded() From 6613607b118bb1292d0fbdb3103d3c405a0bdab1 Mon Sep 17 00:00:00 2001 From: aegal Date: Thu, 20 Oct 2022 10:59:24 -0700 Subject: [PATCH 3/3] Update Makefile correct typo --- hack/swift/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/swift/Makefile b/hack/swift/Makefile index 30eec6eea1..708534acc1 100644 --- a/hack/swift/Makefile +++ b/hack/swift/Makefile @@ -85,7 +85,7 @@ byocni-up: rg-up net-up ## Brings up a swift cluster $name in $SUB/$REGION --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ --pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \ --generate-ssh-keys \ - --os-sku $(OSSKU) + --os-sku $(OSSKU) \ --yes @$(MAKE) set-kubeconf