Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

test: Use Standard_D2_v3 and low pri VMSS in E2E test configs #2000

Merged
merged 4 commits into from
Sep 20, 2019
Merged

test: Use Standard_D2_v3 and low pri VMSS in E2E test configs #2000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23dae99
test: use Standard_D2_v3, low-pri scalesets
jackfrancis Sep 20, 2019
79555cb
test: gpu is vmss
jackfrancis Sep 20, 2019
5800f37
test: vmss in all pools, d2v2 for accelerated networking
jackfrancis Sep 20, 2019
e0e189f
test: explicit vmss in all pools
jackfrancis Sep 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion test/e2e/test_cluster_configs/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
{
"name": "agentpool1",
"count": 2,
"vmSize": "Standard_D2_v3"
"vmSize": "Standard_D2_v3",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/test_cluster_configs/container_monitoring.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"name": "agentpool",
"count": 3,
"vmSize": "Standard_DS2_v2",
"availabilityProfile": "VirtualMachineScaleSets"
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
7 changes: 4 additions & 3 deletions test/e2e/test_cluster_configs/flannel/containerd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agent1",
"count": 3,
"vmSize": "Standard_D2_v2",
"availabilityProfile": "AvailabilitySet"
"vmSize": "Standard_D2_v3",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
8 changes: 5 additions & 3 deletions test/e2e/test_cluster_configs/flannel/docker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v2",
"osType": "Linux"
"vmSize": "Standard_D2_v3",
"osType": "Linux",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
9 changes: 6 additions & 3 deletions test/e2e/test_cluster_configs/gpu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,21 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agent1",
"count": 1,
"vmSize": "Standard_NC6"
"vmSize": "Standard_NC6",
"availabilityProfile": "VirtualMachineScaleSets"
},
{
"name": "agent2",
"count": 3,
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_v3",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
8 changes: 5 additions & 3 deletions test/e2e/test_cluster_configs/kubnet.json → test/e2e/test_cluster_configs/kubenet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v2",
"osType": "Linux"
"vmSize": "Standard_D2_v3",
"osType": "Linux",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
8 changes: 5 additions & 3 deletions test/e2e/test_cluster_configs/network/cilium.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agent1",
"count": 2,
"vmSize": "Standard_D2_v2"
"count": 3,
"vmSize": "Standard_D2_v3",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
8 changes: 5 additions & 3 deletions test/e2e/test_cluster_configs/network_policy/azure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agent1",
"count": 3,
"vmSize": "Standard_D2_v2",
"osType": "Linux"
"vmSize": "Standard_D2_v3",
"osType": "Linux",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/test_cluster_configs/network_policy/calico.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_DS2_v2",
"vmSize": "Standard_D2_v3",
"OSDiskSizeGB": 200,
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME",
"firstConsecutiveStaticIP": "10.239.255.239",
Expand All @@ -47,7 +47,7 @@
{
"name": "agent1",
"count": 3,
"vmSize": "Standard_DS2_v2",
"vmSize": "Standard_D2_v3",
"OSDiskSizeGB": 200,
"storageProfile": "ManagedDisks",
"diskSizesGB": [
Expand Down
7 changes: 4 additions & 3 deletions test/e2e/test_cluster_configs/network_policy/calico_azure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_DS2_v2"
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_DS2_v2",
"availabilityProfile": "AvailabilitySet"
"vmSize": "Standard_D2_v3",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
7 changes: 4 additions & 3 deletions test/e2e/test_cluster_configs/network_policy/cilium.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_DS2_v2"
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agent1",
"count": 3,
"vmSize": "Standard_D2_v2",
"availabilityProfile": "AvailabilitySet"
"vmSize": "Standard_D2_v3",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
6 changes: 4 additions & 2 deletions test/e2e/test_cluster_configs/no_outbound.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_v3",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
6 changes: 4 additions & 2 deletions test/e2e/test_cluster_configs/not_in_vhd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_v3",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
8 changes: 5 additions & 3 deletions test/e2e/test_cluster_configs/rbac_disabled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v2",
"osType": "Linux"
"vmSize": "Standard_D2_v3",
"osType": "Linux",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/test_cluster_configs/storage_profile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2_v3",
"OSDiskSizeGB": 200,
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME",
"firstConsecutiveStaticIP": "10.239.255.239",
Expand All @@ -42,7 +42,7 @@
{
"name": "agent1",
"count": 3,
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2_v3",
"OSDiskSizeGB": 200,
"storageProfile": "StorageAccount",
"diskSizesGB": [
Expand Down
9 changes: 5 additions & 4 deletions test/e2e/test_cluster_configs/vmss_master.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorType": "Kubernetes"
},
"masterProfile": {
"count": 3,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2_v3",
"availabilityProfile": "VirtualMachineScaleSets"
},
"agentPoolProfiles": [
{
"name": "agentpool1",
"count": 3,
"vmSize": "Standard_D2_v2",
"availabilityProfile": "VirtualMachineScaleSets"
"vmSize": "Standard_D2_v3",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"linuxProfile": {
Expand Down
7 changes: 4 additions & 3 deletions test/e2e/test_cluster_configs/windows/accelerated_networking.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorType": "Kubernetes"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_3"
},
"agentPoolProfiles": [
{
Expand All @@ -18,7 +18,8 @@
"vmSize": "Standard_D2_v2",
"osType": "Windows",
"acceleratedNetworkingEnabledWindows": true,
"availabilityProfile": "AvailabilitySet"
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"windowsProfile": {
Expand Down
15 changes: 9 additions & 6 deletions test/e2e/test_cluster_configs/windows/custom_image.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,27 @@
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "Kubernetes",
"orchestratorType": "Kubernetes"
},
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2_v3"
},
"agentPoolProfiles": [
{
"name": "linuxpool1",
"count": 3,
"vmSize": "Standard_D2_v2"
"count": 1,
"vmSize": "Standard_D2_v3",
"availabilityProfile": "VirtualMachineScaleSets"
},
{
"name": "agentwin",
"count": 3,
"vmSize": "Standard_D2_v2",
"osType": "Windows"
"vmSize": "Standard_D2_v3",
"osType": "Windows",
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low"
}
],
"windowsProfile": {
Expand Down
5 changes: 3 additions & 2 deletions test/e2e/test_cluster_configs/windows/custom_vnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"masterProfile": {
"count": 3,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2_v3",
"OSDiskSizeGB": 200,
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME",
"firstConsecutiveStaticIP": "10.239.255.239",
Expand All @@ -46,7 +46,7 @@
{
"name": "agent1",
"count": 3,
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2_v3",
"osType": "Windows",
"OSDiskSizeGB": 200,
"storageProfile": "ManagedDisks",
Expand All @@ -57,6 +57,7 @@
128
],
"availabilityProfile": "VirtualMachineScaleSets",
"scalesetPriority": "Low",
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME"
}
],
Expand Down
Loading