Skip to content

Commit c5b409c

Browse files
authored
revert: [NPM] Remove hostUsers Configuration (#3612)
* removed hostusers misconfigruation * added public ip and service tag to compile to SFI rules * test * fixed errors in bash * added --load-balancer-sku standard * added profile to public ip name * found issue removing unused config * updated name so that it has a unique public ip
1 parent 0545b71 commit c5b409c

File tree

4 files changed

+41
-6
lines changed

4 files changed

+41
-6
lines changed

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

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ stages:
108108
IS_STRESS_TEST: "false"
109109
v2-linux-stress:
110110
AZURE_CLUSTER: "conformance-v2-linux-stress"
111-
PROFILE: "v2-background"
111+
PROFILE: "v2-linux-stress"
112112
IS_STRESS_TEST: "true"
113113
v2-place-first:
114114
AZURE_CLUSTER: "conformance-v2-place-first"
@@ -123,6 +123,7 @@ stages:
123123
RESOURCE_GROUP: $[ stagedependencies.setup.setup.outputs['EnvironmentalVariables.RESOURCE_GROUP'] ]
124124
TAG: $[ stagedependencies.setup.setup.outputs['EnvironmentalVariables.TAG'] ]
125125
FQDN: empty
126+
PUBLIC_IP_NAME: $(RESOURCE_GROUP)-$(PROFILE)-public-ip
126127
steps:
127128
- checkout: self
128129

@@ -137,6 +138,23 @@ stages:
137138
echo created RG $(RESOURCE_GROUP) in $(LOCATION)
138139
az version
139140
141+
- task: AzureCLI@2
142+
displayName: "Create public IP with a service tag"
143+
inputs:
144+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
145+
scriptType: "bash"
146+
scriptLocation: "inlineScript"
147+
inlineScript: |
148+
az network public-ip create \
149+
--name $(PUBLIC_IP_NAME) \
150+
--resource-group $(RESOURCE_GROUP) \
151+
--allocation-method Static \
152+
--ip-tags 'FirstPartyUsage=/DelegatedNetworkControllerTest' \
153+
--location $(LOCATION) \
154+
--sku Standard \
155+
--tier Regional \
156+
--version IPv4
157+
140158
- task: AzureCLI@2
141159
displayName: "Deploy NPM to Test Cluster"
142160
inputs:
@@ -150,6 +168,9 @@ stages:
150168
chmod +x kubectl
151169
echo Cluster $(AZURE_CLUSTER)
152170
echo Resource $(RESOURCE_GROUP)
171+
echo Public IP $(PUBLIC_IP_NAME)
172+
export PUBLIC_IP_ID=$(az network public-ip show -g $(RESOURCE_GROUP) -n $(PUBLIC_IP_NAME) --query id -o tsv)
173+
echo Public IP ID $PUBLIC_IP_ID
153174
154175
if [[ $(AZURE_CLUSTER) == *ws22 ]] # * is used for pattern matching
155176
then
@@ -166,7 +187,8 @@ stages:
166187
--network-plugin azure \
167188
--vm-set-type VirtualMachineScaleSets \
168189
--node-vm-size Standard_D4s_v3 \
169-
--node-count 1
190+
--node-count 1 \
191+
--load-balancer-outbound-ips $PUBLIC_IP_ID
170192
171193
if [ $? != 0 ]
172194
then
@@ -213,7 +235,8 @@ stages:
213235
az aks create --no-ssh-key \
214236
--resource-group $(RESOURCE_GROUP) \
215237
--name $(AZURE_CLUSTER) \
216-
--network-plugin azure
238+
--network-plugin azure \
239+
--load-balancer-outbound-ips $PUBLIC_IP_ID
217240
218241
if [ $? != 0 ]
219242
then

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

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

npm/azure-npm.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ spec:
112112
- name: tmp
113113
mountPath: /tmp
114114
hostNetwork: true
115-
hostUsers: false
116115
nodeSelector:
117116
kubernetes.io/os: linux
118117
volumes:

npm/examples/azure-npm-lite.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ spec:
112112
- name: tmp
113113
mountPath: /tmp
114114
hostNetwork: true
115-
hostUsers: false
116115
nodeSelector:
117116
kubernetes.io/os: linux
118117
volumes:

0 commit comments

Comments
 (0)