Skip to content

[WIP] Update default Azure VM SKUs used in testing and templates #5996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mboersma wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[WIP] Update default Azure VM SKUs used in testing and templates #5996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bb058e
Update default Azure VM SKUs used in testing and templates
mboersma Dec 9, 2025
62c6c2c
Use Standard_D2ds_v5
mboersma Dec 10, 2025
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: 2 additions & 2 deletions Tiltfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ settings = {
"flatcar_version": "3374.2.1",
"azure_location": "eastus",
"control_plane_machine_count": "1",
"az_control_plane_machine_type": "Standard_B2s",
"az_control_plane_machine_type": "Standard_B2s_v2",
"worker_machine_count": "2",
"az_node_machine_type": "Standard_B2s",
"az_node_machine_type": "Standard_B2s_v2",
"cluster_class_name": "default",
}

Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/azuremanagedmachinepooltemplate_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ func TestManagedMachinePoolTemplateUpdateWebhook(t *testing.T) {
{
name: "azuremanagedmachinepooltemplate SKU is immutable",
oldMachinePoolTemplate: getAzureManagedMachinePoolTemplate(func(ammpt *AzureManagedMachinePoolTemplate) {
ammpt.Spec.Template.Spec.SKU = "Standard_D2s_v3"
ammpt.Spec.Template.Spec.SKU = "Standard_D2ds_v5"
}),
machinePoolTemplate: getAzureManagedMachinePoolTemplate(func(ammpt *AzureManagedMachinePoolTemplate) {
ammpt.Spec.Template.Spec.SKU = "Standard_D4s_v3"
ammpt.Spec.Template.Spec.SKU = "Standard_D4s_v5"
}),
wantErr: true,
},
Expand Down
4 changes: 2 additions & 2 deletions azure/converters/managedagentpool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func Test_AgentPoolToManagedClusterAgentPoolProfile(t *testing.T) {
pool: &asocontainerservicev1hub.ManagedClustersAgentPool{
Spec: asocontainerservicev1hub.ManagedClustersAgentPool_Spec{
AzureName: "agentpool1",
VmSize: ptr.To("Standard_D2s_v3"),
VmSize: ptr.To("Standard_D2ds_v5"),
OsType: ptr.To(string(asocontainerservicev1.OSType_Linux)),
OsDiskSizeGB: ptr.To(100),
Count: ptr.To(2),
Expand Down Expand Up @@ -68,7 +68,7 @@ func Test_AgentPoolToManagedClusterAgentPoolProfile(t *testing.T) {
expect: func(g *GomegaWithT, result asocontainerservicev1hub.ManagedClusterAgentPoolProfile) {
g.Expect(result).To(Equal(asocontainerservicev1hub.ManagedClusterAgentPoolProfile{
Name: ptr.To("agentpool1"),
VmSize: ptr.To("Standard_D2s_v3"),
VmSize: ptr.To("Standard_D2ds_v5"),
OsType: ptr.To(string(asocontainerservicev1.OSType_Linux)),
OsDiskSizeGB: ptr.To(100),
Count: ptr.To(2),
Expand Down
4 changes: 2 additions & 2 deletions azure/scope/machine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,7 +1933,7 @@ func TestMachineScope_NICSpecs(t *testing.T) {
},
cache: &MachineCache{
VMSKU: resourceskus.SKU{
Name: ptr.To("Standard_D2v2"),
Name: ptr.To("Standard_D2ds_v5"),
},
},
},
Expand All @@ -1959,7 +1959,7 @@ func TestMachineScope_NICSpecs(t *testing.T) {
IPv6Enabled: false,
EnableIPForwarding: false,
SKU: &resourceskus.SKU{
Name: ptr.To("Standard_D2v2"),
Name: ptr.To("Standard_D2ds_v5"),
},
ClusterName: "cluster",
AdditionalTags: infrav1.Tags{
Expand Down
10 changes: 5 additions & 5 deletions azure/scope/managedcontrolplane_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ func TestManagedControlPlaneScope_PoolVersion(t *testing.T) {
&agentpools.AgentPoolSpec{
Name: "pool0",
AzureName: "pool0",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Replicas: 1,
Mode: "System",
Cluster: "cluster1",
Expand Down Expand Up @@ -223,7 +223,7 @@ func TestManagedControlPlaneScope_PoolVersion(t *testing.T) {
&agentpools.AgentPoolSpec{
Name: "pool0",
AzureName: "pool0",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Mode: "System",
Replicas: 1,
Version: ptr.To("1.21.1"),
Expand Down Expand Up @@ -401,7 +401,7 @@ func TestManagedControlPlaneScope_OSType(t *testing.T) {
&agentpools.AgentPoolSpec{
Name: "pool0",
AzureName: "pool0",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Mode: "System",
Replicas: 1,
Cluster: "cluster1",
Expand All @@ -410,7 +410,7 @@ func TestManagedControlPlaneScope_OSType(t *testing.T) {
&agentpools.AgentPoolSpec{
Name: "pool1",
AzureName: "pool1",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Mode: "User",
Replicas: 1,
Cluster: "cluster1",
Expand All @@ -420,7 +420,7 @@ func TestManagedControlPlaneScope_OSType(t *testing.T) {
&agentpools.AgentPoolSpec{
Name: "pool2",
AzureName: "pool2",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Mode: "User",
Replicas: 1,
Cluster: "cluster1",
Expand Down
36 changes: 18 additions & 18 deletions azure/scope/managedmachinepool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func TestManagedMachinePoolScope_Autoscaling(t *testing.T) {

Name: "pool0",
AzureName: "pool0",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Replicas: 1,
Mode: "System",
Cluster: "cluster1",
Expand All @@ -125,7 +125,7 @@ func TestManagedMachinePoolScope_Autoscaling(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool1",
AzureName: "pool1",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Mode: "User",
Cluster: "cluster1",
Replicas: 1,
Expand Down Expand Up @@ -173,7 +173,7 @@ func TestManagedMachinePoolScope_NodeLabels(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool0",
AzureName: "pool0",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Replicas: 1,
Mode: "System",
Cluster: "cluster1",
Expand Down Expand Up @@ -202,7 +202,7 @@ func TestManagedMachinePoolScope_NodeLabels(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool1",
AzureName: "pool1",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Mode: "System",
Cluster: "cluster1",
Replicas: 1,
Expand Down Expand Up @@ -250,7 +250,7 @@ func TestManagedMachinePoolScope_AdditionalTags(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool0",
AzureName: "pool0",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Replicas: 1,
Mode: "System",
Cluster: "cluster1",
Expand Down Expand Up @@ -279,7 +279,7 @@ func TestManagedMachinePoolScope_AdditionalTags(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool1",
AzureName: "pool1",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Mode: "System",
Cluster: "cluster1",
Replicas: 1,
Expand Down Expand Up @@ -327,7 +327,7 @@ func TestManagedMachinePoolScope_MaxPods(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool0",
AzureName: "pool0",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Replicas: 1,
Mode: "System",
Cluster: "cluster1",
Expand All @@ -354,7 +354,7 @@ func TestManagedMachinePoolScope_MaxPods(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool1",
AzureName: "pool1",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Mode: "System",
Cluster: "cluster1",
Replicas: 1,
Expand Down Expand Up @@ -401,7 +401,7 @@ func TestManagedMachinePoolScope_Taints(t *testing.T) {

Name: "pool0",
AzureName: "pool0",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Replicas: 1,
Mode: "System",
Cluster: "cluster1",
Expand Down Expand Up @@ -434,7 +434,7 @@ func TestManagedMachinePoolScope_Taints(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool1",
AzureName: "pool1",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Mode: "User",
Cluster: "cluster1",
Replicas: 1,
Expand Down Expand Up @@ -480,7 +480,7 @@ func TestManagedMachinePoolScope_OSDiskType(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool0",
AzureName: "pool0",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Replicas: 1,
Mode: "System",
Cluster: "cluster1",
Expand All @@ -507,7 +507,7 @@ func TestManagedMachinePoolScope_OSDiskType(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool1",
AzureName: "pool1",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Mode: "User",
Cluster: "cluster1",
Replicas: 1,
Expand Down Expand Up @@ -553,7 +553,7 @@ func TestManagedMachinePoolScope_SubnetName(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool0",
AzureName: "pool0",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Replicas: 1,
Mode: "System",
Cluster: "cluster1",
Expand Down Expand Up @@ -589,7 +589,7 @@ func TestManagedMachinePoolScope_SubnetName(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool1",
AzureName: "pool1",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Mode: "User",
Cluster: "cluster1",
Replicas: 1,
Expand Down Expand Up @@ -625,7 +625,7 @@ func TestManagedMachinePoolScope_SubnetName(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool1",
AzureName: "pool1",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Mode: "User",
Cluster: "cluster1",
Replicas: 1,
Expand Down Expand Up @@ -671,7 +671,7 @@ func TestManagedMachinePoolScope_KubeletDiskType(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool0",
AzureName: "pool0",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Replicas: 1,
Mode: "System",
Cluster: "cluster1",
Expand All @@ -698,7 +698,7 @@ func TestManagedMachinePoolScope_KubeletDiskType(t *testing.T) {
Expected: &agentpools.AgentPoolSpec{
Name: "pool1",
AzureName: "pool1",
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Mode: "User",
Cluster: "cluster1",
Replicas: 1,
Expand Down Expand Up @@ -898,7 +898,7 @@ func getAzureMachinePool(name string, mode infrav1.NodePoolMode) *infrav1.AzureM
Spec: infrav1.AzureManagedMachinePoolSpec{
AzureManagedMachinePoolClassSpec: infrav1.AzureManagedMachinePoolClassSpec{
Mode: string(mode),
SKU: "Standard_D2s_v3",
SKU: "Standard_D2ds_v5",
Name: ptr.To(name),
},
},
Expand Down
2 changes: 1 addition & 1 deletion azure/services/networkinterfaces/spec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var (
ClusterName: "my-cluster",
}
fakeSku = resourceskus.SKU{
Name: ptr.To("Standard_D2v2"),
Name: ptr.To("Standard_D2ds_v5"),
Kind: ptr.To(string(resourceskus.VirtualMachines)),
Locations: []*string{
ptr.To("fake-location"),
Expand Down
2 changes: 1 addition & 1 deletion controllers/azuremachine_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ func getFakeAzureMachine(changes ...func(*infrav1.AzureMachine)) *infrav1.AzureM
},
},
Spec: infrav1.AzureMachineSpec{
VMSize: "Standard_D2s_v3",
VMSize: "Standard_D2ds_v5",
},
}
for _, change := range changes {
Expand Down
2 changes: 1 addition & 1 deletion controllers/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,7 @@ func newAzureManagedMachinePool(clusterName, poolName, mode string) *infrav1.Azu
Spec: infrav1.AzureManagedMachinePoolSpec{
AzureManagedMachinePoolClassSpec: infrav1.AzureManagedMachinePoolClassSpec{
Mode: mode,
SKU: "Standard_B2s",
SKU: "Standard_B2s_v2",
OSDiskSizeGB: ptr.To(512),
KubeletConfig: &infrav1.KubeletConfig{
CPUManagerPolicy: &cpuManagerPolicyStatic,
Expand Down
4 changes: 2 additions & 2 deletions docs/book/src/developers/development.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@ export AZURE_CLIENT_SECRET_B64="$(echo -n "$AZURE_CLIENT_SECRET" | base64 | tr -

# Machine settings.
export CONTROL_PLANE_MACHINE_COUNT=3
export AZURE_CONTROL_PLANE_MACHINE_TYPE="Standard_B2s"
export AZURE_NODE_MACHINE_TYPE="Standard_B2s"
export AZURE_CONTROL_PLANE_MACHINE_TYPE="Standard_B2s_v2"
export AZURE_NODE_MACHINE_TYPE="Standard_B2s_v2"
export WORKER_MACHINE_COUNT=2
export KUBERNETES_VERSION="v1.32.2"

Expand Down
4 changes: 2 additions & 2 deletions docs/book/src/developers/getting-started-with-capi-operator.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,12 @@ managedMachinePoolSpecs:
pool0:
count: 1
mode: System
vmSize: Standard_DS2_v2
vmSize: Standard_D2ds_v5
type: VirtualMachineScaleSets
pool1:
count: 1
mode: User
vmSize: Standard_DS2_v2
vmSize: Standard_D2ds_v5
type: VirtualMachineScaleSets
```

Expand Down
10 changes: 5 additions & 5 deletions docs/book/src/getting-started-with-aks.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@
--enable-oidc-issuer \
--enable-workload-identity \
--node-count 2 \
--node-vm-size Standard_B2s \
--node-vm-size Standard_B2s_v2 \
--generate-ssh-keys \
--location <region>
```

2. Retrieve Credentials for the AKS Cluster to interact with it using kubectl:
```bash
az aks get-credentials --resource-group <resource-group-name> --name <aks-cluster-name>
Expand Down Expand Up @@ -105,9 +105,9 @@ az identity federated-credential create \
Run the following command to initialize the management cluster with Cluster API Provider Azure (CAPZ):

`clusterctl init --infrastructure azure`

This command sets up the necessary components, including Cluster API Core, CAPZ, and Azure Service Operator (ASO).
View the [Cluster API Quick Start: Initialize the management cluster](https://cluster-api.sigs.k8s.io/user/quick-start.html) documentation for more detailed instructions. Ensure you select the "Azure" tabs for Azure-specific guidance.
View the [Cluster API Quick Start: Initialize the management cluster](https://cluster-api.sigs.k8s.io/user/quick-start.html) documentation for more detailed instructions. Ensure you select the "Azure" tabs for Azure-specific guidance.

7. Annotate the capz-manager service account in the capz-system namespace with the UAMI's clientId:
```bash
Expand All @@ -117,4 +117,4 @@ Run the following command to initialize the management cluster with Cluster API
```
## Building your First Cluster

To create a workload cluster, follow the [Cluster API Quick Start: Create your first workload cluster](https://cluster-api.sigs.k8s.io/user/quick-start.html) for detailed instructions. Ensure you select the "Azure" tabs for Azure-specific guidance.
To create a workload cluster, follow the [Cluster API Quick Start: Create your first workload cluster](https://cluster-api.sigs.k8s.io/user/quick-start.html) for detailed instructions. Ensure you select the "Azure" tabs for Azure-specific guidance.
6 changes: 3 additions & 3 deletions docs/book/src/managed/managedcluster.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export AZURE_SUBSCRIPTION_ID="$(cat sp.json | jq -r .subscriptionId | tr -d '\n'
export AZURE_CLIENT_SECRET="$(cat sp.json | jq -r .clientSecret | tr -d '\n')"
export AZURE_CLIENT_ID="$(cat sp.json | jq -r .clientId | tr -d '\n')"
export AZURE_TENANT_ID="$(cat sp.json | jq -r .tenantId | tr -d '\n')"
export AZURE_NODE_MACHINE_TYPE="Standard_D2s_v3"
export AZURE_NODE_MACHINE_TYPE="Standard_D2ds_v5"
export AZURE_CLUSTER_IDENTITY_SECRET_NAME="cluster-identity-secret"
export AZURE_CLUSTER_IDENTITY_SECRET_NAMESPACE="default"
export CLUSTER_IDENTITY_NAME="cluster-identity"
Expand Down Expand Up @@ -172,7 +172,7 @@ metadata:
spec:
mode: System
osDiskSizeGB: 30
sku: Standard_D2s_v3
sku: Standard_D2ds_v5
---
apiVersion: cluster.x-k8s.io/v1beta1
kind: MachinePool
Expand All @@ -198,7 +198,7 @@ metadata:
spec:
mode: User
osDiskSizeGB: 40
sku: Standard_D2s_v4
sku: Standard_D2ds_v5
```

Please note that we don't declare a configuration for the apiserver endpoint. This configuration data will be populated automatically based on the data returned from AKS API during cluster create as `.spec.controlPlaneEndpoint.Host` and `.spec.controlPlaneEndpoint.Port` in both the `AzureManagedCluster` and `AzureManagedControlPlane` resources. Any user-provided data will be ignored and overwritten by data returned from the AKS API.
Expand Down
4 changes: 2 additions & 2 deletions docs/book/src/self-managed/custom-vnet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ spec:
osType: Linux
sshPublicKey: ${YOUR_SSH_PUB_KEY}
subnetName: subnet-mp-1
vmSize: Standard_B2s
vmSize: Standard_B2s_v2
---
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: AzureMachinePool
Expand All @@ -418,7 +418,7 @@ spec:
osType: Linux
sshPublicKey: ${YOUR_SSH_PUB_KEY}
subnetName: subnet-mp-2
vmSize: Standard_B2s
vmSize: Standard_B2s_v2
```

If you don't specify any `node` subnets, one subnet with role `node` will be created and added to the `networkSpec` definition.
Loading
Loading