Update dummy clusters.

Author: sivakami

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

@@ -69,7 +69,7 @@ for i in "${!VNAMES[@]}"; do
             continue
         fi
         cluster_name="${BUILD_ID}-${VNET}-${PODSUBNET}"
-        make -C ./hack/aks swiftv2-dummy-cluster-subnet-delegator-up \
+        make -C ./hack/aks swiftv2-dummy-cluster-up \
             AZCLI=az CLUSTER=$cluster_name GROUP=$RG REGION=$LOCATION \
             SUB=$SUB_ID VNET=$VNET POD_SUBNET=$PODSUBNET \
             && echo "Created dummy cluster for $VNET subnet $PODSUBNET"

hack/aks/Makefile

@@ -28,6 +28,8 @@ 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
 LTS					 ?= false
+POD_SUBNET			 ?= podnet
+
 
 # overrideable variables
 SUB        ?= $(AZURE_SUBSCRIPTION)
@@ -286,20 +288,11 @@ swiftv2-multitenancy-cluster-up: rg-up ipv4
 	@$(MAKE) set-kubeconf
 
 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 $(PUBLIC_IPv4) \
-		--no-ssh-key \
-		--yes
-	@$(MAKE) set-kubeconf
-
-swiftv2-dummy-cluster-subnet-delegator-up: ipv4  ## Bring up a SWIFT AzCNI cluster for delegating subnet.
 	$(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/$(POD_SUBNET) \
+		--tags stampcreatorserviceinfo=true \
 		--load-balancer-outbound-ips $(PUBLIC_IPv4) \
 		--no-ssh-key \
 		--yes
@@ -465,7 +458,7 @@ linux-swiftv2-nodepool-up: ## Add linux node pool to swiftv2 cluster
 		--os-type Linux \
 		--max-pods 250 \
 		--subscription $(SUB) \
-		--tags fastpathenabled=true aks-nic-enable-multi-tenancy=true \
+		--tags fastpathenabled=true aks-nic-enable-multi-tenancy=true stampcreatorserviceinfo=true\
 		--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/NetworkingMultiTenancyPreview \
 		--pod-subnet-id /subscriptions/$(SUB)/resourceGroups/$(GROUP)/providers/Microsoft.Network/virtualNetworks/$(VNET)/subnets/podnet