Skip to content

Commit 4bb058e

Browse files
mboersmamboersma
committed
Update default Azure VM SKUs used in testing and templates
1 parent 37d47aa commit 4bb058e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+252
-132
lines changed

‎Tiltfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ settings = {
3030
"flatcar_version": "3374.2.1",
3131
"azure_location": "eastus",
3232
"control_plane_machine_count": "1",
33-
"az_control_plane_machine_type": "Standard_B2s",
33+
"az_control_plane_machine_type": "Standard_B2s_v2",
3434
"worker_machine_count": "2",
35-
"az_node_machine_type": "Standard_B2s",
35+
"az_node_machine_type": "Standard_B2s_v2",
3636
"cluster_class_name": "default",
3737
}
3838

‎api/v1beta1/azuremanagedmachinepooltemplate_webhook_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ func TestManagedMachinePoolTemplateUpdateWebhook(t *testing.T) {
9999
{
100100
name: "azuremanagedmachinepooltemplate SKU is immutable",
101101
oldMachinePoolTemplate: getAzureManagedMachinePoolTemplate(func(ammpt *AzureManagedMachinePoolTemplate) {
102-
ammpt.Spec.Template.Spec.SKU = "Standard_D2s_v3"
102+
ammpt.Spec.Template.Spec.SKU = "Standard_D2s_v5"
103103
}),
104104
machinePoolTemplate: getAzureManagedMachinePoolTemplate(func(ammpt *AzureManagedMachinePoolTemplate) {
105-
ammpt.Spec.Template.Spec.SKU = "Standard_D4s_v3"
105+
ammpt.Spec.Template.Spec.SKU = "Standard_D4s_v5"
106106
}),
107107
wantErr: true,
108108
},

‎azure/converters/managedagentpool_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func Test_AgentPoolToManagedClusterAgentPoolProfile(t *testing.T) {
3737
pool: &asocontainerservicev1hub.ManagedClustersAgentPool{
3838
Spec: asocontainerservicev1hub.ManagedClustersAgentPool_Spec{
3939
AzureName: "agentpool1",
40-
VmSize: ptr.To("Standard_D2s_v3"),
40+
VmSize: ptr.To("Standard_D2s_v5"),
4141
OsType: ptr.To(string(asocontainerservicev1.OSType_Linux)),
4242
OsDiskSizeGB: ptr.To(100),
4343
Count: ptr.To(2),
@@ -68,7 +68,7 @@ func Test_AgentPoolToManagedClusterAgentPoolProfile(t *testing.T) {
6868
expect: func(g *GomegaWithT, result asocontainerservicev1hub.ManagedClusterAgentPoolProfile) {
6969
g.Expect(result).To(Equal(asocontainerservicev1hub.ManagedClusterAgentPoolProfile{
7070
Name: ptr.To("agentpool1"),
71-
VmSize: ptr.To("Standard_D2s_v3"),
71+
VmSize: ptr.To("Standard_D2s_v5"),
7272
OsType: ptr.To(string(asocontainerservicev1.OSType_Linux)),
7373
OsDiskSizeGB: ptr.To(100),
7474
Count: ptr.To(2),

‎azure/scope/machine_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1933,7 +1933,7 @@ func TestMachineScope_NICSpecs(t *testing.T) {
19331933
},
19341934
cache: &MachineCache{
19351935
VMSKU: resourceskus.SKU{
1936-
Name: ptr.To("Standard_D2v2"),
1936+
Name: ptr.To("Standard_D2s_v5"),
19371937
},
19381938
},
19391939
},
@@ -1959,7 +1959,7 @@ func TestMachineScope_NICSpecs(t *testing.T) {
19591959
IPv6Enabled: false,
19601960
EnableIPForwarding: false,
19611961
SKU: &resourceskus.SKU{
1962-
Name: ptr.To("Standard_D2v2"),
1962+
Name: ptr.To("Standard_D2s_v5"),
19631963
},
19641964
ClusterName: "cluster",
19651965
AdditionalTags: infrav1.Tags{

‎azure/scope/managedcontrolplane_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func TestManagedControlPlaneScope_PoolVersion(t *testing.T) {
183183
&agentpools.AgentPoolSpec{
184184
Name: "pool0",
185185
AzureName: "pool0",
186-
SKU: "Standard_D2s_v3",
186+
SKU: "Standard_D2s_v5",
187187
Replicas: 1,
188188
Mode: "System",
189189
Cluster: "cluster1",
@@ -223,7 +223,7 @@ func TestManagedControlPlaneScope_PoolVersion(t *testing.T) {
223223
&agentpools.AgentPoolSpec{
224224
Name: "pool0",
225225
AzureName: "pool0",
226-
SKU: "Standard_D2s_v3",
226+
SKU: "Standard_D2s_v5",
227227
Mode: "System",
228228
Replicas: 1,
229229
Version: ptr.To("1.21.1"),
@@ -401,7 +401,7 @@ func TestManagedControlPlaneScope_OSType(t *testing.T) {
401401
&agentpools.AgentPoolSpec{
402402
Name: "pool0",
403403
AzureName: "pool0",
404-
SKU: "Standard_D2s_v3",
404+
SKU: "Standard_D2s_v5",
405405
Mode: "System",
406406
Replicas: 1,
407407
Cluster: "cluster1",
@@ -410,7 +410,7 @@ func TestManagedControlPlaneScope_OSType(t *testing.T) {
410410
&agentpools.AgentPoolSpec{
411411
Name: "pool1",
412412
AzureName: "pool1",
413-
SKU: "Standard_D2s_v3",
413+
SKU: "Standard_D2s_v5",
414414
Mode: "User",
415415
Replicas: 1,
416416
Cluster: "cluster1",
@@ -420,7 +420,7 @@ func TestManagedControlPlaneScope_OSType(t *testing.T) {
420420
&agentpools.AgentPoolSpec{
421421
Name: "pool2",
422422
AzureName: "pool2",
423-
SKU: "Standard_D2s_v3",
423+
SKU: "Standard_D2s_v5",
424424
Mode: "User",
425425
Replicas: 1,
426426
Cluster: "cluster1",

‎azure/scope/managedmachinepool_test.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestManagedMachinePoolScope_Autoscaling(t *testing.T) {
9898

9999
Name: "pool0",
100100
AzureName: "pool0",
101-
SKU: "Standard_D2s_v3",
101+
SKU: "Standard_D2s_v5",
102102
Replicas: 1,
103103
Mode: "System",
104104
Cluster: "cluster1",
@@ -125,7 +125,7 @@ func TestManagedMachinePoolScope_Autoscaling(t *testing.T) {
125125
Expected: &agentpools.AgentPoolSpec{
126126
Name: "pool1",
127127
AzureName: "pool1",
128-
SKU: "Standard_D2s_v3",
128+
SKU: "Standard_D2s_v5",
129129
Mode: "User",
130130
Cluster: "cluster1",
131131
Replicas: 1,
@@ -173,7 +173,7 @@ func TestManagedMachinePoolScope_NodeLabels(t *testing.T) {
173173
Expected: &agentpools.AgentPoolSpec{
174174
Name: "pool0",
175175
AzureName: "pool0",
176-
SKU: "Standard_D2s_v3",
176+
SKU: "Standard_D2s_v5",
177177
Replicas: 1,
178178
Mode: "System",
179179
Cluster: "cluster1",
@@ -202,7 +202,7 @@ func TestManagedMachinePoolScope_NodeLabels(t *testing.T) {
202202
Expected: &agentpools.AgentPoolSpec{
203203
Name: "pool1",
204204
AzureName: "pool1",
205-
SKU: "Standard_D2s_v3",
205+
SKU: "Standard_D2s_v5",
206206
Mode: "System",
207207
Cluster: "cluster1",
208208
Replicas: 1,
@@ -250,7 +250,7 @@ func TestManagedMachinePoolScope_AdditionalTags(t *testing.T) {
250250
Expected: &agentpools.AgentPoolSpec{
251251
Name: "pool0",
252252
AzureName: "pool0",
253-
SKU: "Standard_D2s_v3",
253+
SKU: "Standard_D2s_v5",
254254
Replicas: 1,
255255
Mode: "System",
256256
Cluster: "cluster1",
@@ -279,7 +279,7 @@ func TestManagedMachinePoolScope_AdditionalTags(t *testing.T) {
279279
Expected: &agentpools.AgentPoolSpec{
280280
Name: "pool1",
281281
AzureName: "pool1",
282-
SKU: "Standard_D2s_v3",
282+
SKU: "Standard_D2s_v5",
283283
Mode: "System",
284284
Cluster: "cluster1",
285285
Replicas: 1,
@@ -327,7 +327,7 @@ func TestManagedMachinePoolScope_MaxPods(t *testing.T) {
327327
Expected: &agentpools.AgentPoolSpec{
328328
Name: "pool0",
329329
AzureName: "pool0",
330-
SKU: "Standard_D2s_v3",
330+
SKU: "Standard_D2s_v5",
331331
Replicas: 1,
332332
Mode: "System",
333333
Cluster: "cluster1",
@@ -354,7 +354,7 @@ func TestManagedMachinePoolScope_MaxPods(t *testing.T) {
354354
Expected: &agentpools.AgentPoolSpec{
355355
Name: "pool1",
356356
AzureName: "pool1",
357-
SKU: "Standard_D2s_v3",
357+
SKU: "Standard_D2s_v5",
358358
Mode: "System",
359359
Cluster: "cluster1",
360360
Replicas: 1,
@@ -401,7 +401,7 @@ func TestManagedMachinePoolScope_Taints(t *testing.T) {
401401

402402
Name: "pool0",
403403
AzureName: "pool0",
404-
SKU: "Standard_D2s_v3",
404+
SKU: "Standard_D2s_v5",
405405
Replicas: 1,
406406
Mode: "System",
407407
Cluster: "cluster1",
@@ -434,7 +434,7 @@ func TestManagedMachinePoolScope_Taints(t *testing.T) {
434434
Expected: &agentpools.AgentPoolSpec{
435435
Name: "pool1",
436436
AzureName: "pool1",
437-
SKU: "Standard_D2s_v3",
437+
SKU: "Standard_D2s_v5",
438438
Mode: "User",
439439
Cluster: "cluster1",
440440
Replicas: 1,
@@ -480,7 +480,7 @@ func TestManagedMachinePoolScope_OSDiskType(t *testing.T) {
480480
Expected: &agentpools.AgentPoolSpec{
481481
Name: "pool0",
482482
AzureName: "pool0",
483-
SKU: "Standard_D2s_v3",
483+
SKU: "Standard_D2s_v5",
484484
Replicas: 1,
485485
Mode: "System",
486486
Cluster: "cluster1",
@@ -507,7 +507,7 @@ func TestManagedMachinePoolScope_OSDiskType(t *testing.T) {
507507
Expected: &agentpools.AgentPoolSpec{
508508
Name: "pool1",
509509
AzureName: "pool1",
510-
SKU: "Standard_D2s_v3",
510+
SKU: "Standard_D2s_v5",
511511
Mode: "User",
512512
Cluster: "cluster1",
513513
Replicas: 1,
@@ -553,7 +553,7 @@ func TestManagedMachinePoolScope_SubnetName(t *testing.T) {
553553
Expected: &agentpools.AgentPoolSpec{
554554
Name: "pool0",
555555
AzureName: "pool0",
556-
SKU: "Standard_D2s_v3",
556+
SKU: "Standard_D2s_v5",
557557
Replicas: 1,
558558
Mode: "System",
559559
Cluster: "cluster1",
@@ -589,7 +589,7 @@ func TestManagedMachinePoolScope_SubnetName(t *testing.T) {
589589
Expected: &agentpools.AgentPoolSpec{
590590
Name: "pool1",
591591
AzureName: "pool1",
592-
SKU: "Standard_D2s_v3",
592+
SKU: "Standard_D2s_v5",
593593
Mode: "User",
594594
Cluster: "cluster1",
595595
Replicas: 1,
@@ -625,7 +625,7 @@ func TestManagedMachinePoolScope_SubnetName(t *testing.T) {
625625
Expected: &agentpools.AgentPoolSpec{
626626
Name: "pool1",
627627
AzureName: "pool1",
628-
SKU: "Standard_D2s_v3",
628+
SKU: "Standard_D2s_v5",
629629
Mode: "User",
630630
Cluster: "cluster1",
631631
Replicas: 1,
@@ -671,7 +671,7 @@ func TestManagedMachinePoolScope_KubeletDiskType(t *testing.T) {
671671
Expected: &agentpools.AgentPoolSpec{
672672
Name: "pool0",
673673
AzureName: "pool0",
674-
SKU: "Standard_D2s_v3",
674+
SKU: "Standard_D2s_v5",
675675
Replicas: 1,
676676
Mode: "System",
677677
Cluster: "cluster1",
@@ -698,7 +698,7 @@ func TestManagedMachinePoolScope_KubeletDiskType(t *testing.T) {
698698
Expected: &agentpools.AgentPoolSpec{
699699
Name: "pool1",
700700
AzureName: "pool1",
701-
SKU: "Standard_D2s_v3",
701+
SKU: "Standard_D2s_v5",
702702
Mode: "User",
703703
Cluster: "cluster1",
704704
Replicas: 1,
@@ -898,7 +898,7 @@ func getAzureMachinePool(name string, mode infrav1.NodePoolMode) *infrav1.AzureM
898898
Spec: infrav1.AzureManagedMachinePoolSpec{
899899
AzureManagedMachinePoolClassSpec: infrav1.AzureManagedMachinePoolClassSpec{
900900
Mode: string(mode),
901-
SKU: "Standard_D2s_v3",
901+
SKU: "Standard_D2s_v5",
902902
Name: ptr.To(name),
903903
},
904904
},

‎azure/services/networkinterfaces/spec_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var (
4343
ClusterName: "my-cluster",
4444
}
4545
fakeSku = resourceskus.SKU{
46-
Name: ptr.To("Standard_D2v2"),
46+
Name: ptr.To("Standard_D2s_v5"),
4747
Kind: ptr.To(string(resourceskus.VirtualMachines)),
4848
Locations: []*string{
4949
ptr.To("fake-location"),

‎controllers/azuremachine_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ func getFakeAzureMachine(changes ...func(*infrav1.AzureMachine)) *infrav1.AzureM
617617
},
618618
},
619619
Spec: infrav1.AzureMachineSpec{
620-
VMSize: "Standard_D2s_v3",
620+
VMSize: "Standard_D2s_v5",
621621
},
622622
}
623623
for _, change := range changes {

‎controllers/helpers_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ func newAzureManagedMachinePool(clusterName, poolName, mode string) *infrav1.Azu
12421242
Spec: infrav1.AzureManagedMachinePoolSpec{
12431243
AzureManagedMachinePoolClassSpec: infrav1.AzureManagedMachinePoolClassSpec{
12441244
Mode: mode,
1245-
SKU: "Standard_B2s",
1245+
SKU: "Standard_B2s_v2",
12461246
OSDiskSizeGB: ptr.To(512),
12471247
KubeletConfig: &infrav1.KubeletConfig{
12481248
CPUManagerPolicy: &cpuManagerPolicyStatic,

‎docs/book/src/developers/development.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,8 @@ export AZURE_CLIENT_SECRET_B64="$(echo -n "$AZURE_CLIENT_SECRET" | base64 | tr -
385385

386386
# Machine settings.
387387
export CONTROL_PLANE_MACHINE_COUNT=3
388-
export AZURE_CONTROL_PLANE_MACHINE_TYPE="Standard_B2s"
389-
export AZURE_NODE_MACHINE_TYPE="Standard_B2s"
388+
export AZURE_CONTROL_PLANE_MACHINE_TYPE="Standard_B2s_v2"
389+
export AZURE_NODE_MACHINE_TYPE="Standard_B2s_v2"
390390
export WORKER_MACHINE_COUNT=2
391391
export KUBERNETES_VERSION="v1.32.2"
392392

0 commit comments

Comments
 (0)