Skip to content

Commit 20659d1

Browse files
committed
ci: future proof for LTS clusters
1 parent 94c524d commit 20659d1

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

hack/aks/Makefile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,21 @@ OS_SKU_WIN ?= Windows2022
1919
REGION ?= westus2
2020
VM_SIZE ?= Standard_B2s
2121
VM_SIZE_WIN ?= Standard_B2s
22+
LTS ?= true
2223

2324
# overrideable variables
2425
SUB ?= $(AZURE_SUBSCRIPTION)
2526
CLUSTER ?= $(USER)-$(REGION)
2627
GROUP ?= $(CLUSTER)
2728
VNET ?= $(CLUSTER)
2829

30+
# Long Term Support (LTS)
31+
ifeq ($(LTS),true)
32+
LTS = --k8s-support-plan AKSLongTermSupport --tier premium
33+
else
34+
LTS =
35+
endif
36+
2937
##@ Help
3038

3139
help: ## Display this help
@@ -64,6 +72,7 @@ vars: ## Show the input vars configured for the cluster commands
6472
@echo VM_SIZE=$(VM_SIZE)
6573
@echo NODE_COUNT=$(NODE_COUNT)
6674
@echo VMSS_NAME=$(VMSS_NAME)
75+
@echo LTS=$(if $(LTS),$(LTS),empty)
6776

6877

6978
##@ SWIFT Infra
@@ -103,14 +112,13 @@ overlay-byocni-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster
103112
--node-count $(NODE_COUNT) \
104113
--node-vm-size $(VM_SIZE) \
105114
--load-balancer-sku standard \
106-
--k8s-support-plan AKSLongTermSupport \
107-
--tier premium \
108115
--network-plugin none \
109116
--network-plugin-mode overlay \
110117
--pod-cidr 192.168.0.0/16 \
111118
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
112119
--no-ssh-key \
113120
--os-sku $(OS_SKU) \
121+
$(LTS) \
114122
--yes
115123
ifeq ($(OS),windows)
116124
@$(MAKE) windows-nodepool-up

0 commit comments

Comments
 (0)