Skip to content

Commit 88b64a1

Browse files
devigneddevigned
committed
fix: vnet resource group to be AZURE_RESOURCE_GROUP
1 parent 3944724 commit 88b64a1

16 files changed

+38
-38
lines changed

‎templates/cluster-template-external-cloud-provider.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ spec:
7676
"location": "${AZURE_LOCATION}",
7777
"vmType": "standard",
7878
"vnetName": "${CLUSTER_NAME}-vnet",
79-
"vnetResourceGroup": "${CLUSTER_NAME}",
79+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
8080
"subnetName": "${CLUSTER_NAME}-node-subnet",
8181
"routeTableName": "${CLUSTER_NAME}-node-routetable",
8282
"userAssignedID": "${CLUSTER_NAME}",
@@ -178,12 +178,12 @@ spec:
178178
"subscriptionId": "${AZURE_SUBSCRIPTION_ID}",
179179
"aadClientId": "${AZURE_CLIENT_ID}",
180180
"aadClientSecret": "${AZURE_CLIENT_SECRET}",
181-
"resourceGroup": "${CLUSTER_NAME}",
181+
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
182182
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
183183
"location": "${AZURE_LOCATION}",
184184
"vmType": "standard",
185185
"vnetName": "${CLUSTER_NAME}-vnet",
186-
"vnetResourceGroup": "${CLUSTER_NAME}",
186+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
187187
"subnetName": "${CLUSTER_NAME}-node-subnet",
188188
"routeTableName": "${CLUSTER_NAME}-node-routetable",
189189
"loadBalancerSku": "standard",

‎templates/cluster-template-machinepool.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ spec:
7676
"location": "${AZURE_LOCATION}",
7777
"vmType": "vmss",
7878
"vnetName": "${CLUSTER_NAME}-vnet",
79-
"vnetResourceGroup": "${CLUSTER_NAME}",
79+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
8080
"subnetName": "${CLUSTER_NAME}-node-subnet",
8181
"routeTableName": "${CLUSTER_NAME}-node-routetable",
8282
"userAssignedID": "${CLUSTER_NAME}",
@@ -173,12 +173,12 @@ spec:
173173
"subscriptionId": "${AZURE_SUBSCRIPTION_ID}",
174174
"aadClientId": "${AZURE_CLIENT_ID}",
175175
"aadClientSecret": "${AZURE_CLIENT_SECRET}",
176-
"resourceGroup": "${CLUSTER_NAME}",
176+
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
177177
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
178178
"location": "${AZURE_LOCATION}",
179179
"vmType": "vmss",
180180
"vnetName": "${CLUSTER_NAME}-vnet",
181-
"vnetResourceGroup": "${CLUSTER_NAME}",
181+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
182182
"subnetName": "${CLUSTER_NAME}-node-subnet",
183183
"routeTableName": "${CLUSTER_NAME}-node-routetable",
184184
"loadBalancerSku": "standard",

‎templates/cluster-template-system-assigned-identity.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ spec:
7676
"location": "${AZURE_LOCATION}",
7777
"vmType": "standard",
7878
"vnetName": "${CLUSTER_NAME}-vnet",
79-
"vnetResourceGroup": "${CLUSTER_NAME}",
79+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
8080
"subnetName": "${CLUSTER_NAME}-node-subnet",
8181
"routeTableName": "${CLUSTER_NAME}-node-routetable",
8282
"userAssignedID": "${CLUSTER_NAME}",
@@ -178,12 +178,12 @@ spec:
178178
"cloud": "AzurePublicCloud",
179179
"tenantId": "${AZURE_TENANT_ID}",
180180
"subscriptionId": "${AZURE_SUBSCRIPTION_ID}",
181-
"resourceGroup": "${CLUSTER_NAME}",
181+
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
182182
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
183183
"location": "${AZURE_LOCATION}",
184184
"vmType": "standard",
185185
"vnetName": "${CLUSTER_NAME}-vnet",
186-
"vnetResourceGroup": "${CLUSTER_NAME}",
186+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
187187
"subnetName": "${CLUSTER_NAME}-node-subnet",
188188
"routeTableName": "${CLUSTER_NAME}-node-routetable",
189189
"loadBalancerSku": "standard",

‎templates/cluster-template-user-assigned-identity.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ spec:
7676
"location": "${AZURE_LOCATION}",
7777
"vmType": "standard",
7878
"vnetName": "${CLUSTER_NAME}-vnet",
79-
"vnetResourceGroup": "${CLUSTER_NAME}",
79+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
8080
"subnetName": "${CLUSTER_NAME}-node-subnet",
8181
"routeTableName": "${CLUSTER_NAME}-node-routetable",
8282
"userAssignedID": "${CLUSTER_NAME}",
@@ -182,12 +182,12 @@ spec:
182182
"cloud": "AzurePublicCloud",
183183
"tenantId": "${AZURE_TENANT_ID}",
184184
"subscriptionId": "${AZURE_SUBSCRIPTION_ID}",
185-
"resourceGroup": "${CLUSTER_NAME}",
185+
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
186186
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
187187
"location": "${AZURE_LOCATION}",
188188
"vmType": "standard",
189189
"vnetName": "${CLUSTER_NAME}-vnet",
190-
"vnetResourceGroup": "${CLUSTER_NAME}",
190+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
191191
"subnetName": "${CLUSTER_NAME}-node-subnet",
192192
"routeTableName": "${CLUSTER_NAME}-node-routetable",
193193
"loadBalancerSku": "standard",

‎templates/cluster-template.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ spec:
7676
"location": "${AZURE_LOCATION}",
7777
"vmType": "standard",
7878
"vnetName": "${CLUSTER_NAME}-vnet",
79-
"vnetResourceGroup": "${CLUSTER_NAME}",
79+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
8080
"subnetName": "${CLUSTER_NAME}-node-subnet",
8181
"routeTableName": "${CLUSTER_NAME}-node-routetable",
8282
"userAssignedID": "${CLUSTER_NAME}",
@@ -178,12 +178,12 @@ spec:
178178
"subscriptionId": "${AZURE_SUBSCRIPTION_ID}",
179179
"aadClientId": "${AZURE_CLIENT_ID}",
180180
"aadClientSecret": "${AZURE_CLIENT_SECRET}",
181-
"resourceGroup": "${CLUSTER_NAME}",
181+
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
182182
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
183183
"location": "${AZURE_LOCATION}",
184184
"vmType": "standard",
185185
"vnetName": "${CLUSTER_NAME}-vnet",
186-
"vnetResourceGroup": "${CLUSTER_NAME}",
186+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
187187
"subnetName": "${CLUSTER_NAME}-node-subnet",
188188
"routeTableName": "${CLUSTER_NAME}-node-routetable",
189189
"loadBalancerSku": "standard",

‎templates/flavors/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ If you wish to override the default variables for flavor workers, you can specif
5959
"AZURE_CLIENT_ID_B64": "****"
6060
},
6161
"worker-templates": {
62-
"flavors": [{
62+
"flavors": {
6363
"default": {
6464
"CLUSTER_NAME": "example-default-cluster-name",
6565
"AZURE_VNET_NAME": "example-vnet-one"
@@ -69,7 +69,7 @@ If you wish to override the default variables for flavor workers, you can specif
6969
"AZURE_LOCATION": "westus",
7070
"AZURE_VNET_NAME": "example-vnet-two"
7171
}
72-
}],
72+
},
7373
"metadata": {
7474
"AZURE_LOCATION": "eastus",
7575
"AZURE_RESOURCE_GROUP": "test-resource-group-name",

‎templates/flavors/base/cluster-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ spec:
9090
"location": "${AZURE_LOCATION}",
9191
"vmType": "standard",
9292
"vnetName": "${CLUSTER_NAME}-vnet",
93-
"vnetResourceGroup": "${CLUSTER_NAME}",
93+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
9494
"subnetName": "${CLUSTER_NAME}-node-subnet",
9595
"routeTableName": "${CLUSTER_NAME}-node-routetable",
9696
"userAssignedID": "${CLUSTER_NAME}",

‎templates/flavors/default/machine-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ spec:
6262
"subscriptionId": "${AZURE_SUBSCRIPTION_ID}",
6363
"aadClientId": "${AZURE_CLIENT_ID}",
6464
"aadClientSecret": "${AZURE_CLIENT_SECRET}",
65-
"resourceGroup": "${CLUSTER_NAME}",
65+
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
6666
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
6767
"location": "${AZURE_LOCATION}",
6868
"vmType": "standard",
6969
"vnetName": "${CLUSTER_NAME}-vnet",
70-
"vnetResourceGroup": "${CLUSTER_NAME}",
70+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
7171
"subnetName": "${CLUSTER_NAME}-node-subnet",
7272
"routeTableName": "${CLUSTER_NAME}-node-routetable",
7373
"loadBalancerSku": "standard",

‎templates/flavors/external-cloud-provider/patches/external-cloud-provider.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
"location": "${AZURE_LOCATION}",
4242
"vmType": "standard",
4343
"vnetName": "${CLUSTER_NAME}-vnet",
44-
"vnetResourceGroup": "${CLUSTER_NAME}",
44+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
4545
"subnetName": "${CLUSTER_NAME}-node-subnet",
4646
"routeTableName": "${CLUSTER_NAME}-node-routetable",
4747
"userAssignedID": "${CLUSTER_NAME}",
@@ -74,12 +74,12 @@ spec:
7474
"subscriptionId": "${AZURE_SUBSCRIPTION_ID}",
7575
"aadClientId": "${AZURE_CLIENT_ID}",
7676
"aadClientSecret": "${AZURE_CLIENT_SECRET}",
77-
"resourceGroup": "${CLUSTER_NAME}",
77+
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
7878
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
7979
"location": "${AZURE_LOCATION}",
8080
"vmType": "standard",
8181
"vnetName": "${CLUSTER_NAME}-vnet",
82-
"vnetResourceGroup": "${CLUSTER_NAME}",
82+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
8383
"subnetName": "${CLUSTER_NAME}-node-subnet",
8484
"routeTableName": "${CLUSTER_NAME}-node-routetable",
8585
"loadBalancerSku": "standard",

‎templates/flavors/machinepool/machine-pool-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ spec:
5858
"subscriptionId": "${AZURE_SUBSCRIPTION_ID}",
5959
"aadClientId": "${AZURE_CLIENT_ID}",
6060
"aadClientSecret": "${AZURE_CLIENT_SECRET}",
61-
"resourceGroup": "${CLUSTER_NAME}",
61+
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
6262
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
6363
"location": "${AZURE_LOCATION}",
6464
"vmType": "vmss",
6565
"vnetName": "${CLUSTER_NAME}-vnet",
66-
"vnetResourceGroup": "${CLUSTER_NAME}",
66+
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
6767
"subnetName": "${CLUSTER_NAME}-node-subnet",
6868
"routeTableName": "${CLUSTER_NAME}-node-routetable",
6969
"loadBalancerSku": "standard",

0 commit comments

Comments
 (0)