From b596518f21dd431d598e38f121bb28c2cc0523de Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 20 Jun 2024 10:03:58 -0700 Subject: [PATCH 01/54] Create an outbound public ip for LB/Cilium cluster --- hack/aks/Makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 54b39d712f..ca9a78037d 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -133,13 +133,23 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO @$(MAKE) set-kubeconf overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster + $(AZCLI) publicIpName="public-ip-overlay-cilium" + $(AZCLI) az network public-ip create --name $publicIpName \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags 'FirstPartyUsage=/TestTagging-O365' \ + --location $LOCATION \ + --sku Standard \ + --tier Regional \ + --version IPv4 + $(AZCLI) publicIpId=$(az network public-ip show -g $RG -n $publicIpName --query id -o tsv) $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-sku basic \ + --load-balancer-outbound-ips $publicIpId \ --network-plugin azure \ --network-dataplane cilium \ --network-plugin-mode overlay \ @@ -445,6 +455,9 @@ down: ## Delete the cluster @$(MAKE) unset-kubeconf @$(MAKE) rg-down +#clean-public-ip: +# $(AZCLI) Remove-AzPublicIpAddress -Name $publicIpName -ResourceGroupName $(GROUP) + restart-vmss: ## Restarts the nodes in the cluster $(AZCLI) vmss restart -g MC_${GROUP}_${CLUSTER}_${REGION} --name $(VMSS_NAME) From f36785115bbcc92693799f46a282ee1f71425b05 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 05:07:23 -0700 Subject: [PATCH 02/54] create and attach public ip for cilium e2e cluster --- hack/aks/Makefile | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index ca9a78037d..c3b1ca87f8 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -133,23 +133,12 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO @$(MAKE) set-kubeconf overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster - $(AZCLI) publicIpName="public-ip-overlay-cilium" - $(AZCLI) az network public-ip create --name $publicIpName \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags 'FirstPartyUsage=/TestTagging-O365' \ - --location $LOCATION \ - --sku Standard \ - --tier Regional \ - --version IPv4 - $(AZCLI) publicIpId=$(az network public-ip show -g $RG -n $publicIpName --query id -o tsv) $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips $publicIpId \ --network-plugin azure \ --network-dataplane cilium \ --network-plugin-mode overlay \ @@ -195,13 +184,23 @@ endif @$(MAKE) set-kubeconf swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy + #$(AZCLI) publicIpName="" + $(AZCLI) az network public-ip create --name 'public-ip-ciliume2e' \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags 'FirstPartyUsage=/TestTagging-O365' \ + --location $LOCATION \ + --sku Standard \ + --tier Regional \ + --version IPv4 + $(AZCLI) publicIpId=$(az network public-ip show -g $RG -n $publicIpName --query id -o tsv) $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-sku basic \ + --load-balancer-outbound-ips $publicIpId \ --network-plugin none \ --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 \ From 29b1a928ff8a3537d659b12ea45cf35ed305bf4b Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 05:18:05 -0700 Subject: [PATCH 03/54] Test cluster independent ip creation --- .pipelines/templates/create-cluster.yaml | 2 +- hack/aks/Makefile | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml index bca48745ee..a05b4f326d 100644 --- a/.pipelines/templates/create-cluster.yaml +++ b/.pipelines/templates/create-cluster.yaml @@ -33,7 +33,7 @@ jobs: fi mkdir -p ~/.kube/ make -C ./hack/aks azcfg AZCLI=az REGION=${{ parameters.region }} - + make -C ./hack/aks swift-byoncni-nokubeproxy-public-ip make -C ./hack/aks ${{ parameters.clusterType }} \ AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) \ CLUSTER=${{ parameters.clusterName }} \ diff --git a/hack/aks/Makefile b/hack/aks/Makefile index c3b1ca87f8..775635666a 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -183,8 +183,7 @@ ifeq ($(OS),windows) endif @$(MAKE) set-kubeconf -swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy - #$(AZCLI) publicIpName="" +swift-byoncni-nokubeproxy-public-ip: rg-up swift-net-up $(AZCLI) az network public-ip create --name 'public-ip-ciliume2e' \ --resource-group $(GROUP) \ --allocation-method Static \ @@ -193,6 +192,10 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus --sku Standard \ --tier Regional \ --version IPv4 + + +swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy + #$(AZCLI) publicIpName="" $(AZCLI) publicIpId=$(az network public-ip show -g $RG -n $publicIpName --query id -o tsv) $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ From e7cd70d5227a7affda00a5c51d0226440542cb69 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 07:50:47 -0700 Subject: [PATCH 04/54] Test outbound public ip creation --- .pipelines/pipeline.yaml | 1 + .pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml | 1 + hack/aks/Makefile | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index 8db588f8af..4823033dc7 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -406,6 +406,7 @@ stages: vmSize: Standard_B2ms k8sVersion: "" dependsOn: "test" + publicIp: "ciliume2e-publicip" # Cilium Overlay E2E tests - template: singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml index 5af6a31ab9..6606158fb4 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml @@ -29,6 +29,7 @@ stages: k8sVersion: ${{ parameters.k8sVersion }} dependsOn: ${{ parameters.dependsOn }} region: $(REGION_AKS_CLUSTER_TEST) + publicIp: ${{ parameters.publicIp }} - stage: ${{ parameters.name }} displayName: E2E - ${{ parameters.displayName }} diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 775635666a..c76bdec537 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -25,6 +25,7 @@ SUB ?= $(AZURE_SUBSCRIPTION) CLUSTER ?= $(USER)-$(REGION) GROUP ?= $(CLUSTER) VNET ?= $(CLUSTER) +PUBLICIP ?= $() ##@ Help @@ -184,7 +185,7 @@ endif @$(MAKE) set-kubeconf swift-byoncni-nokubeproxy-public-ip: rg-up swift-net-up - $(AZCLI) az network public-ip create --name 'public-ip-ciliume2e' \ + $(AZCLI) az network public-ip create --name $() \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags 'FirstPartyUsage=/TestTagging-O365' \ @@ -194,7 +195,7 @@ swift-byoncni-nokubeproxy-public-ip: rg-up swift-net-up --version IPv4 -swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy +swift-byocni-nokubeproxy-up: #rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy #$(AZCLI) publicIpName="" $(AZCLI) publicIpId=$(az network public-ip show -g $RG -n $publicIpName --query id -o tsv) $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ From 3697054783a313ae89fe778c859f2e866f99e028 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 07:58:50 -0700 Subject: [PATCH 05/54] Test outbound public ip creation --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index c76bdec537..3852a8ee10 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -185,7 +185,7 @@ endif @$(MAKE) set-kubeconf swift-byoncni-nokubeproxy-public-ip: rg-up swift-net-up - $(AZCLI) az network public-ip create --name $() \ + $(AZCLI) az network public-ip create --name "ciliume2eip" \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags 'FirstPartyUsage=/TestTagging-O365' \ From ec4173378e35b5904d02a8afbcfc48c73def7998 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 08:14:41 -0700 Subject: [PATCH 06/54] Test outbound public ip creation with azcli creds --- .pipelines/templates/create-cluster.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml index a05b4f326d..da51147040 100644 --- a/.pipelines/templates/create-cluster.yaml +++ b/.pipelines/templates/create-cluster.yaml @@ -33,7 +33,13 @@ jobs: fi mkdir -p ~/.kube/ make -C ./hack/aks azcfg AZCLI=az REGION=${{ parameters.region }} - make -C ./hack/aks swift-byoncni-nokubeproxy-public-ip + make -C ./hack/aks swift-byoncni-nokubeproxy-public-ip \ + 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} + make -C ./hack/aks ${{ parameters.clusterType }} \ AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) \ CLUSTER=${{ parameters.clusterName }} \ From 3e6f5c882116ff4b14273a3cbdadf3d05d0cf818 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 09:08:28 -0700 Subject: [PATCH 07/54] Test outbound public ip creation with azcli creds --- .pipelines/templates/create-cluster.yaml | 12 ++++++------ hack/aks/Makefile | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml index da51147040..556209ae0d 100644 --- a/.pipelines/templates/create-cluster.yaml +++ b/.pipelines/templates/create-cluster.yaml @@ -33,12 +33,12 @@ jobs: fi mkdir -p ~/.kube/ make -C ./hack/aks azcfg AZCLI=az REGION=${{ parameters.region }} - make -C ./hack/aks swift-byoncni-nokubeproxy-public-ip \ - 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} +# make -C ./hack/aks swift-byoncni-nokubeproxy-public-ip \ +# 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} make -C ./hack/aks ${{ parameters.clusterType }} \ AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) \ diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 3852a8ee10..2f9e47db15 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -184,7 +184,7 @@ ifeq ($(OS),windows) endif @$(MAKE) set-kubeconf -swift-byoncni-nokubeproxy-public-ip: rg-up swift-net-up +swift-byoncni-nokubeproxy-public-ip: $(AZCLI) az network public-ip create --name "ciliume2eip" \ --resource-group $(GROUP) \ --allocation-method Static \ @@ -194,8 +194,7 @@ swift-byoncni-nokubeproxy-public-ip: rg-up swift-net-up --tier Regional \ --version IPv4 - -swift-byocni-nokubeproxy-up: #rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy +swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-byoncni-nokubeproxy-public-ip ## Bring up a SWIFT BYO CNI cluster without kube-proxy #$(AZCLI) publicIpName="" $(AZCLI) publicIpId=$(az network public-ip show -g $RG -n $publicIpName --query id -o tsv) $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ From 87ea244353107324e43c5ac08d9406559342f159 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 09:10:44 -0700 Subject: [PATCH 08/54] Add lb ip creation alias call for clusters in makefile --- .pipelines/templates/create-cluster.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml index 556209ae0d..228d67906f 100644 --- a/.pipelines/templates/create-cluster.yaml +++ b/.pipelines/templates/create-cluster.yaml @@ -39,7 +39,6 @@ jobs: # 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} - make -C ./hack/aks ${{ parameters.clusterType }} \ AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) \ CLUSTER=${{ parameters.clusterName }} \ From 651a405e8915a299a3b715675e766f66b2f1c0ea Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 09:11:36 -0700 Subject: [PATCH 09/54] Add lb ip creation alias call for clusters in makefile --- .pipelines/templates/create-cluster.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml index 228d67906f..0b444121f7 100644 --- a/.pipelines/templates/create-cluster.yaml +++ b/.pipelines/templates/create-cluster.yaml @@ -33,12 +33,6 @@ jobs: fi mkdir -p ~/.kube/ make -C ./hack/aks azcfg AZCLI=az REGION=${{ parameters.region }} -# make -C ./hack/aks swift-byoncni-nokubeproxy-public-ip \ -# 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} make -C ./hack/aks ${{ parameters.clusterType }} \ AZCLI=az REGION=${{ parameters.region }} SUB=$(SUB_AZURE_NETWORK_AGENT_BUILD_VALIDATIONS) \ CLUSTER=${{ parameters.clusterName }} \ From d390d45622c8d274a2955226aac502979cfc8f15 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 09:34:56 -0700 Subject: [PATCH 10/54] Add lb ip creation alias call for clusters in makefile --- .pipelines/templates/create-cluster.yaml | 2 ++ hack/aks/Makefile | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml index 0b444121f7..8d0551ecc3 100644 --- a/.pipelines/templates/create-cluster.yaml +++ b/.pipelines/templates/create-cluster.yaml @@ -38,8 +38,10 @@ jobs: CLUSTER=${{ parameters.clusterName }} \ VM_SIZE=${{ parameters.vmSize }} VM_SIZE_WIN=${{ parameters.vmSizeWin }} \ OS_SKU_WIN=${{ parameters.osSkuWin }} OS=${{parameters.os}} \ + PUBLIC_IP = ${{ parameters.publicIp }} \ WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD} + echo "Cluster successfully created" displayName: Cluster - ${{ parameters.clusterType }} continueOnError: ${{ contains(parameters.clusterType, 'dualstack') }} diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 2f9e47db15..7780fc90cf 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -25,7 +25,6 @@ SUB ?= $(AZURE_SUBSCRIPTION) CLUSTER ?= $(USER)-$(REGION) GROUP ?= $(CLUSTER) VNET ?= $(CLUSTER) -PUBLICIP ?= $() ##@ Help @@ -185,7 +184,7 @@ endif @$(MAKE) set-kubeconf swift-byoncni-nokubeproxy-public-ip: - $(AZCLI) az network public-ip create --name "ciliume2eip" \ + $(AZCLI) az network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags 'FirstPartyUsage=/TestTagging-O365' \ From edf70ee42b777bd6f5c1f2018355d3177aadf0a7 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 09:52:38 -0700 Subject: [PATCH 11/54] Add lb ip creation alias call for clusters in makefile --- .pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml | 1 + .pipelines/templates/create-cluster.yaml | 2 +- hack/aks/Makefile | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml index 6606158fb4..b83b4b89f6 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml @@ -30,6 +30,7 @@ stages: dependsOn: ${{ parameters.dependsOn }} region: $(REGION_AKS_CLUSTER_TEST) publicIp: ${{ parameters.publicIp }} + ip-tags: ${{ parameters.ip-tags }} - stage: ${{ parameters.name }} displayName: E2E - ${{ parameters.displayName }} diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml index 8d0551ecc3..006aa8c6d8 100644 --- a/.pipelines/templates/create-cluster.yaml +++ b/.pipelines/templates/create-cluster.yaml @@ -38,7 +38,7 @@ jobs: CLUSTER=${{ parameters.clusterName }} \ VM_SIZE=${{ parameters.vmSize }} VM_SIZE_WIN=${{ parameters.vmSizeWin }} \ OS_SKU_WIN=${{ parameters.osSkuWin }} OS=${{parameters.os}} \ - PUBLIC_IP = ${{ parameters.publicIp }} \ + PUBLIC_IP=${{ parameters.publicIp }} \ WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD} diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 7780fc90cf..283f245ef5 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -187,8 +187,8 @@ swift-byoncni-nokubeproxy-public-ip: $(AZCLI) az network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags 'FirstPartyUsage=/TestTagging-O365' \ - --location $LOCATION \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ --sku Standard \ --tier Regional \ --version IPv4 From cb2fa8f9a7fc0f72aafbba3e474bb972fa4deca6 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 09:56:08 -0700 Subject: [PATCH 12/54] Add lb ip creation alias call for clusters in makefile --- .pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml | 1 - .pipelines/templates/create-cluster.yaml | 3 +-- hack/aks/Makefile | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml index b83b4b89f6..6606158fb4 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml @@ -30,7 +30,6 @@ stages: dependsOn: ${{ parameters.dependsOn }} region: $(REGION_AKS_CLUSTER_TEST) publicIp: ${{ parameters.publicIp }} - ip-tags: ${{ parameters.ip-tags }} - stage: ${{ parameters.name }} displayName: E2E - ${{ parameters.displayName }} diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml index 006aa8c6d8..46bad33c03 100644 --- a/.pipelines/templates/create-cluster.yaml +++ b/.pipelines/templates/create-cluster.yaml @@ -35,10 +35,9 @@ jobs: 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 }} \ + CLUSTER=${{ parameters.clusterName }} PUBLIC_IP=${{ parameters.publicIp }}\ VM_SIZE=${{ parameters.vmSize }} VM_SIZE_WIN=${{ parameters.vmSizeWin }} \ OS_SKU_WIN=${{ parameters.osSkuWin }} OS=${{parameters.os}} \ - PUBLIC_IP=${{ parameters.publicIp }} \ WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD} diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 283f245ef5..cc6071bf91 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -25,7 +25,6 @@ SUB ?= $(AZURE_SUBSCRIPTION) CLUSTER ?= $(USER)-$(REGION) GROUP ?= $(CLUSTER) VNET ?= $(CLUSTER) - ##@ Help help: ## Display this help From 2d17d5df1392a0b380bf9667c4ca65216444f1f6 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:33:01 -0700 Subject: [PATCH 13/54] Add lb ip creation alias call for clusters in makefile --- hack/aks/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index cc6071bf91..06e30f7b73 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -87,6 +87,15 @@ overlay-net-up: ## Create vnet, nodenet subnets $(AZCLI) network vnet create -g $(GROUP) -l $(REGION) --name $(VNET) --address-prefixes 10.0.0.0/8 -o none $(AZCLI) network vnet subnet create -g $(GROUP) --vnet-name $(VNET) --name nodenet --address-prefix 10.10.0.0/16 -o none +swift-public-ip: ## Create public ip + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 ##@ AKS Clusters @@ -182,18 +191,9 @@ ifeq ($(OS),windows) endif @$(MAKE) set-kubeconf -swift-byoncni-nokubeproxy-public-ip: - $(AZCLI) az network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-byoncni-nokubeproxy-public-ip ## Bring up a SWIFT BYO CNI cluster without kube-proxy - #$(AZCLI) publicIpName="" $(AZCLI) publicIpId=$(az network public-ip show -g $RG -n $publicIpName --query id -o tsv) $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ From 00549ce19d20d97d3baaed6ff2528cc8f721b422 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:34:25 -0700 Subject: [PATCH 14/54] Add lb ip creation alias call for clusters in makefile --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 06e30f7b73..e920695cef 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -193,7 +193,7 @@ endif -swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-byoncni-nokubeproxy-public-ip ## Bring up a SWIFT BYO CNI cluster without kube-proxy +swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-public-ip ## Bring up a SWIFT BYO CNI cluster without kube-proxy $(AZCLI) publicIpId=$(az network public-ip show -g $RG -n $publicIpName --query id -o tsv) $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ From bf50b7792db71b2c72f3561196a75079fcece11b Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Tue, 25 Jun 2024 11:58:25 -0700 Subject: [PATCH 15/54] Add lb ip creation alias call for clusters in makefile --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index e920695cef..5b57e79126 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -88,7 +88,7 @@ overlay-net-up: ## Create vnet, nodenet subnets $(AZCLI) network vnet subnet create -g $(GROUP) --vnet-name $(VNET) --name nodenet --address-prefix 10.10.0.0/16 -o none swift-public-ip: ## Create public ip - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ + $(AZCLI) network public-ip create --name "ciliumpublicip" \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags "FirstPartyUsage=/TestTagging-O365" \ From 19b56006ee7717d5f77a30eeb7ad3b1cca3a7091 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Wed, 26 Jun 2024 08:05:43 -0700 Subject: [PATCH 16/54] Add lb ip creation alias call for clusters in makefile --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 5b57e79126..6f775ebb22 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -201,7 +201,7 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-public-ip ## Bring up a S --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips $publicIpId \ + --load-balancer-outbound-ips $(publicIpId) \ --network-plugin none \ --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 \ From 460a1cfd4f0caff72759e1a366dddd505e174a15 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Wed, 26 Jun 2024 08:24:58 -0700 Subject: [PATCH 17/54] Add lb ip creation alias call for clusters in makefile --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 6f775ebb22..8cafab5434 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -194,7 +194,7 @@ endif swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-public-ip ## Bring up a SWIFT BYO CNI cluster without kube-proxy - $(AZCLI) publicIpId=$(az network public-ip show -g $RG -n $publicIpName --query id -o tsv) + publicIpId= $(AZCLI) network public-ip show -g $RG -n $publicIpName --query id -o tsv) $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ From 9a332d00ecf52e8bf1f1e6c7cc5e39e7a8e60867 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Wed, 26 Jun 2024 08:57:50 -0700 Subject: [PATCH 18/54] Add lb ip creation alias call for clusters in makefile --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 8cafab5434..957f1ead57 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -194,7 +194,7 @@ endif swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-public-ip ## Bring up a SWIFT BYO CNI cluster without kube-proxy - publicIpId= $(AZCLI) network public-ip show -g $RG -n $publicIpName --query id -o tsv) + publicIpId= $(AZCLI) network public-ip show -g $RG -n $publicIpName --query id -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ From 73228a4fc6baea04b0987d7f7a496d02ac2c1f2c Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Wed, 26 Jun 2024 09:20:25 -0700 Subject: [PATCH 19/54] Add lb ip creation alias call for clusters in makefile --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 957f1ead57..3508afb3f3 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -194,7 +194,7 @@ endif swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-public-ip ## Bring up a SWIFT BYO CNI cluster without kube-proxy - publicIpId= $(AZCLI) network public-ip show -g $RG -n $publicIpName --query id -o tsv + publicIpId= $(AZCLI) network public-ip show -g $(GROUP) -n "ciliumpublicip" --query id -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ From f1c824779206b2ab7cfd2eee9895b86117977a18 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Wed, 26 Jun 2024 09:54:04 -0700 Subject: [PATCH 20/54] Add lb ip creation alias call for clusters in makefile --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 3508afb3f3..ae56bfe108 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -201,7 +201,7 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-public-ip ## Bring up a S --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips $(publicIpId) \ + --load-balancer-outbound-ips $publicIpId \ --network-plugin none \ --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 \ From 926acd609fc0989bacba277f4f25daec0e81a6ec Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Wed, 26 Jun 2024 09:55:16 -0700 Subject: [PATCH 21/54] Add lb ip creation alias call for clusters in makefile --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index ae56bfe108..012ac3fe50 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -201,7 +201,7 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-public-ip ## Bring up a S --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips $publicIpId \ + --load-balancer-outbound-ips publicIpId \ --network-plugin none \ --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 \ From 3cbbf710b796cb8eef949e3ed2c7810694567c9e Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 27 Jun 2024 05:09:55 -0700 Subject: [PATCH 22/54] Add lb ip creation alias call for clusters in makefile --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 012ac3fe50..727b466d2d 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -194,7 +194,7 @@ endif swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-public-ip ## Bring up a SWIFT BYO CNI cluster without kube-proxy - publicIpId= $(AZCLI) network public-ip show -g $(GROUP) -n "ciliumpublicip" --query id -o tsv + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "ciliumpublicip" --query id -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ From 99d5d42d4465f53c78303304aec39306d1ab59bf Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 27 Jun 2024 05:28:29 -0700 Subject: [PATCH 23/54] Add lb ip creation alias call for clusters in makefile --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 727b466d2d..383185403e 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -194,7 +194,7 @@ endif swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-public-ip ## Bring up a SWIFT BYO CNI cluster without kube-proxy - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "ciliumpublicip" --query id -o tsv + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "ciliumpublicip" --query id #-o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ From aa7064088f88fbdd376a900210fb1e35a87e0862 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 27 Jun 2024 06:10:42 -0700 Subject: [PATCH 24/54] Add lb ip creation alias call for clusters in makefile --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 383185403e..1ec0931f79 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -194,7 +194,7 @@ endif swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-public-ip ## Bring up a SWIFT BYO CNI cluster without kube-proxy - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "ciliumpublicip" --query id #-o tsv + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "ciliumpublicip" #--query id -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ From 28cba9e383e3408cf2decb2b8171ca54ccfa6e87 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 27 Jun 2024 06:41:47 -0700 Subject: [PATCH 25/54] Add lb ip creation alias call for clusters in makefile --- hack/aks/Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 1ec0931f79..924a18e9e2 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -87,7 +87,7 @@ overlay-net-up: ## Create vnet, nodenet subnets $(AZCLI) network vnet create -g $(GROUP) -l $(REGION) --name $(VNET) --address-prefixes 10.0.0.0/8 -o none $(AZCLI) network vnet subnet create -g $(GROUP) --vnet-name $(VNET) --name nodenet --address-prefix 10.10.0.0/16 -o none -swift-public-ip: ## Create public ip +public-ip-up: ## Create public ip $(AZCLI) network public-ip create --name "ciliumpublicip" \ --resource-group $(GROUP) \ --allocation-method Static \ @@ -97,6 +97,13 @@ swift-public-ip: ## Create public ip --tier Regional \ --version IPv4 +managed-identity-up: + $(AZCLI) identity create --name "managedidentity" --resource-group $(GROUP) --location $(REGION) + USER_ASSIGNED_CLIENT_ID=$(AZCLI) identity show --resource-group $(GROUP) --name "managedidentity" --query 'clientId' -o tsv + $(AZCLI) role assignment create \ + --assignee $(USER_ASSIGNED_CLIENT_ID) \ + --role "Network Contributor" \ + --scope "/subscriptions/$(SUB)/resourceGroups/$(GROUP)" ##@ AKS Clusters byocni-up: swift-byocni-up ## Alias to swift-byocni-up @@ -193,8 +200,8 @@ endif -swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-public-ip ## Bring up a SWIFT BYO CNI cluster without kube-proxy - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "ciliumpublicip" #--query id -o tsv +swift-byocni-nokubeproxy-up: rg-up swift-net-up public-ip-up managed-identity-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "ciliumpublicip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -202,6 +209,8 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up swift-public-ip ## Bring up a S --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ --load-balancer-outbound-ips publicIpId \ + --enable-managed-identity \ + --assign-identity "/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.ManagedIdentity/userAssignedIdentities/managedidentity" \ --network-plugin none \ --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 \ From 4a797f7d72d60ed890e896285d745998d24e97df Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 27 Jun 2024 06:42:47 -0700 Subject: [PATCH 26/54] Add managed identity to public ip/load balancer --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 924a18e9e2..3e6d33ca74 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -200,7 +200,7 @@ endif -swift-byocni-nokubeproxy-up: rg-up swift-net-up public-ip-up managed-identity-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy +swift-byocni-nokubeproxy-up: rg-up swift-net-up public-ip-up managed-identity-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "ciliumpublicip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ From 74efd8c07e06ab52b21726115cb8359570be0974 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 27 Jun 2024 07:20:06 -0700 Subject: [PATCH 27/54] Add managed identity to public ip/load balancer --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 3e6d33ca74..09eb977a6b 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -99,7 +99,7 @@ public-ip-up: ## Create public ip managed-identity-up: $(AZCLI) identity create --name "managedidentity" --resource-group $(GROUP) --location $(REGION) - USER_ASSIGNED_CLIENT_ID=$(AZCLI) identity show --resource-group $(GROUP) --name "managedidentity" --query 'clientId' -o tsv + USER_ASSIGNED_CLIENT_ID= $(AZCLI) identity show --resource-group $(GROUP) --name "managedidentity" --query id -o tsv $(AZCLI) role assignment create \ --assignee $(USER_ASSIGNED_CLIENT_ID) \ --role "Network Contributor" \ From c631b0c31e93671f63034ba8118be13baa13a8fb Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 27 Jun 2024 07:28:19 -0700 Subject: [PATCH 28/54] Test wo managed identity --- hack/aks/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 09eb977a6b..8082202877 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -199,8 +199,9 @@ endif @$(MAKE) set-kubeconf - -swift-byocni-nokubeproxy-up: rg-up swift-net-up public-ip-up managed-identity-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip +#--enable-managed-identity \ +#--assign-identity "/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.ManagedIdentity/userAssignedIdentities/managedidentity" +swift-byocni-nokubeproxy-up: rg-up swift-net-up public-ip-up #managed-identity-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "ciliumpublicip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ @@ -208,9 +209,7 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up public-ip-up managed-identity-up --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips publicIpId \ - --enable-managed-identity \ - --assign-identity "/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.ManagedIdentity/userAssignedIdentities/managedidentity" \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/ciliumpublicip \ --network-plugin none \ --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 \ From e0163239314c74d1c2e947aad74af14fb5481e4f Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Mon, 1 Jul 2024 02:30:40 -0700 Subject: [PATCH 29/54] Test wo managed identity --- hack/aks/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 8082202877..1f09922dbd 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -201,7 +201,15 @@ endif #--enable-managed-identity \ #--assign-identity "/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.ManagedIdentity/userAssignedIdentities/managedidentity" -swift-byocni-nokubeproxy-up: rg-up swift-net-up public-ip-up #managed-identity-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip +swift-byocni-nokubeproxy-up: rg-up swift-net-up #managed-identity-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip + $(AZCLI) network public-ip create --name "ciliumpublicip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "ciliumpublicip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ From aec6803eb866d74eef39d47785e9c1f7a2d2b04a Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Mon, 1 Jul 2024 02:31:37 -0700 Subject: [PATCH 30/54] Add Public ip to one cluster --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 1f09922dbd..38018a73e9 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -201,7 +201,7 @@ endif #--enable-managed-identity \ #--assign-identity "/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.ManagedIdentity/userAssignedIdentities/managedidentity" -swift-byocni-nokubeproxy-up: rg-up swift-net-up #managed-identity-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip +swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip $(AZCLI) network public-ip create --name "ciliumpublicip" \ --resource-group $(GROUP) \ --allocation-method Static \ From 273d39bdea0de33933a33e9f4c612ec542802c09 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Mon, 1 Jul 2024 03:34:50 -0700 Subject: [PATCH 31/54] Add public to all cluster creations --- hack/aks/Makefile | 141 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 113 insertions(+), 28 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 38018a73e9..3518c48f90 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -87,15 +87,6 @@ overlay-net-up: ## Create vnet, nodenet subnets $(AZCLI) network vnet create -g $(GROUP) -l $(REGION) --name $(VNET) --address-prefixes 10.0.0.0/8 -o none $(AZCLI) network vnet subnet create -g $(GROUP) --vnet-name $(VNET) --name nodenet --address-prefix 10.10.0.0/16 -o none -public-ip-up: ## Create public ip - $(AZCLI) network public-ip create --name "ciliumpublicip" \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 managed-identity-up: $(AZCLI) identity create --name "managedidentity" --resource-group $(GROUP) --location $(REGION) @@ -111,13 +102,22 @@ cilium-up: swift-cilium-up ## Alias to swift-cilium-up up: swift-up ## Alias to swift-up overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster + $(AZCLI) network public-ip create --name "overlay-cni-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-cni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-sku standard \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/overlay-cni-public-ip \ --network-plugin none \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -131,13 +131,22 @@ endif @$(MAKE) set-kubeconf overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy + $(AZCLI) network public-ip create --name "overlay-cni-no-kube-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-cni-no-kube-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-sku basic \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/overlay-cni-no-kube-public-ip \ --network-plugin none \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -148,12 +157,22 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO @$(MAKE) set-kubeconf overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster + $(AZCLI) network public-ip create --name "overlay-cillium-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-cillium-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/overlay-cillium-public-ip \ --network-plugin azure \ --network-dataplane cilium \ --network-plugin-mode overlay \ @@ -164,13 +183,22 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster @$(MAKE) set-kubeconf overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster + $(AZCLI) network public-ip create --name "overlay-azcni-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-azcni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-sku basic \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/overlay-azcni-public-ip \ --network-plugin azure \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -180,13 +208,22 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster @$(MAKE) set-kubeconf swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster + $(AZCLI) network public-ip create --name "swift-byo-cni-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-byo-cni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-sku standard \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/swift-byo-cni-public-ip \ --network-plugin none \ --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 \ @@ -198,11 +235,8 @@ ifeq ($(OS),windows) endif @$(MAKE) set-kubeconf - -#--enable-managed-identity \ -#--assign-identity "/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.ManagedIdentity/userAssignedIdentities/managedidentity" swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip - $(AZCLI) network public-ip create --name "ciliumpublicip" \ + $(AZCLI) network public-ip create --name "swift-byo-nok-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags "FirstPartyUsage=/TestTagging-O365" \ @@ -210,14 +244,14 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus --sku Standard \ --tier Regional \ --version IPv4 - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "ciliumpublicip" --query "ipAddress" -o tsv + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-byo-nok-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/ciliumpublicip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/swift-byo-nok-public-ip \ --network-plugin none \ --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 \ @@ -228,13 +262,22 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus @$(MAKE) set-kubeconf swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster + $(AZCLI) network public-ip create --name "swift-cilium-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-cilium-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-sku basic \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/swift-cilium-public-ip \ --network-plugin azure \ --network-dataplane cilium \ --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \ @@ -245,13 +288,22 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster @$(MAKE) set-kubeconf swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster + $(AZCLI) network public-ip create --name "swift-azcni-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-azcni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-sku basic \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/swift-azcni-public-ip \ --network-plugin azure \ --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 \ @@ -285,13 +337,22 @@ swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster # These AKS clusters can only be created in a limited subscription listed here: # https://dev.azure.com/msazure/CloudNativeCompute/_git/aks-rp?path=/resourceprovider/server/microsoft.com/containerservice/flags/network_flags.go&version=GBmaster&line=134&lineEnd=135&lineStartColumn=1&lineEndColumn=1&lineStyle=plain&_a=contents vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster + $(AZCLI) network public-ip create --name "vnetscale-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-sku basic \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/vnetscale-public-ip \ --network-plugin none \ --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 \ @@ -301,13 +362,22 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale @$(MAKE) set-kubeconf vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster without kube-proxy + $(AZCLI) network public-ip create --name "vnetscale-nok-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-nok-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-sku basic \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/vnetscale-nok-public-ip \ --network-plugin none \ --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 \ @@ -318,13 +388,22 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up @$(MAKE) set-kubeconf vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT Cilium cluster + $(AZCLI) network public-ip create --name "vnetscale-cilium-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-cilium-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-sku basic \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/vnetscale-cilium-public-ip \ --network-plugin azure \ --network-dataplane cilium \ --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \ @@ -335,13 +414,22 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale @$(MAKE) set-kubeconf vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT AzCNI cluster + $(AZCLI) network public-ip create --name "vnetscale-azcni-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-azcni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-sku basic \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/vnetscale-azcni-public-ip \ --network-plugin azure \ --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 \ @@ -471,9 +559,6 @@ down: ## Delete the cluster @$(MAKE) unset-kubeconf @$(MAKE) rg-down -#clean-public-ip: -# $(AZCLI) Remove-AzPublicIpAddress -Name $publicIpName -ResourceGroupName $(GROUP) - restart-vmss: ## Restarts the nodes in the cluster $(AZCLI) vmss restart -g MC_${GROUP}_${CLUSTER}_${REGION} --name $(VMSS_NAME) From d6de7541e517e70550dbb37b9fd95ff13874603c Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Mon, 1 Jul 2024 03:46:50 -0700 Subject: [PATCH 32/54] Add public ip --- .pipelines/pipeline.yaml | 1 - .../cilium/cilium-e2e-job-template.yaml | 1 - .pipelines/templates/create-cluster.yaml | 2 +- hack/aks/Makefile | 24 +++++++++---------- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml index d1de7b551c..e1ebacbc7f 100644 --- a/.pipelines/pipeline.yaml +++ b/.pipelines/pipeline.yaml @@ -406,7 +406,6 @@ stages: vmSize: Standard_B2ms k8sVersion: "" dependsOn: "test" - publicIp: "ciliume2e-publicip" # Cilium Overlay E2E tests - template: singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml diff --git a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml index 6606158fb4..5af6a31ab9 100644 --- a/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml +++ b/.pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml @@ -29,7 +29,6 @@ stages: k8sVersion: ${{ parameters.k8sVersion }} dependsOn: ${{ parameters.dependsOn }} region: $(REGION_AKS_CLUSTER_TEST) - publicIp: ${{ parameters.publicIp }} - stage: ${{ parameters.name }} displayName: E2E - ${{ parameters.displayName }} diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml index 46bad33c03..71e619a1da 100644 --- a/.pipelines/templates/create-cluster.yaml +++ b/.pipelines/templates/create-cluster.yaml @@ -35,7 +35,7 @@ jobs: 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 }} PUBLIC_IP=${{ parameters.publicIp }}\ + 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} diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 3518c48f90..73a07c1184 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -110,7 +110,7 @@ overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster --sku Standard \ --tier Regional \ --version IPv4 - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-cni-public-ip" --query "ipAddress" -o tsv + $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-cni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -139,7 +139,7 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO --sku Standard \ --tier Regional \ --version IPv4 - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-cni-no-kube-public-ip" --query "ipAddress" -o tsv + $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-cni-no-kube-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -165,7 +165,7 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster --sku Standard \ --tier Regional \ --version IPv4 - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-cillium-public-ip" --query "ipAddress" -o tsv + $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-cillium-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -191,7 +191,7 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster --sku Standard \ --tier Regional \ --version IPv4 - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-azcni-public-ip" --query "ipAddress" -o tsv + $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-azcni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -216,7 +216,7 @@ swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster --sku Standard \ --tier Regional \ --version IPv4 - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-byo-cni-public-ip" --query "ipAddress" -o tsv + $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-byo-cni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -244,7 +244,7 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus --sku Standard \ --tier Regional \ --version IPv4 - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-byo-nok-public-ip" --query "ipAddress" -o tsv + $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-byo-nok-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -270,7 +270,7 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster --sku Standard \ --tier Regional \ --version IPv4 - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-cilium-public-ip" --query "ipAddress" -o tsv + $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-cilium-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -296,7 +296,7 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster --sku Standard \ --tier Regional \ --version IPv4 - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-azcni-public-ip" --query "ipAddress" -o tsv + $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-azcni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -345,7 +345,7 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale --sku Standard \ --tier Regional \ --version IPv4 - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-public-ip" --query "ipAddress" -o tsv + $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -370,7 +370,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up --sku Standard \ --tier Regional \ --version IPv4 - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-nok-public-ip" --query "ipAddress" -o tsv + $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-nok-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -396,7 +396,7 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale --sku Standard \ --tier Regional \ --version IPv4 - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-cilium-public-ip" --query "ipAddress" -o tsv + $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-cilium-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -422,7 +422,7 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT --sku Standard \ --tier Regional \ --version IPv4 - publicIpId= $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-azcni-public-ip" --query "ipAddress" -o tsv + $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-azcni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ From 04ee4ebd8604268522cce01b01d15c047943822f Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Mon, 1 Jul 2024 04:01:19 -0700 Subject: [PATCH 33/54] Fix spacing --- .pipelines/templates/create-cluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pipelines/templates/create-cluster.yaml b/.pipelines/templates/create-cluster.yaml index 71e619a1da..bca48745ee 100644 --- a/.pipelines/templates/create-cluster.yaml +++ b/.pipelines/templates/create-cluster.yaml @@ -33,6 +33,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 }} \ @@ -40,7 +41,6 @@ jobs: OS_SKU_WIN=${{ parameters.osSkuWin }} OS=${{parameters.os}} \ WINDOWS_USERNAME=${WINDOWS_USERNAME} WINDOWS_PASSWORD=${WINDOWS_PASSWORD} - echo "Cluster successfully created" displayName: Cluster - ${{ parameters.clusterType }} continueOnError: ${{ contains(parameters.clusterType, 'dualstack') }} From 5fa58d0da02ec7caf7da2b3f3bb44df1a4a97bb4 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Mon, 1 Jul 2024 04:40:43 -0700 Subject: [PATCH 34/54] Fix spacing --- hack/aks/Makefile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 73a07c1184..8592682233 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -87,14 +87,6 @@ overlay-net-up: ## Create vnet, nodenet subnets $(AZCLI) network vnet create -g $(GROUP) -l $(REGION) --name $(VNET) --address-prefixes 10.0.0.0/8 -o none $(AZCLI) network vnet subnet create -g $(GROUP) --vnet-name $(VNET) --name nodenet --address-prefix 10.10.0.0/16 -o none - -managed-identity-up: - $(AZCLI) identity create --name "managedidentity" --resource-group $(GROUP) --location $(REGION) - USER_ASSIGNED_CLIENT_ID= $(AZCLI) identity show --resource-group $(GROUP) --name "managedidentity" --query id -o tsv - $(AZCLI) role assignment create \ - --assignee $(USER_ASSIGNED_CLIENT_ID) \ - --role "Network Contributor" \ - --scope "/subscriptions/$(SUB)/resourceGroups/$(GROUP)" ##@ AKS Clusters byocni-up: swift-byocni-up ## Alias to swift-byocni-up From 748eb2020373605547c27e0cbcaa6602802dac0b Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 11 Jul 2024 06:27:27 -0700 Subject: [PATCH 35/54] Add LB to win cni v1 cluster --- hack/aks/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index b088ee5aa3..00d16054cc 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -430,12 +430,22 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT @$(MAKE) set-kubeconf windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster + $(AZCLI) network public-ip create --name "wincniv1-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + $(AZCLI) network public-ip show --resource-group $(GROUP) --name "wincniv1-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/wincniv1-public-ip \ --network-plugin azure \ --windows-admin-password $(WINDOWS_PASSWORD) \ --windows-admin-username $(WINDOWS_USERNAME) \ From bac845d0f1509ea09715618869eb869749ef5268 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 11 Jul 2024 06:55:54 -0700 Subject: [PATCH 36/54] Add LB to win cni v1 cluster --- hack/aks/Makefile | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 00d16054cc..29d36d32ce 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -456,11 +456,20 @@ windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster @$(MAKE) set-kubeconf linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster + $(AZCLI) network public-ip create --name "linux-cniv1-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/linux-cniv1-public-ip \ --max-pods 250 \ --network-plugin azure \ --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ @@ -470,12 +479,21 @@ linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster @$(MAKE) set-kubeconf dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay cluster with Linux node only + $(AZCLI) network public-ip create --name "dualstack-lin-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/dualstack-lin-public-ip \ --network-plugin azure \ --network-plugin-mode overlay \ --subscription $(SUB) \ @@ -486,12 +504,21 @@ dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay clu @$(MAKE) set-kubeconf dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Overlay BYO CNI cluster + $(AZCLI) network public-ip create --name "dualstack-cni-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/dualstack-cni-public-ip \ --network-plugin none \ --network-plugin-mode overlay \ --subscription $(SUB) \ @@ -502,12 +529,21 @@ dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Over @$(MAKE) set-kubeconf cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overlay cluster with Linux node only + $(AZCLI) network public-ip create --name "dualstack-nokcni-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/dualstack-nokcni-public-ip \ --network-plugin azure \ --network-plugin-mode overlay \ --network-dataplane cilium \ @@ -519,12 +555,21 @@ cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overla @$(MAKE) set-kubeconf dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack overlay BYOCNI cluster with Linux node only and no kube-proxy + $(AZCLI) network public-ip create --name "dualstack-nokbyocni-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/dualstack-nokbyocni-public-ip \ --network-plugin none \ --network-plugin-mode overlay \ --subscription $(SUB) \ From 2dc3613a9aa33f82b1b16884f759b52fd141cc50 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 11 Jul 2024 07:49:04 -0700 Subject: [PATCH 37/54] Add ip-tag variable to makefile --- hack/aks/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 29d36d32ce..82835f8ca2 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -19,6 +19,7 @@ OS_SKU_WIN ?= Windows2022 REGION ?= westus2 VM_SIZE ?= Standard_B2s VM_SIZE_WIN ?= Standard_B2s +IP-TAG ?= FirstPartyUsage=/TestTagging-O365 # overrideable variables SUB ?= $(AZURE_SUBSCRIPTION) @@ -357,7 +358,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up $(AZCLI) network public-ip create --name "vnetscale-nok-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP-TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ From 5c9924f34fd0e851402b3e269c3bbb35c83322a8 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 11 Jul 2024 08:28:48 -0700 Subject: [PATCH 38/54] Add ip-tag variable to makefile --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 82835f8ca2..a1981c2473 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -232,7 +232,7 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus $(AZCLI) network public-ip create --name "swift-byo-nok-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP-TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ From 6a285ddde557d019ff01f1daa7c95a28afdc4b77 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 11 Jul 2024 08:30:25 -0700 Subject: [PATCH 39/54] Add ip-tag variable to makefile --- hack/aks/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index a1981c2473..1f85a12076 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -232,7 +232,7 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus $(AZCLI) network public-ip create --name "swift-byo-nok-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags $(IP-TAG) \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -358,7 +358,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up $(AZCLI) network public-ip create --name "vnetscale-nok-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags $(IP-TAG) \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ From e1e15cb478fcd4e59b03b107d3910a18c1038ea6 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 11 Jul 2024 09:14:44 -0700 Subject: [PATCH 40/54] Add ip-tag variable to makefile --- hack/aks/Makefile | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 1f85a12076..8cb1812963 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -19,7 +19,7 @@ OS_SKU_WIN ?= Windows2022 REGION ?= westus2 VM_SIZE ?= Standard_B2s VM_SIZE_WIN ?= Standard_B2s -IP-TAG ?= FirstPartyUsage=/TestTagging-O365 +IP_TAG ?= FirstPartyUsage=/TestTagging-O365 # overrideable variables SUB ?= $(AZURE_SUBSCRIPTION) @@ -103,7 +103,6 @@ overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster --sku Standard \ --tier Regional \ --version IPv4 - $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-cni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -132,7 +131,6 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO --sku Standard \ --tier Regional \ --version IPv4 - $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-cni-no-kube-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -158,7 +156,6 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster --sku Standard \ --tier Regional \ --version IPv4 - $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-cillium-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -184,7 +181,6 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster --sku Standard \ --tier Regional \ --version IPv4 - $(AZCLI) network public-ip show --resource-group $(GROUP) --name "overlay-azcni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -209,7 +205,6 @@ swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster --sku Standard \ --tier Regional \ --version IPv4 - $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-byo-cni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -237,7 +232,6 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus --sku Standard \ --tier Regional \ --version IPv4 - $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-byo-nok-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -263,7 +257,6 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster --sku Standard \ --tier Regional \ --version IPv4 - $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-cilium-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -289,7 +282,6 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster --sku Standard \ --tier Regional \ --version IPv4 - $(AZCLI) network public-ip show --resource-group $(GROUP) --name "swift-azcni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -305,6 +297,14 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster @$(MAKE) set-kubeconf swiftv2-multitenancy-cluster-up: rg-up + $(AZCLI) network public-ip create --name "swift-mult-public-ip" \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --network-plugin azure \ --network-plugin-mode overlay \ @@ -312,6 +312,7 @@ swiftv2-multitenancy-cluster-up: rg-up --nodepool-name "mtapool" \ --node-vm-size $(VM_SIZE) \ --node-count 2 \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/swift-mult-public-ip \ --nodepool-tags fastpathenabled=true \ --no-ssh-key \ --yes @@ -338,7 +339,6 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale --sku Standard \ --tier Regional \ --version IPv4 - $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -363,7 +363,6 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up --sku Standard \ --tier Regional \ --version IPv4 - $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-nok-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -389,7 +388,6 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale --sku Standard \ --tier Regional \ --version IPv4 - $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-cilium-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -415,7 +413,6 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT --sku Standard \ --tier Regional \ --version IPv4 - $(AZCLI) network public-ip show --resource-group $(GROUP) --name "vnetscale-azcni-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -439,7 +436,6 @@ windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster --sku Standard \ --tier Regional \ --version IPv4 - $(AZCLI) network public-ip show --resource-group $(GROUP) --name "wincniv1-public-ip" --query "ipAddress" -o tsv $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ From 57854f8a5b58954416f6ffe2250843ff14d3ce93 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 11 Jul 2024 10:00:40 -0700 Subject: [PATCH 41/54] Add ip-tag variable to makefile --- hack/aks/Makefile | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 8cb1812963..b55419b1d8 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -98,7 +98,7 @@ overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster $(AZCLI) network public-ip create --name "overlay-cni-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -126,7 +126,7 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO $(AZCLI) network public-ip create --name "overlay-cni-no-kube-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -151,7 +151,7 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster $(AZCLI) network public-ip create --name "overlay-cillium-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -176,7 +176,7 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster $(AZCLI) network public-ip create --name "overlay-azcni-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -200,7 +200,7 @@ swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster $(AZCLI) network public-ip create --name "swift-byo-cni-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -252,7 +252,7 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster $(AZCLI) network public-ip create --name "swift-cilium-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -277,7 +277,7 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster $(AZCLI) network public-ip create --name "swift-azcni-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -300,7 +300,7 @@ swiftv2-multitenancy-cluster-up: rg-up $(AZCLI) network public-ip create --name "swift-mult-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -334,7 +334,7 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale $(AZCLI) network public-ip create --name "vnetscale-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -383,7 +383,7 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale $(AZCLI) network public-ip create --name "vnetscale-cilium-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -408,7 +408,7 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT $(AZCLI) network public-ip create --name "vnetscale-azcni-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -431,7 +431,7 @@ windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster $(AZCLI) network public-ip create --name "wincniv1-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -456,7 +456,7 @@ linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster $(AZCLI) network public-ip create --name "linux-cniv1-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -479,7 +479,7 @@ dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay clu $(AZCLI) network public-ip create --name "dualstack-lin-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -504,7 +504,7 @@ dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Over $(AZCLI) network public-ip create --name "dualstack-cni-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -529,7 +529,7 @@ cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overla $(AZCLI) network public-ip create --name "dualstack-nokcni-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ @@ -555,7 +555,7 @@ dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack o $(AZCLI) network public-ip create --name "dualstack-nokbyocni-public-ip" \ --resource-group $(GROUP) \ --allocation-method Static \ - --ip-tags "FirstPartyUsage=/TestTagging-O365" \ + --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ From d110100b8b2d1d85572a2a7d4263e4d9ec0c7967 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 11 Jul 2024 10:10:12 -0700 Subject: [PATCH 42/54] Add ip-tag variable to makefile --- hack/aks/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index b55419b1d8..4f8a0e4a9d 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -20,6 +20,7 @@ REGION ?= westus2 VM_SIZE ?= Standard_B2s VM_SIZE_WIN ?= Standard_B2s IP_TAG ?= FirstPartyUsage=/TestTagging-O365 +IP_PREFIX ?= serviceTaggedIp # overrideable variables SUB ?= $(AZURE_SUBSCRIPTION) @@ -224,7 +225,7 @@ endif @$(MAKE) set-kubeconf swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip - $(AZCLI) network public-ip create --name "swift-byo-nok-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -238,7 +239,7 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/swift-byo-nok-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin none \ --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 \ From f10249e2c624b735a2b74d19e4c2321f8af5f94e Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 11 Jul 2024 10:39:00 -0700 Subject: [PATCH 43/54] Add ip-tag variable to makefile --- hack/aks/Makefile | 72 +++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 4f8a0e4a9d..62209b594e 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -96,7 +96,7 @@ cilium-up: swift-cilium-up ## Alias to swift-cilium-up up: swift-up ## Alias to swift-up overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster - $(AZCLI) network public-ip create --name "overlay-cni-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -110,7 +110,7 @@ overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/overlay-cni-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin none \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -124,7 +124,7 @@ endif @$(MAKE) set-kubeconf overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy - $(AZCLI) network public-ip create --name "overlay-cni-no-kube-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -138,7 +138,7 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/overlay-cni-no-kube-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin none \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -149,7 +149,7 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO @$(MAKE) set-kubeconf overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster - $(AZCLI) network public-ip create --name "overlay-cillium-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -163,7 +163,7 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/overlay-cillium-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin azure \ --network-dataplane cilium \ --network-plugin-mode overlay \ @@ -174,7 +174,7 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster @$(MAKE) set-kubeconf overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster - $(AZCLI) network public-ip create --name "overlay-azcni-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -188,7 +188,7 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/overlay-azcni-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin azure \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -198,7 +198,7 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster @$(MAKE) set-kubeconf swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster - $(AZCLI) network public-ip create --name "swift-byo-cni-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -212,7 +212,7 @@ swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/swift-byo-cni-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin none \ --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 \ @@ -250,7 +250,7 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus @$(MAKE) set-kubeconf swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster - $(AZCLI) network public-ip create --name "swift-cilium-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -264,7 +264,7 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/swift-cilium-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin azure \ --network-dataplane cilium \ --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \ @@ -275,7 +275,7 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster @$(MAKE) set-kubeconf swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster - $(AZCLI) network public-ip create --name "swift-azcni-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -289,7 +289,7 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/swift-azcni-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin azure \ --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 \ @@ -298,7 +298,7 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster @$(MAKE) set-kubeconf swiftv2-multitenancy-cluster-up: rg-up - $(AZCLI) network public-ip create --name "swift-mult-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -313,7 +313,7 @@ swiftv2-multitenancy-cluster-up: rg-up --nodepool-name "mtapool" \ --node-vm-size $(VM_SIZE) \ --node-count 2 \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/swift-mult-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --nodepool-tags fastpathenabled=true \ --no-ssh-key \ --yes @@ -332,7 +332,7 @@ swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster # These AKS clusters can only be created in a limited subscription listed here: # https://dev.azure.com/msazure/CloudNativeCompute/_git/aks-rp?path=/resourceprovider/server/microsoft.com/containerservice/flags/network_flags.go&version=GBmaster&line=134&lineEnd=135&lineStartColumn=1&lineEndColumn=1&lineStyle=plain&_a=contents vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster - $(AZCLI) network public-ip create --name "vnetscale-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -346,7 +346,7 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/vnetscale-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin none \ --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 \ @@ -356,7 +356,7 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale @$(MAKE) set-kubeconf vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster without kube-proxy - $(AZCLI) network public-ip create --name "vnetscale-nok-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -370,7 +370,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/vnetscale-nok-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin none \ --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 \ @@ -381,7 +381,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up @$(MAKE) set-kubeconf vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT Cilium cluster - $(AZCLI) network public-ip create --name "vnetscale-cilium-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -395,7 +395,7 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/vnetscale-cilium-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin azure \ --network-dataplane cilium \ --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \ @@ -406,7 +406,7 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale @$(MAKE) set-kubeconf vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT AzCNI cluster - $(AZCLI) network public-ip create --name "vnetscale-azcni-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -420,7 +420,7 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/vnetscale-azcni-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin azure \ --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 \ @@ -429,7 +429,7 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT @$(MAKE) set-kubeconf windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster - $(AZCLI) network public-ip create --name "wincniv1-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -443,7 +443,7 @@ windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/wincniv1-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin azure \ --windows-admin-password $(WINDOWS_PASSWORD) \ --windows-admin-username $(WINDOWS_USERNAME) \ @@ -454,7 +454,7 @@ windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster @$(MAKE) set-kubeconf linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster - $(AZCLI) network public-ip create --name "linux-cniv1-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -467,7 +467,7 @@ linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster --node-os-upgrade-channel $(NODEUPGRADE) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/linux-cniv1-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --max-pods 250 \ --network-plugin azure \ --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ @@ -477,7 +477,7 @@ linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster @$(MAKE) set-kubeconf dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay cluster with Linux node only - $(AZCLI) network public-ip create --name "dualstack-lin-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -491,7 +491,7 @@ dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay clu --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/dualstack-lin-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin azure \ --network-plugin-mode overlay \ --subscription $(SUB) \ @@ -502,7 +502,7 @@ dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay clu @$(MAKE) set-kubeconf dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Overlay BYO CNI cluster - $(AZCLI) network public-ip create --name "dualstack-cni-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -516,7 +516,7 @@ dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Over --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/dualstack-cni-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin none \ --network-plugin-mode overlay \ --subscription $(SUB) \ @@ -527,7 +527,7 @@ dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Over @$(MAKE) set-kubeconf cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overlay cluster with Linux node only - $(AZCLI) network public-ip create --name "dualstack-nokcni-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -541,7 +541,7 @@ cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overla --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/dualstack-nokcni-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin azure \ --network-plugin-mode overlay \ --network-dataplane cilium \ @@ -553,7 +553,7 @@ cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overla @$(MAKE) set-kubeconf dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack overlay BYOCNI cluster with Linux node only and no kube-proxy - $(AZCLI) network public-ip create --name "dualstack-nokbyocni-public-ip" \ + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -567,7 +567,7 @@ dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack o --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/dualstack-nokbyocni-public-ip \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --network-plugin none \ --network-plugin-mode overlay \ --subscription $(SUB) \ From 1d1d78a31dc69003ff49c37163949e37db3f5146 Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Thu, 11 Jul 2024 10:42:48 -0700 Subject: [PATCH 44/54] Add ip-tag variable to makefile --- hack/aks/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 62209b594e..3b5a9f1597 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -320,10 +320,19 @@ swiftv2-multitenancy-cluster-up: rg-up @$(MAKE) set-kubeconf swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags $(IP_TAG) \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --network-plugin azure \ --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 \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ --no-ssh-key \ --yes @$(MAKE) set-kubeconf From 88a8a92027a2d2fc00bdd8005226923218630a1f Mon Sep 17 00:00:00 2001 From: shubham-pathak-03 <87148966+shubham-pathak-03@users.noreply.github.com> Date: Fri, 12 Jul 2024 10:44:40 -0700 Subject: [PATCH 45/54] Add ip-tag variable to makefile --- hack/aks/Makefile | 79 ++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 3b5a9f1597..cd1d5af738 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -21,6 +21,7 @@ VM_SIZE ?= Standard_B2s VM_SIZE_WIN ?= Standard_B2s IP_TAG ?= FirstPartyUsage=/TestTagging-O365 IP_PREFIX ?= serviceTaggedIp +PUBLIC_IP ?= $(IP_PREFIX)-$(CLUSTER) # overrideable variables SUB ?= $(AZURE_SUBSCRIPTION) @@ -96,7 +97,7 @@ cilium-up: swift-cilium-up ## Alias to swift-cilium-up up: swift-up ## Alias to swift-up overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -110,7 +111,7 @@ overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin none \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -124,7 +125,7 @@ endif @$(MAKE) set-kubeconf overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -149,7 +150,7 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO @$(MAKE) set-kubeconf overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -163,7 +164,7 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin azure \ --network-dataplane cilium \ --network-plugin-mode overlay \ @@ -174,7 +175,7 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster @$(MAKE) set-kubeconf overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -188,7 +189,7 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin azure \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -198,7 +199,7 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster @$(MAKE) set-kubeconf swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -212,7 +213,7 @@ swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin none \ --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 \ @@ -225,7 +226,7 @@ endif @$(MAKE) set-kubeconf swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -239,7 +240,7 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin none \ --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 \ @@ -250,7 +251,7 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus @$(MAKE) set-kubeconf swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -264,7 +265,7 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin azure \ --network-dataplane cilium \ --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \ @@ -275,7 +276,7 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster @$(MAKE) set-kubeconf swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -289,7 +290,7 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin azure \ --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 \ @@ -298,7 +299,7 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster @$(MAKE) set-kubeconf swiftv2-multitenancy-cluster-up: rg-up - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -313,14 +314,14 @@ swiftv2-multitenancy-cluster-up: rg-up --nodepool-name "mtapool" \ --node-vm-size $(VM_SIZE) \ --node-count 2 \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --nodepool-tags fastpathenabled=true \ --no-ssh-key \ --yes @$(MAKE) set-kubeconf swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -332,7 +333,7 @@ swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster --network-plugin azure \ --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 \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --no-ssh-key \ --yes @$(MAKE) set-kubeconf @@ -341,7 +342,7 @@ swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster # These AKS clusters can only be created in a limited subscription listed here: # https://dev.azure.com/msazure/CloudNativeCompute/_git/aks-rp?path=/resourceprovider/server/microsoft.com/containerservice/flags/network_flags.go&version=GBmaster&line=134&lineEnd=135&lineStartColumn=1&lineEndColumn=1&lineStyle=plain&_a=contents vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -355,7 +356,7 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin none \ --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 \ @@ -365,7 +366,7 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale @$(MAKE) set-kubeconf vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster without kube-proxy - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -379,7 +380,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin none \ --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 \ @@ -390,7 +391,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up @$(MAKE) set-kubeconf vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT Cilium cluster - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -404,7 +405,7 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin azure \ --network-dataplane cilium \ --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \ @@ -415,7 +416,7 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale @$(MAKE) set-kubeconf vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT AzCNI cluster - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -429,7 +430,7 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP)\ --network-plugin azure \ --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 \ @@ -438,7 +439,7 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT @$(MAKE) set-kubeconf windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -452,7 +453,7 @@ windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin azure \ --windows-admin-password $(WINDOWS_PASSWORD) \ --windows-admin-username $(WINDOWS_USERNAME) \ @@ -463,7 +464,7 @@ windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster @$(MAKE) set-kubeconf linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -476,7 +477,7 @@ linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster --node-os-upgrade-channel $(NODEUPGRADE) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --max-pods 250 \ --network-plugin azure \ --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ @@ -486,7 +487,7 @@ linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster @$(MAKE) set-kubeconf dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay cluster with Linux node only - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -500,7 +501,7 @@ dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay clu --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin azure \ --network-plugin-mode overlay \ --subscription $(SUB) \ @@ -511,7 +512,7 @@ dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay clu @$(MAKE) set-kubeconf dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Overlay BYO CNI cluster - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -525,7 +526,7 @@ dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Over --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin none \ --network-plugin-mode overlay \ --subscription $(SUB) \ @@ -536,7 +537,7 @@ dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Over @$(MAKE) set-kubeconf cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overlay cluster with Linux node only - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -550,7 +551,7 @@ cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overla --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin azure \ --network-plugin-mode overlay \ --network-dataplane cilium \ @@ -562,7 +563,7 @@ cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overla @$(MAKE) set-kubeconf dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack overlay BYOCNI cluster with Linux node only and no kube-proxy - $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER) \ + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -576,7 +577,7 @@ dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack o --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ --network-plugin none \ --network-plugin-mode overlay \ --subscription $(SUB) \ From 64300df763e4d04ab7a519950aeca23c48184cd4 Mon Sep 17 00:00:00 2001 From: Keerthana Routhu Date: Fri, 1 Nov 2024 16:50:33 -0700 Subject: [PATCH 46/54] updated service tag to 'DelegatedNetworkControllerTest' --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index cd1d5af738..df2b2c5ac5 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -19,7 +19,7 @@ OS_SKU_WIN ?= Windows2022 REGION ?= westus2 VM_SIZE ?= Standard_B2s VM_SIZE_WIN ?= Standard_B2s -IP_TAG ?= FirstPartyUsage=/TestTagging-O365 +IP_TAG ?= FirstPartyUsage=/DelegatedNetworkControllerTest IP_PREFIX ?= serviceTaggedIp PUBLIC_IP ?= $(IP_PREFIX)-$(CLUSTER) From 9189f09a00953f1df646e794a4a93ea1b692e139 Mon Sep 17 00:00:00 2001 From: Keerthana Routhu Date: Fri, 13 Dec 2024 01:29:13 -0800 Subject: [PATCH 47/54] create public IP as target --- hack/aks/Makefile | 190 ++++++++-------------------------------------- 1 file changed, 30 insertions(+), 160 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 7e40edb73a..818df38eff 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -45,6 +45,16 @@ azcfg: ## Set the $AZCLI to use aks-preview @$(AZCLI) extension add --name aks-preview --yes @$(AZCLI) extension update --name aks-preview +public-ip: rg-up + $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags $(IP_TAG) \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + set-kubeconf: ## Adds the kubeconf for $CLUSTER $(AZCLI) aks get-credentials -n $(CLUSTER) -g $(GROUP) @@ -116,14 +126,7 @@ nodesubnet-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an NodeSubne @$(MAKE) set-kubeconf overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -144,14 +147,7 @@ endif @$(MAKE) set-kubeconf overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -169,14 +165,7 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO @$(MAKE) set-kubeconf overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -194,14 +183,7 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster @$(MAKE) set-kubeconf overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -218,14 +200,7 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster @$(MAKE) set-kubeconf swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -245,14 +220,7 @@ endif @$(MAKE) set-kubeconf swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -270,14 +238,7 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus @$(MAKE) set-kubeconf swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -295,14 +256,7 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster @$(MAKE) set-kubeconf swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -318,14 +272,7 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster @$(MAKE) set-kubeconf swiftv2-multitenancy-cluster-up: rg-up - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --network-plugin azure \ --network-plugin-mode overlay \ @@ -340,14 +287,7 @@ swiftv2-multitenancy-cluster-up: rg-up @$(MAKE) set-kubeconf swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --network-plugin azure \ --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ @@ -361,14 +301,7 @@ swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster # These AKS clusters can only be created in a limited subscription listed here: # https://dev.azure.com/msazure/CloudNativeCompute/_git/aks-rp?path=/resourceprovider/server/microsoft.com/containerservice/flags/network_flags.go&version=GBmaster&line=134&lineEnd=135&lineStartColumn=1&lineEndColumn=1&lineStyle=plain&_a=contents vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -385,14 +318,7 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale @$(MAKE) set-kubeconf vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster without kube-proxy - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -410,14 +336,7 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up @$(MAKE) set-kubeconf vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT Cilium cluster - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -435,14 +354,7 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale @$(MAKE) set-kubeconf vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT AzCNI cluster - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -458,14 +370,7 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT @$(MAKE) set-kubeconf windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -483,14 +388,7 @@ windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster @$(MAKE) set-kubeconf linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -507,14 +405,7 @@ linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster @$(MAKE) set-kubeconf dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay cluster with Linux node only - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -532,14 +423,7 @@ dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay clu @$(MAKE) set-kubeconf dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Overlay BYO CNI cluster - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -557,14 +441,7 @@ dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Over @$(MAKE) set-kubeconf cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overlay cluster with Linux node only - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -583,14 +460,7 @@ cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overla @$(MAKE) set-kubeconf dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack overlay BYOCNI cluster with Linux node only and no kube-proxy - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 + @$(MAKE) public-ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ From ad1101fb30711f0de2a2ad2ee8faf6f866383433 Mon Sep 17 00:00:00 2001 From: Keerthana Routhu Date: Fri, 13 Dec 2024 10:50:01 -0800 Subject: [PATCH 48/54] add ipv6 public ips to dualstack --- hack/aks/Makefile | 101 ++++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 43 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 818df38eff..1ef9b55f29 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -21,7 +21,8 @@ VM_SIZE ?= Standard_B2s VM_SIZE_WIN ?= Standard_B2s IP_TAG ?= FirstPartyUsage=/DelegatedNetworkControllerTest IP_PREFIX ?= serviceTaggedIp -PUBLIC_IP ?= $(IP_PREFIX)-$(CLUSTER) +PUBLIC_IPv4 ?= $(IP_PREFIX)-$(CLUSTER)-v4 +PUBLIC_IPv6 ?= $(IP_PREFIX)-$(CLUSTER)-v6 KUBE_PROXY_JSON_PATH ?= ./kube-proxy.json # overrideable variables @@ -45,8 +46,18 @@ azcfg: ## Set the $AZCLI to use aks-preview @$(AZCLI) extension add --name aks-preview --yes @$(AZCLI) extension update --name aks-preview -public-ip: rg-up - $(AZCLI) network public-ip create --name $(PUBLIC_IP) \ +public-ipv4: rg-up + $(AZCLI) network public-ip create --name $(PUBLIC_IPv4) \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags $(IP_TAG) \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IPv4 + +public-ipv6: rg-up + $(AZCLI) network public-ip create --name $(PUBLIC_IPv6) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ @@ -126,14 +137,14 @@ nodesubnet-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an NodeSubne @$(MAKE) set-kubeconf overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin none \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -147,14 +158,14 @@ endif @$(MAKE) set-kubeconf overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(IP_PREFIX)-$(CLUSTER) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin none \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -165,14 +176,14 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO @$(MAKE) set-kubeconf overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin azure \ --network-dataplane cilium \ --network-plugin-mode overlay \ @@ -183,14 +194,14 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster @$(MAKE) set-kubeconf overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin azure \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -200,14 +211,14 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster @$(MAKE) set-kubeconf swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin none \ --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 \ @@ -220,14 +231,14 @@ endif @$(MAKE) set-kubeconf swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin none \ --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 \ @@ -238,14 +249,14 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus @$(MAKE) set-kubeconf swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin azure \ --network-dataplane cilium \ --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \ @@ -256,14 +267,14 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster @$(MAKE) set-kubeconf swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin azure \ --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 \ @@ -272,7 +283,7 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster @$(MAKE) set-kubeconf swiftv2-multitenancy-cluster-up: rg-up - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --network-plugin azure \ --network-plugin-mode overlay \ @@ -280,19 +291,19 @@ swiftv2-multitenancy-cluster-up: rg-up --nodepool-name "mtapool" \ --node-vm-size $(VM_SIZE) \ --node-count 2 \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --nodepool-tags fastpathenabled=true \ --no-ssh-key \ --yes @$(MAKE) set-kubeconf swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --network-plugin azure \ --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 \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --no-ssh-key \ --yes @$(MAKE) set-kubeconf @@ -301,14 +312,14 @@ swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster # These AKS clusters can only be created in a limited subscription listed here: # https://dev.azure.com/msazure/CloudNativeCompute/_git/aks-rp?path=/resourceprovider/server/microsoft.com/containerservice/flags/network_flags.go&version=GBmaster&line=134&lineEnd=135&lineStartColumn=1&lineEndColumn=1&lineStyle=plain&_a=contents vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin none \ --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 \ @@ -318,14 +329,14 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale @$(MAKE) set-kubeconf vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster without kube-proxy - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin none \ --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 \ @@ -336,14 +347,14 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up @$(MAKE) set-kubeconf vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT Cilium cluster - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin azure \ --network-dataplane cilium \ --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \ @@ -354,14 +365,14 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale @$(MAKE) set-kubeconf vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT AzCNI cluster - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP)\ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4)\ --network-plugin azure \ --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 \ @@ -370,14 +381,14 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT @$(MAKE) set-kubeconf windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin azure \ --windows-admin-password $(WINDOWS_PASSWORD) \ --windows-admin-username $(WINDOWS_USERNAME) \ @@ -388,14 +399,14 @@ windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster @$(MAKE) set-kubeconf linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster - @$(MAKE) public-ip + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --max-pods 250 \ --network-plugin azure \ --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ @@ -405,14 +416,15 @@ linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster @$(MAKE) set-kubeconf dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay cluster with Linux node only - @$(MAKE) public-ip + @$(MAKE) public-ipv4 + @$(MAKE) public-ipv6 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4), /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ --network-plugin azure \ --network-plugin-mode overlay \ --subscription $(SUB) \ @@ -423,14 +435,15 @@ dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay clu @$(MAKE) set-kubeconf dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Overlay BYO CNI cluster - @$(MAKE) public-ip + @$(MAKE) public-ipv4 + @$(MAKE) public-ipv6 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4), /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ --network-plugin none \ --network-plugin-mode overlay \ --subscription $(SUB) \ @@ -441,14 +454,15 @@ dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Over @$(MAKE) set-kubeconf cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overlay cluster with Linux node only - @$(MAKE) public-ip + @$(MAKE) public-ipv4 + @$(MAKE) public-ipv6 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4), /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ --network-plugin azure \ --network-plugin-mode overlay \ --network-dataplane cilium \ @@ -460,14 +474,15 @@ cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overla @$(MAKE) set-kubeconf dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack overlay BYOCNI cluster with Linux node only and no kube-proxy - @$(MAKE) public-ip + @$(MAKE) public-ipv4 + @$(MAKE) public-ipv6 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IP) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4), /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ --network-plugin none \ --network-plugin-mode overlay \ --subscription $(SUB) \ From ca8cc6ec8650824ff5f8cfefe5b4f113a630eca1 Mon Sep 17 00:00:00 2001 From: Keerthana Routhu Date: Fri, 13 Dec 2024 11:28:08 -0800 Subject: [PATCH 49/54] updated v6 ip --- hack/aks/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 1ef9b55f29..6a9b2632a7 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -64,7 +64,7 @@ public-ipv6: rg-up --location $(REGION) \ --sku Standard \ --tier Regional \ - --version IPv4 + --version IPv6 set-kubeconf: ## Adds the kubeconf for $CLUSTER $(AZCLI) aks get-credentials -n $(CLUSTER) -g $(GROUP) From b43dc4457063b1582ab096ee7030449cd523c58a Mon Sep 17 00:00:00 2001 From: Keerthana Routhu Date: Fri, 13 Dec 2024 11:49:42 -0800 Subject: [PATCH 50/54] remove space --- hack/aks/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 6a9b2632a7..866734299f 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -424,7 +424,7 @@ dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay clu --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4), /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4),/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ --network-plugin azure \ --network-plugin-mode overlay \ --subscription $(SUB) \ @@ -443,7 +443,7 @@ dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Over --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4), /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4),/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ --network-plugin none \ --network-plugin-mode overlay \ --subscription $(SUB) \ @@ -462,7 +462,7 @@ cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overla --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4), /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4),/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ --network-plugin azure \ --network-plugin-mode overlay \ --network-dataplane cilium \ @@ -482,7 +482,7 @@ dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack o --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4), /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4),/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ --network-plugin none \ --network-plugin-mode overlay \ --subscription $(SUB) \ From cae983be7a00547413b67521c32dd0831b3c3024 Mon Sep 17 00:00:00 2001 From: Keerthana Routhu Date: Mon, 16 Dec 2024 13:01:46 -0800 Subject: [PATCH 51/54] added public ip for nodesubnet-byocni-nokubeproxy-up resource --- hack/aks/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index 866734299f..b4384ce107 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -120,6 +120,7 @@ up: swift-up ## Alias to swift-up nodesubnet-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an NodeSubnet BYO CNI cluster without kube-proxy + @$(MAKE) public-ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -128,6 +129,7 @@ nodesubnet-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an NodeSubne --node-vm-size $(VM_SIZE) \ --load-balancer-sku standard \ --max-pods 250 \ + --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin none \ --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ --os-sku $(OS_SKU) \ From 413f2530e3df2c7afad9b5fd0e711363429d615b Mon Sep 17 00:00:00 2001 From: Keerthana Routhu Date: Wed, 18 Dec 2024 14:54:38 -0800 Subject: [PATCH 52/54] addressed comments on PR --- hack/aks/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index b4384ce107..e003b52042 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -21,8 +21,8 @@ VM_SIZE ?= Standard_B2s VM_SIZE_WIN ?= Standard_B2s IP_TAG ?= FirstPartyUsage=/DelegatedNetworkControllerTest IP_PREFIX ?= serviceTaggedIp -PUBLIC_IPv4 ?= $(IP_PREFIX)-$(CLUSTER)-v4 -PUBLIC_IPv6 ?= $(IP_PREFIX)-$(CLUSTER)-v6 +PUBLIC_IPv4 ?= $(IP_PREFIX)-$(CLUSTER)-v4 +PUBLIC_IPv6 ?= $(IP_PREFIX)-$(CLUSTER)-v6 KUBE_PROXY_JSON_PATH ?= ./kube-proxy.json # overrideable variables @@ -46,7 +46,7 @@ azcfg: ## Set the $AZCLI to use aks-preview @$(AZCLI) extension add --name aks-preview --yes @$(AZCLI) extension update --name aks-preview -public-ipv4: rg-up +public-ipv4: $(AZCLI) network public-ip create --name $(PUBLIC_IPv4) \ --resource-group $(GROUP) \ --allocation-method Static \ @@ -56,7 +56,7 @@ public-ipv4: rg-up --tier Regional \ --version IPv4 -public-ipv6: rg-up +public-ipv6: $(AZCLI) network public-ip create --name $(PUBLIC_IPv6) \ --resource-group $(GROUP) \ --allocation-method Static \ @@ -127,7 +127,6 @@ nodesubnet-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an NodeSubne --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-sku standard \ --max-pods 250 \ --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ --network-plugin none \ From cdf97b3ade50e224bfedaa79c46dcf4071d94580 Mon Sep 17 00:00:00 2001 From: Keerthana Routhu <111544828+k-routhu@users.noreply.github.com> Date: Wed, 15 Jan 2025 15:37:59 -0800 Subject: [PATCH 53/54] parameterize ip v4 & v6 Co-authored-by: Evan Baker Signed-off-by: Keerthana Routhu <111544828+k-routhu@users.noreply.github.com> --- hack/aks/Makefile | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index e003b52042..81a8aff161 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -46,25 +46,22 @@ azcfg: ## Set the $AZCLI to use aks-preview @$(AZCLI) extension add --name aks-preview --yes @$(AZCLI) extension update --name aks-preview -public-ipv4: - $(AZCLI) network public-ip create --name $(PUBLIC_IPv4) \ +ip: + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER)-$(IPVERSION) \ --resource-group $(GROUP) \ --allocation-method Static \ --ip-tags $(IP_TAG) \ --location $(REGION) \ --sku Standard \ --tier Regional \ - --version IPv4 + --version IP$(IPVERSION) + +ipv4: + @$(MAKE) ip IPVERSION=v4 + +ipv6: + @$(MAKE) ip IPVERSION=v6 -public-ipv6: - $(AZCLI) network public-ip create --name $(PUBLIC_IPv6) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv6 set-kubeconf: ## Adds the kubeconf for $CLUSTER $(AZCLI) aks get-credentials -n $(CLUSTER) -g $(GROUP) From 8a677171f9b52e5b5439a3be5986217ea16ee425 Mon Sep 17 00:00:00 2001 From: Keerthana Routhu Date: Tue, 21 Jan 2025 14:40:41 -0800 Subject: [PATCH 54/54] address comments --- hack/aks/Makefile | 151 +++++++++++++++++++--------------------------- 1 file changed, 62 insertions(+), 89 deletions(-) diff --git a/hack/aks/Makefile b/hack/aks/Makefile index e003b52042..eeb8766a84 100644 --- a/hack/aks/Makefile +++ b/hack/aks/Makefile @@ -21,8 +21,9 @@ VM_SIZE ?= Standard_B2s VM_SIZE_WIN ?= Standard_B2s IP_TAG ?= FirstPartyUsage=/DelegatedNetworkControllerTest IP_PREFIX ?= serviceTaggedIp -PUBLIC_IPv4 ?= $(IP_PREFIX)-$(CLUSTER)-v4 -PUBLIC_IPv6 ?= $(IP_PREFIX)-$(CLUSTER)-v6 +PUBLIC_IP_ID ?= /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses +PUBLIC_IPv4 ?= $(PUBLIC_IP_ID)/$(IP_PREFIX)-$(CLUSTER)-v4 +PUBLIC_IPv6 ?= $(PUBLIC_IP_ID)/$(IP_PREFIX)-$(CLUSTER)-v6 KUBE_PROXY_JSON_PATH ?= ./kube-proxy.json # overrideable variables @@ -30,6 +31,7 @@ SUB ?= $(AZURE_SUBSCRIPTION) CLUSTER ?= $(USER)-$(REGION) GROUP ?= $(CLUSTER) VNET ?= $(CLUSTER) + ##@ Help help: ## Display this help @@ -46,26 +48,6 @@ azcfg: ## Set the $AZCLI to use aks-preview @$(AZCLI) extension add --name aks-preview --yes @$(AZCLI) extension update --name aks-preview -public-ipv4: - $(AZCLI) network public-ip create --name $(PUBLIC_IPv4) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv4 - -public-ipv6: - $(AZCLI) network public-ip create --name $(PUBLIC_IPv6) \ - --resource-group $(GROUP) \ - --allocation-method Static \ - --ip-tags $(IP_TAG) \ - --location $(REGION) \ - --sku Standard \ - --tier Regional \ - --version IPv6 - set-kubeconf: ## Adds the kubeconf for $CLUSTER $(AZCLI) aks get-credentials -n $(CLUSTER) -g $(GROUP) @@ -95,6 +77,22 @@ vars: ## Show the input vars configured for the cluster commands rg-up: ## Create resource group @$(AZCLI) group create --location $(REGION) --name $(GROUP) +ip: + $(AZCLI) network public-ip create --name $(IP_PREFIX)-$(CLUSTER)-$(IPVERSION) \ + --resource-group $(GROUP) \ + --allocation-method Static \ + --ip-tags $(IP_TAG) \ + --location $(REGION) \ + --sku Standard \ + --tier Regional \ + --version IP$(IPVERSION) + +ipv4: + @$(MAKE) ip IPVERSION=v4 + +ipv6: + @$(MAKE) ip IPVERSION=v6 + rg-down: ## Delete resource group $(AZCLI) group delete -g $(GROUP) --yes @@ -119,8 +117,7 @@ cilium-up: swift-cilium-up ## Alias to swift-cilium-up up: swift-up ## Alias to swift-up -nodesubnet-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an NodeSubnet BYO CNI cluster without kube-proxy - @$(MAKE) public-ipv4 +nodesubnet-byocni-nokubeproxy-up: rg-up ipv4 overlay-net-up ## Brings up an NodeSubnet BYO CNI cluster without kube-proxy $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ @@ -128,7 +125,7 @@ nodesubnet-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an NodeSubne --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ --max-pods 250 \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --network-plugin none \ --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ --os-sku $(OS_SKU) \ @@ -137,15 +134,14 @@ nodesubnet-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an NodeSubne --yes @$(MAKE) set-kubeconf -overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster - @$(MAKE) public-ipv4 +overlay-byocni-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay BYO CNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --network-plugin none \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -158,15 +154,14 @@ ifeq ($(OS),windows) endif @$(MAKE) set-kubeconf -overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy - @$(MAKE) public-ipv4 +overlay-byocni-nokubeproxy-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --network-plugin none \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -176,15 +171,14 @@ overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO --yes @$(MAKE) set-kubeconf -overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster - @$(MAKE) public-ipv4 +overlay-cilium-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay Cilium cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips (PUBLIC_IPv4) \ --network-plugin azure \ --network-dataplane cilium \ --network-plugin-mode overlay \ @@ -194,15 +188,14 @@ overlay-cilium-up: rg-up overlay-net-up ## Brings up an Overlay Cilium cluster --yes @$(MAKE) set-kubeconf -overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster - @$(MAKE) public-ipv4 +overlay-up: rg-up ipv4 overlay-net-up ## Brings up an Overlay AzCNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --network-plugin azure \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -211,15 +204,14 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster --yes @$(MAKE) set-kubeconf -swift-byocni-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster - @$(MAKE) public-ipv4 +swift-byocni-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT BYO CNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --network-plugin none \ --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 \ @@ -231,15 +223,14 @@ ifeq ($(OS),windows) endif @$(MAKE) set-kubeconf -swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip - @$(MAKE) public-ipv4 +swift-byocni-nokubeproxy-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT BYO CNI cluster without kube-proxy, add managed identity and public ip $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --network-plugin none \ --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 \ @@ -249,15 +240,14 @@ swift-byocni-nokubeproxy-up: rg-up swift-net-up ## Bring up a SWIFT BYO CNI clus --yes @$(MAKE) set-kubeconf -swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster - @$(MAKE) public-ipv4 +swift-cilium-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT Cilium cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --network-plugin azure \ --network-dataplane cilium \ --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \ @@ -267,15 +257,14 @@ swift-cilium-up: rg-up swift-net-up ## Bring up a SWIFT Cilium cluster --yes @$(MAKE) set-kubeconf -swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster - @$(MAKE) public-ipv4 +swift-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT AzCNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --network-plugin azure \ --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 \ @@ -283,8 +272,7 @@ swift-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster --yes @$(MAKE) set-kubeconf -swiftv2-multitenancy-cluster-up: rg-up - @$(MAKE) public-ipv4 +swiftv2-multitenancy-cluster-up: rg-up ipv4 $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --network-plugin azure \ --network-plugin-mode overlay \ @@ -292,19 +280,18 @@ swiftv2-multitenancy-cluster-up: rg-up --nodepool-name "mtapool" \ --node-vm-size $(VM_SIZE) \ --node-count 2 \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --nodepool-tags fastpathenabled=true \ --no-ssh-key \ --yes @$(MAKE) set-kubeconf -swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster - @$(MAKE) public-ipv4 +swiftv2-dummy-cluster-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT AzCNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --network-plugin azure \ --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 \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --no-ssh-key \ --yes @$(MAKE) set-kubeconf @@ -312,15 +299,14 @@ swiftv2-dummy-cluster-up: rg-up swift-net-up ## Bring up a SWIFT AzCNI cluster # The below Vnet Scale clusters are currently only in private preview and available with Kubernetes 1.28 # These AKS clusters can only be created in a limited subscription listed here: # https://dev.azure.com/msazure/CloudNativeCompute/_git/aks-rp?path=/resourceprovider/server/microsoft.com/containerservice/flags/network_flags.go&version=GBmaster&line=134&lineEnd=135&lineStartColumn=1&lineEndColumn=1&lineStyle=plain&_a=contents -vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster - @$(MAKE) public-ipv4 +vnetscale-swift-byocni-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --network-plugin none \ --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 \ @@ -329,15 +315,14 @@ vnetscale-swift-byocni-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale --yes @$(MAKE) set-kubeconf -vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster without kube-proxy - @$(MAKE) public-ipv4 +vnetscale-swift-byocni-nokubeproxy-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT BYO CNI cluster without kube-proxy $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --network-plugin none \ --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 \ @@ -347,15 +332,14 @@ vnetscale-swift-byocni-nokubeproxy-up: rg-up vnetscale-swift-net-up ## Bring up --yes @$(MAKE) set-kubeconf -vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT Cilium cluster - @$(MAKE) public-ipv4 +vnetscale-swift-cilium-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT Cilium cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --network-plugin azure \ --network-dataplane cilium \ --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \ @@ -365,15 +349,14 @@ vnetscale-swift-cilium-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale --yes @$(MAKE) set-kubeconf -vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT AzCNI cluster - @$(MAKE) public-ipv4 +vnetscale-swift-up: rg-up ipv4 vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT AzCNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4)\ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --network-plugin azure \ --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 \ @@ -381,15 +364,14 @@ vnetscale-swift-up: rg-up vnetscale-swift-net-up ## Bring up a Vnet Scale SWIFT --yes @$(MAKE) set-kubeconf -windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster - @$(MAKE) public-ipv4 +windows-cniv1-up: rg-up ipv4 overlay-net-up ## Bring up a Windows CNIv1 cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --network-plugin azure \ --windows-admin-password $(WINDOWS_PASSWORD) \ --windows-admin-username $(WINDOWS_USERNAME) \ @@ -399,15 +381,14 @@ windows-cniv1-up: rg-up overlay-net-up ## Bring up a Windows CNIv1 cluster @$(MAKE) windows-nodepool-up @$(MAKE) set-kubeconf -linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster - @$(MAKE) public-ipv4 +linux-cniv1-up: rg-up ipv4 overlay-net-up ## Bring up a Linux CNIv1 cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4) \ --max-pods 250 \ --network-plugin azure \ --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ @@ -416,16 +397,14 @@ linux-cniv1-up: rg-up overlay-net-up ## Bring up a Linux CNIv1 cluster --yes @$(MAKE) set-kubeconf -dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay cluster with Linux node only - @$(MAKE) public-ipv4 - @$(MAKE) public-ipv6 +dualstack-overlay-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up an dualstack Overlay cluster with Linux node only $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4),/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4),$(PUBLIC_IPv6) \ --network-plugin azure \ --network-plugin-mode overlay \ --subscription $(SUB) \ @@ -435,16 +414,14 @@ dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay clu --yes @$(MAKE) set-kubeconf -dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Overlay BYO CNI cluster - @$(MAKE) public-ipv4 - @$(MAKE) public-ipv6 +dualstack-overlay-byocni-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up an dualstack Overlay BYO CNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4),/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4),$(PUBLIC_IPv6) \ --network-plugin none \ --network-plugin-mode overlay \ --subscription $(SUB) \ @@ -454,16 +431,14 @@ dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Over --yes @$(MAKE) set-kubeconf -cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overlay cluster with Linux node only - @$(MAKE) public-ipv4 - @$(MAKE) public-ipv6 +cilium-dualstack-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up a Cilium Dualstack Overlay cluster with Linux node only $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4),/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4),$(PUBLIC_IPv6) \ --network-plugin azure \ --network-plugin-mode overlay \ --network-dataplane cilium \ @@ -474,16 +449,14 @@ cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overla --yes @$(MAKE) set-kubeconf -dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack overlay BYOCNI cluster with Linux node only and no kube-proxy - @$(MAKE) public-ipv4 - @$(MAKE) public-ipv6 +dualstack-byocni-nokubeproxy-up: rg-up ipv4 ipv6 overlay-net-up ## Brings up a Dualstack overlay BYOCNI cluster with Linux node only and no kube-proxy $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --auto-upgrade-channel $(AUTOUPGRADE) \ --node-os-upgrade-channel $(NODEUPGRADE) \ --kubernetes-version $(K8S_VER) \ --node-count $(NODE_COUNT) \ --node-vm-size $(VM_SIZE) \ - --load-balancer-outbound-ips /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv4),/subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/publicIPAddresses/$(PUBLIC_IPv6) \ + --load-balancer-outbound-ips $(PUBLIC_IPv4),$(PUBLIC_IPv6) \ --network-plugin none \ --network-plugin-mode overlay \ --subscription $(SUB) \