Skip to content

Commit a7b849c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #695 from CecileRobertMichon/vmss-vmtype
🐛 Use vmType "vmss" in every template to allow mixed mode
2 parents 6c11ec8 + ead5f99 commit a7b849c

13 files changed

+21
-21
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ spec:
7474
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
7575
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
7676
"location": "${AZURE_LOCATION}",
77-
"vmType": "standard",
77+
"vmType": "vmss",
7878
"vnetName": "${CLUSTER_NAME}-vnet",
7979
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
8080
"subnetName": "${CLUSTER_NAME}-node-subnet",
@@ -181,7 +181,7 @@ spec:
181181
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
182182
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
183183
"location": "${AZURE_LOCATION}",
184-
"vmType": "standard",
184+
"vmType": "vmss",
185185
"vnetName": "${CLUSTER_NAME}-vnet",
186186
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
187187
"subnetName": "${CLUSTER_NAME}-node-subnet",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ spec:
7474
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
7575
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
7676
"location": "${AZURE_LOCATION}",
77-
"vmType": "standard",
77+
"vmType": "vmss",
7878
"vnetName": "${CLUSTER_NAME}-vnet",
7979
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
8080
"subnetName": "${CLUSTER_NAME}-node-subnet",
@@ -181,7 +181,7 @@ spec:
181181
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
182182
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
183183
"location": "${AZURE_LOCATION}",
184-
"vmType": "standard",
184+
"vmType": "vmss",
185185
"vnetName": "${CLUSTER_NAME}-vnet",
186186
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
187187
"subnetName": "${CLUSTER_NAME}-node-subnet",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ spec:
7474
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
7575
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
7676
"location": "${AZURE_LOCATION}",
77-
"vmType": "standard",
77+
"vmType": "vmss",
7878
"vnetName": "${CLUSTER_NAME}-vnet",
7979
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
8080
"subnetName": "${CLUSTER_NAME}-node-subnet",
@@ -185,7 +185,7 @@ spec:
185185
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
186186
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
187187
"location": "${AZURE_LOCATION}",
188-
"vmType": "standard",
188+
"vmType": "vmss",
189189
"vnetName": "${CLUSTER_NAME}-vnet",
190190
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
191191
"subnetName": "${CLUSTER_NAME}-node-subnet",

‎templates/cluster-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ spec:
7474
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
7575
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
7676
"location": "${AZURE_LOCATION}",
77-
"vmType": "standard",
77+
"vmType": "vmss",
7878
"vnetName": "${CLUSTER_NAME}-vnet",
7979
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
8080
"subnetName": "${CLUSTER_NAME}-node-subnet",
@@ -181,7 +181,7 @@ spec:
181181
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
182182
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
183183
"location": "${AZURE_LOCATION}",
184-
"vmType": "standard",
184+
"vmType": "vmss",
185185
"vnetName": "${CLUSTER_NAME}-vnet",
186186
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
187187
"subnetName": "${CLUSTER_NAME}-node-subnet",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ spec:
8888
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
8989
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
9090
"location": "${AZURE_LOCATION}",
91-
"vmType": "standard",
91+
"vmType": "vmss",
9292
"vnetName": "${CLUSTER_NAME}-vnet",
9393
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
9494
"subnetName": "${CLUSTER_NAME}-node-subnet",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ spec:
6565
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
6666
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
6767
"location": "${AZURE_LOCATION}",
68-
"vmType": "standard",
68+
"vmType": "vmss",
6969
"vnetName": "${CLUSTER_NAME}-vnet",
7070
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
7171
"subnetName": "${CLUSTER_NAME}-node-subnet",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
4040
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
4141
"location": "${AZURE_LOCATION}",
42-
"vmType": "standard",
42+
"vmType": "vmss",
4343
"vnetName": "${CLUSTER_NAME}-vnet",
4444
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
4545
"subnetName": "${CLUSTER_NAME}-node-subnet",
@@ -77,7 +77,7 @@ spec:
7777
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
7878
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
7979
"location": "${AZURE_LOCATION}",
80-
"vmType": "standard",
80+
"vmType": "vmss",
8181
"vnetName": "${CLUSTER_NAME}-vnet",
8282
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
8383
"subnetName": "${CLUSTER_NAME}-node-subnet",

‎templates/flavors/system-assigned-identity/patches/system-assigned-identity.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
1515
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
1616
"location": "${AZURE_LOCATION}",
17-
"vmType": "standard",
17+
"vmType": "vmss",
1818
"vnetName": "${CLUSTER_NAME}-vnet",
1919
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
2020
"subnetName": "${CLUSTER_NAME}-node-subnet",

‎templates/flavors/system-assigned-identity/system-assigned-identity-md.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ spec:
6464
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
6565
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
6666
"location": "${AZURE_LOCATION}",
67-
"vmType": "standard",
67+
"vmType": "vmss",
6868
"vnetName": "${CLUSTER_NAME}-vnet",
6969
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
7070
"subnetName": "${CLUSTER_NAME}-node-subnet",

‎templates/flavors/user-assigned-identity/user-assigned-identity-md.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
"resourceGroup": "${AZURE_RESOURCE_GROUP}",
6767
"securityGroupName": "${CLUSTER_NAME}-node-nsg",
6868
"location": "${AZURE_LOCATION}",
69-
"vmType": "standard",
69+
"vmType": "vmss",
7070
"vnetName": "${CLUSTER_NAME}-vnet",
7171
"vnetResourceGroup": "${AZURE_RESOURCE_GROUP}",
7272
"subnetName": "${CLUSTER_NAME}-node-subnet",

0 commit comments

Comments
 (0)