From f1fdc99b121570fea8611ec2df40eb8bba19f85a Mon Sep 17 00:00:00 2001 From: Evan Baker Date: Tue, 1 Nov 2022 21:29:29 +0000 Subject: [PATCH 1/4] fix: decrease hack cluster size to 2 Signed-off-by: Evan Baker --- hack/swift/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/swift/Makefile b/hack/swift/Makefile index 5f18425e49..9a24e5b9ba 100644 --- a/hack/swift/Makefile +++ b/hack/swift/Makefile @@ -79,7 +79,7 @@ up: swift-up ## Alias to swift-up overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ - --node-count 3 \ + --node-count 2 \ --network-plugin azure \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -90,7 +90,7 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster swift-byocni-up: rg-up net-up ## Bring up a SWIFT BYO CNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ - --node-count 3 \ + --node-count 2 \ --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 \ @@ -101,7 +101,7 @@ swift-byocni-up: rg-up net-up ## Bring up a SWIFT BYO CNI cluster swift-cilium-up: rg-up net-up ## Bring up a SWIFT Cilium cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ - --node-count 3 \ + --node-count 2 \ --network-plugin azure \ --enable-cilium-dataplane \ --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \ @@ -113,7 +113,7 @@ swift-cilium-up: rg-up net-up ## Bring up a SWIFT Cilium cluster swift-up: rg-up net-up ## Bring up a SWIFT AzCNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ - --node-count 3 \ + --node-count 2 \ --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 \ From 8115cf8bdde9da9d14a0b6fccf5d0c37093864f8 Mon Sep 17 00:00:00 2001 From: Evan Baker Date: Tue, 1 Nov 2022 21:39:01 +0000 Subject: [PATCH 2/4] fix: lb sku basic Signed-off-by: Evan Baker --- hack/swift/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hack/swift/Makefile b/hack/swift/Makefile index 9a24e5b9ba..44e37899db 100644 --- a/hack/swift/Makefile +++ b/hack/swift/Makefile @@ -12,7 +12,7 @@ USER ?= $(whoami) OSSKU ?= Ubuntu CLUSTER ?= $(USER)-$(REGION) GROUP ?= $(CLUSTER) -REGION ?= centraluseuap +REGION ?= westus2 SUB ?= $(AZURE_SUBSCRIPTION) VNET ?= $(CLUSTER) @@ -80,6 +80,7 @@ up: swift-up ## Alias to swift-up overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --node-count 2 \ + --load-balancer-sku basic \ --network-plugin azure \ --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ @@ -91,6 +92,7 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster swift-byocni-up: rg-up net-up ## Bring up a SWIFT BYO CNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --node-count 2 \ + --load-balancer-sku basic \ --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 \ @@ -102,6 +104,7 @@ swift-byocni-up: rg-up net-up ## Bring up a SWIFT BYO CNI cluster swift-cilium-up: rg-up net-up ## Bring up a SWIFT Cilium cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --node-count 2 \ + --load-balancer-sku basic \ --network-plugin azure \ --enable-cilium-dataplane \ --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \ @@ -114,6 +117,7 @@ swift-cilium-up: rg-up net-up ## Bring up a SWIFT Cilium cluster swift-up: rg-up net-up ## Bring up a SWIFT AzCNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --node-count 2 \ + --load-balancer-sku basic \ --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 \ From a1eeb5173dd231fdcdaa8ecc6e53868aa8aa9ca5 Mon Sep 17 00:00:00 2001 From: Evan Baker Date: Tue, 1 Nov 2022 21:44:08 +0000 Subject: [PATCH 3/4] fix: no ssh key Signed-off-by: Evan Baker --- hack/swift/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/swift/Makefile b/hack/swift/Makefile index 44e37899db..50e4d449f7 100644 --- a/hack/swift/Makefile +++ b/hack/swift/Makefile @@ -85,7 +85,7 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster --network-plugin-mode overlay \ --pod-cidr 192.168.0.0/16 \ --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ - --generate-ssh-keys \ + --no-ssh-key \ --yes @$(MAKE) set-kubeconf @@ -96,7 +96,7 @@ swift-byocni-up: rg-up net-up ## Bring up a SWIFT BYO CNI 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 \ - --generate-ssh-keys \ + --no-ssh-key \ --os-sku $(OSSKU) \ --yes @$(MAKE) set-kubeconf @@ -110,7 +110,7 @@ swift-cilium-up: rg-up net-up ## Bring up a SWIFT Cilium cluster --aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/CiliumDataplanePreview \ --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ --pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \ - --generate-ssh-keys \ + --no-ssh-key \ --yes @$(MAKE) set-kubeconf @@ -121,7 +121,7 @@ swift-up: rg-up 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 \ - --generate-ssh-keys \ + --no-ssh-key \ --yes @$(MAKE) set-kubeconf From a08776ffe796769704bee167932c3b02128ba48e Mon Sep 17 00:00:00 2001 From: Evan Baker Date: Tue, 1 Nov 2022 22:18:31 +0000 Subject: [PATCH 4/4] fix: set node-vm-size to cheapest available Signed-off-by: Evan Baker --- hack/swift/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hack/swift/Makefile b/hack/swift/Makefile index 50e4d449f7..a82c00abd8 100644 --- a/hack/swift/Makefile +++ b/hack/swift/Makefile @@ -80,6 +80,7 @@ up: swift-up ## Alias to swift-up overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --node-count 2 \ + --node-vm-size Standard_B2s \ --load-balancer-sku basic \ --network-plugin azure \ --network-plugin-mode overlay \ @@ -92,6 +93,7 @@ overlay-up: rg-up overlay-net-up ## Brings up an Overlay AzCNI cluster swift-byocni-up: rg-up net-up ## Bring up a SWIFT BYO CNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --node-count 2 \ + --node-vm-size Standard_B2s \ --load-balancer-sku basic \ --network-plugin none \ --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \ @@ -104,6 +106,7 @@ swift-byocni-up: rg-up net-up ## Bring up a SWIFT BYO CNI cluster swift-cilium-up: rg-up net-up ## Bring up a SWIFT Cilium cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --node-count 2 \ + --node-vm-size Standard_B2s \ --load-balancer-sku basic \ --network-plugin azure \ --enable-cilium-dataplane \ @@ -117,6 +120,7 @@ swift-cilium-up: rg-up net-up ## Bring up a SWIFT Cilium cluster swift-up: rg-up net-up ## Bring up a SWIFT AzCNI cluster $(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \ --node-count 2 \ + --node-vm-size Standard_B2s \ --load-balancer-sku basic \ --network-plugin azure \ --vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \