Skip to content

Commit ea0b778

Browse files
author
sivakami
committed
reset cuxtomer vnet make targets.
1 parent 2dbf6b0 commit ea0b778

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.pipelines/swiftv2-long-running/scripts/create_vnets.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ for i in "${!VNAMES[@]}"; do
6969
continue
7070
fi
7171
cluster_name="${BUILD_ID}-${VNET}-${PODSUBNET}"
72-
make -C ./hack/aks swiftv2-dummy-cluster-up \
72+
make -C ./hack/aks swiftv2-dummy-cluster-subnet-delegator-up \
7373
AZCLI=az CLUSTER=$cluster_name GROUP=$RG REGION=$LOCATION \
7474
SUB=$SUB_ID VNET=$VNET POD_SUBNET=$PODSUBNET \
7575
&& echo "Created dummy cluster for $VNET subnet $PODSUBNET"

hack/aks/Makefile

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ PUBLIC_IPv4 ?= $(PUBLIC_IP_ID)/$(IP_PREFIX)-$(CLUSTER)-v4
2828
PUBLIC_IPv6 ?= $(PUBLIC_IP_ID)/$(IP_PREFIX)-$(CLUSTER)-v6
2929
KUBE_PROXY_JSON_PATH ?= ./kube-proxy.json
3030
LTS ?= false
31-
POD_SUBNET ?= podnet
3231

3332

3433
# overrideable variables
@@ -288,6 +287,17 @@ swiftv2-multitenancy-cluster-up: rg-up ipv4
288287
@$(MAKE) set-kubeconf
289288

290289
swiftv2-dummy-cluster-up: rg-up ipv4 swift-net-up ## Bring up a SWIFT AzCNI cluster
290+
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
291+
--network-plugin azure \
292+
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \
293+
--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet \
294+
--tags stampcreatorserviceinfo=true \
295+
--load-balancer-outbound-ips $(PUBLIC_IPv4) \
296+
--no-ssh-key \
297+
--yes
298+
@$(MAKE) set-kubeconf
299+
300+
swiftv2-dummy-cluster-subnet-delegator-up: ipv4 ## Bring up a SWIFT AzCNI cluster for delegating subnet.
291301
$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
292302
--network-plugin azure \
293303
--vnet-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/nodenet \

0 commit comments

Comments
 (0)