Skip to content

Commit 2115fd0

Browse files
committed
added service tag to public ip to comply with SFI rules
1 parent 801a2f5 commit 2115fd0

File tree

2 files changed

+40
-3
lines changed

2 files changed

+40
-3
lines changed

.pipelines/npm/npm-conformance-tests.yaml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ stages:
121121
RESOURCE_GROUP: $[ stagedependencies.setup.setup.outputs['EnvironmentalVariables.RESOURCE_GROUP'] ]
122122
TAG: $[ stagedependencies.setup.setup.outputs['EnvironmentalVariables.TAG'] ]
123123
FQDN: empty
124+
PUBLIC_IP_NAME: $(RESOURCE_GROUP)-$(PROFILE)-public-ip
124125
steps:
125126
- checkout: self
126127

@@ -135,6 +136,23 @@ stages:
135136
echo created RG $(RESOURCE_GROUP) in $(LOCATION)
136137
az version
137138
139+
- task: AzureCLI@2
140+
displayName: "Create public IP with a service tag"
141+
inputs:
142+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
143+
scriptType: "bash"
144+
scriptLocation: "inlineScript"
145+
inlineScript: |
146+
az network public-ip create \
147+
--name $(PUBLIC_IP_NAME) \
148+
--resource-group $(RESOURCE_GROUP) \
149+
--allocation-method Static \
150+
--ip-tags 'FirstPartyUsage=/DelegatedNetworkControllerTest' \
151+
--location $(LOCATION) \
152+
--sku Standard \
153+
--tier Regional \
154+
--version IPv4
155+
138156
- task: AzureCLI@2
139157
displayName: "Deploy NPM to Test Cluster"
140158
inputs:
@@ -148,6 +166,9 @@ stages:
148166
chmod +x kubectl
149167
echo Cluster $(AZURE_CLUSTER)
150168
echo Resource $(RESOURCE_GROUP)
169+
echo Public IP $(PUBLIC_IP_NAME)
170+
export PUBLIC_IP_ID=$(az network public-ip show -g $(RESOURCE_GROUP) -n $(PUBLIC_IP_NAME) --query id -o tsv)
171+
echo Public IP ID $PUBLIC_IP_ID
151172
152173
if [[ $(AZURE_CLUSTER) == *ws22 ]] # * is used for pattern matching
153174
then
@@ -164,7 +185,8 @@ stages:
164185
--network-plugin azure \
165186
--vm-set-type VirtualMachineScaleSets \
166187
--node-vm-size Standard_D4s_v3 \
167-
--node-count 1
188+
--node-count 1 \
189+
--load-balancer-outbound-ips $PUBLIC_IP_ID
168190
169191
if [ $? != 0 ]
170192
then
@@ -211,7 +233,8 @@ stages:
211233
az aks create --no-ssh-key \
212234
--resource-group $(RESOURCE_GROUP) \
213235
--name $(AZURE_CLUSTER) \
214-
--network-plugin azure
236+
--network-plugin azure \
237+
--load-balancer-outbound-ips $PUBLIC_IP_ID
215238
216239
if [ $? != 0 ]
217240
then

.pipelines/npm/npm-scale-test.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,19 @@ jobs:
141141
echo "Creating resource group named $(RESOURCE_GROUP)"
142142
az group create --name $(RESOURCE_GROUP) -l $(LOCATION) -o table
143143
144+
export PUBLIC_IP_NAME=$(RESOURCE_GROUP)-$(PROFILE)-public-ip
145+
echo "Creating public IP with a service tag named $PUBLIC_IP_NAME"
146+
az network public-ip create \
147+
--name $PUBLIC_IP_NAME \
148+
--resource-group $(RESOURCE_GROUP) \
149+
--allocation-method Static \
150+
--ip-tags 'FirstPartyUsage=/DelegatedNetworkControllerTest' \
151+
--location $(LOCATION) \
152+
--sku Standard \
153+
--tier Regional \
154+
--version IPv4
155+
export PUBLIC_IP_ID=$(az network public-ip show -g $(RESOURCE_GROUP) -n $PUBLIC_IP_NAME --query id -o tsv)
156+
144157
export CLUSTER_NAME=$(RESOURCE_GROUP)-$(PROFILE)
145158
echo "Creating cluster named $CLUSTER_NAME"
146159
az aks create \
@@ -154,7 +167,8 @@ jobs:
154167
--node-vm-size Standard_D4s_v3 \
155168
--node-count 1 \
156169
--tier standard \
157-
--max-pods 100
170+
--max-pods 100 \
171+
--load-balancer-outbound-ips $PUBLIC_IP_ID
158172
159173
echo "Getting credentials to $CLUSTER_NAME"
160174
az aks get-credentials -g $(RESOURCE_GROUP) -n $CLUSTER_NAME --overwrite-existing --file ./kubeconfig

0 commit comments

Comments
 (0)