Update to Standard_B2s_v2 SKU for testing

mboersma · mboersma · commit 93f187e78eda · 2025-12-09T10:10:57.000-07:00
diff --git a/Tiltfile b/Tiltfile
@@ -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",
 }
 
diff --git a/controllers/helpers_test.go b/controllers/helpers_test.go
@@ -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,
diff --git a/docs/book/src/developers/development.md b/docs/book/src/developers/development.md
@@ -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"
 
diff --git a/docs/book/src/getting-started-with-aks.md b/docs/book/src/getting-started-with-aks.md
@@ -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>
@@ -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
@@ -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.
diff --git a/docs/book/src/self-managed/custom-vnet.md b/docs/book/src/self-managed/custom-vnet.md
@@ -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
@@ -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.
diff --git a/docs/book/src/self-managed/failure-domains.md b/docs/book/src/self-managed/failure-domains.md
@@ -189,7 +189,7 @@ spec:
     osDisk:
       diskSizeGB: 30
       osType: Linux
-    vmSize: Standard_B2s
+    vmSize: Standard_B2s_v2
 ```
 
 ## Availability sets when there are no failure domains
diff --git a/docs/book/src/self-managed/gpu.md b/docs/book/src/self-managed/gpu.md
@@ -24,7 +24,7 @@ workload cluster.
 Remember to use the `nvidia-gpu` flavor with N-series nodes.
 
 ```bash
-AZURE_CONTROL_PLANE_MACHINE_TYPE=Standard_B2s \
+AZURE_CONTROL_PLANE_MACHINE_TYPE=Standard_B2s_v2 \
 AZURE_NODE_MACHINE_TYPE=Standard_NC6s_v3 \
 AZURE_LOCATION=southcentralus \
 clusterctl generate cluster azure-gpu \
diff --git a/docs/book/src/self-managed/spot-vms.md b/docs/book/src/self-managed/spot-vms.md
@@ -32,7 +32,7 @@ spec:
         storageAccountType: Premium_LRS
       osType: Linux
     sshPublicKey: ${YOUR_SSH_PUB_KEY}
-    vmSize: Standard_B2s
+    vmSize: Standard_B2s_v2
     spotVMOptions: {}
 ```
 
@@ -76,6 +76,6 @@ spec:
         storageAccountType: Premium_LRS
       osType: Linux
     sshPublicKey: ${YOUR_SSH_PUB_KEY}
-    vmSize: Standard_B2s
+    vmSize: Standard_B2s_v2
     spotVMOptions: {}
 ```
diff --git a/docs/book/src/self-managed/trusted-launch-for-vms.md b/docs/book/src/self-managed/trusted-launch-for-vms.md
@@ -35,7 +35,7 @@ ManagedImageSharedImageGalleryId: /subscriptions/01234567-89ab-cdef-0123-4567890
 
 ## Example
 
-The below example shows how to deploy a cluster with control-plane nodes that have SecureBoot and vTPM enabled. Make sure to choose a supported generation 2 VM size (e.g. `Standard_B2s`) and OS (e.g. Ubuntu Server 22.04 LTS).
+The below example shows how to deploy a cluster with control-plane nodes that have SecureBoot and vTPM enabled. Make sure to choose a supported generation 2 VM size (e.g. `Standard_B2s_v2`) and OS (e.g. Ubuntu Server 22.04 LTS).
 NOTE: the same can be applied to worker nodes
 
 ```yaml
@@ -61,5 +61,5 @@ spec:
       osDisk:
         diskSizeGB: 128
         osType: "Linux"
-      vmSize: "Standard_B2s"
+      vmSize: "Standard_B2s_v2"
 ```
diff --git a/docs/book/src/topics/workload-identity.md b/docs/book/src/topics/workload-identity.md
@@ -98,8 +98,8 @@ to give the identity Contributor access to the Azure subscription where the work
   # This is the client ID of the AAD app or user-assigned identity that you used to created the federated identity.
   export AZURE_CLIENT_ID=<your-azure-client-id>
   export AZURE_TENANT_ID=<your-azure-tenant-id>
-  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 AZURE_LOCATION="eastus"
 
   # Identity secret. Though these are not used in workload identity, we still
diff --git a/hack/create-dev-cluster.sh b/hack/create-dev-cluster.sh
@@ -50,8 +50,8 @@ export AZURE_SUBSCRIPTION_ID_B64 AZURE_TENANT_ID_B64 AZURE_CLIENT_ID_B64
 
 # Machine settings.
 export CONTROL_PLANE_MACHINE_COUNT=${CONTROL_PLANE_MACHINE_COUNT:-3}
-export AZURE_CONTROL_PLANE_MACHINE_TYPE="${CONTROL_PLANE_MACHINE_TYPE:-Standard_B2s}"
-export AZURE_NODE_MACHINE_TYPE="${NODE_MACHINE_TYPE:-Standard_B2s}"
+export AZURE_CONTROL_PLANE_MACHINE_TYPE="${CONTROL_PLANE_MACHINE_TYPE:-Standard_B2s_v2}"
+export AZURE_NODE_MACHINE_TYPE="${NODE_MACHINE_TYPE:-Standard_B2s_v2}"
 export WORKER_MACHINE_COUNT=${WORKER_MACHINE_COUNT:-2}
 export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.32.2}"
 export CLUSTER_TEMPLATE="${CLUSTER_TEMPLATE:-cluster-template.yaml}"
diff --git a/scripts/aks-as-mgmt.sh b/scripts/aks-as-mgmt.sh
@@ -28,7 +28,7 @@ export AKS_RESOURCE_GROUP="${AKS_RESOURCE_GROUP:-"${MGMT_CLUSTER_NAME}"}" # reso
 export AKS_NODE_RESOURCE_GROUP="${AKS_RESOURCE_GROUP}-nodes"
 export AKS_MGMT_KUBERNETES_VERSION="${AKS_MGMT_KUBERNETES_VERSION:-v1.33.2}"
 export AZURE_LOCATION="${AZURE_LOCATION:-westus2}"
-export AKS_NODE_VM_SIZE="${AKS_NODE_VM_SIZE:-"Standard_B2s"}"
+export AKS_NODE_VM_SIZE="${AKS_NODE_VM_SIZE:-"Standard_B2s_v2"}"
 export AKS_NODE_COUNT="${AKS_NODE_COUNT:-2}"
 export MGMT_CLUSTER_KUBECONFIG="${MGMT_CLUSTER_KUBECONFIG:-$REPO_ROOT/aks-mgmt.config}"
 export AZURE_IDENTITY_ID_FILEPATH="${AZURE_IDENTITY_ID_FILEPATH:-$REPO_ROOT/azure_identity_id}"
@@ -186,18 +186,18 @@ create_aks_cluster() {
     export USER_IDENTITY
 
     echo "assigning user-assigned managed identity to the AKS cluster"
-    
+
     # Wait for any ongoing cluster operations to complete before proceeding
     echo "waiting for cluster to be in a ready state"
     az aks wait --resource-group "${AKS_RESOURCE_GROUP}" --name "${MGMT_CLUSTER_NAME}" --created --timeout 600 --only-show-errors
-    
+
     # Temporarily mitigate PDB issues by scaling up metrics-server before the update
     echo "temporarily scaling up metrics-server to avoid PDB drain issues"
     kubectl scale deployment metrics-server --replicas=3 -n kube-system || true
-    
+
     # Wait a moment for the pods to be scheduled
     sleep 15
-    
+
     # Retry the managed identity assignment with exponential backoff
     retry_count=0
     max_retries=5
@@ -215,13 +215,13 @@ create_aks_cluster() {
         kubectl scale deployment metrics-server --replicas=2 -n kube-system || true
         exit 1
       fi
-      
+
       # Exponential backoff with jitter: base_sleep * (2^retry_count) + random(0-10)
       sleep_time=$((base_sleep * (1 << retry_count) + RANDOM % 11))
       echo "Attempt $retry_count failed, retrying in $sleep_time seconds..."
       sleep $sleep_time
     done
-    
+
     # Restore original metrics-server replica count
     echo "restoring metrics-server to original replica count"
     kubectl scale deployment metrics-server --replicas=2 -n kube-system || true
diff --git a/scripts/ci-conformance.sh b/scripts/ci-conformance.sh
@@ -79,8 +79,8 @@ fi
 # Less likely with GPU scenarios but FYI.
 export AZURE_LOCATION_GPU="${AZURE_LOCATION_GPU:-$(capz::util::get_random_region_gpu)}"
 export AZURE_LOCATION_EDGEZONE="${AZURE_LOCATION_EDGEZONE:-$(capz::util::get_random_region_edgezone)}"
-export AZURE_CONTROL_PLANE_MACHINE_TYPE="${AZURE_CONTROL_PLANE_MACHINE_TYPE:-"Standard_B2s"}"
-export AZURE_NODE_MACHINE_TYPE="${AZURE_NODE_MACHINE_TYPE:-"Standard_B2s"}"
+export AZURE_CONTROL_PLANE_MACHINE_TYPE="${AZURE_CONTROL_PLANE_MACHINE_TYPE:-"Standard_B2s_v2"}"
+export AZURE_NODE_MACHINE_TYPE="${AZURE_NODE_MACHINE_TYPE:-"Standard_B2s_v2"}"
 export WINDOWS="${WINDOWS:-false}"
 export WINDOWS_SERVER_VERSION="${WINDOWS_SERVER_VERSION:-windows-2022}"
 AZWI_RESOURCE_GROUP="${AZWI_RESOURCE_GROUP:-capz-wi-$(capz::util::random_suffix)}"
diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh
@@ -66,8 +66,8 @@ export GINKGO_NODES=10
 export AZURE_LOCATION="${AZURE_LOCATION:-$(capz::util::get_random_region)}"
 export AZURE_LOCATION_GPU="${AZURE_LOCATION_GPU:-$(capz::util::get_random_region_gpu)}"
 export AZURE_LOCATION_EDGEZONE="${AZURE_LOCATION_EDGEZONE:-$(capz::util::get_random_region_edgezone)}"
-export AZURE_CONTROL_PLANE_MACHINE_TYPE="${AZURE_CONTROL_PLANE_MACHINE_TYPE:-"Standard_B2s"}"
-export AZURE_NODE_MACHINE_TYPE="${AZURE_NODE_MACHINE_TYPE:-"Standard_B2s"}"
+export AZURE_CONTROL_PLANE_MACHINE_TYPE="${AZURE_CONTROL_PLANE_MACHINE_TYPE:-"Standard_B2s_v2"}"
+export AZURE_NODE_MACHINE_TYPE="${AZURE_NODE_MACHINE_TYPE:-"Standard_B2s_v2"}"
 CALICO_VERSION=$(make get-calico-version)
 export CALICO_VERSION
 AZWI_RESOURCE_GROUP="${AZWI_RESOURCE_GROUP:-capz-wi-$(capz::util::random_suffix)}"
diff --git a/templates/flavors/README.md b/templates/flavors/README.md
@@ -67,9 +67,9 @@ worker-templates:
     AZURE_RESOURCE_GROUP: test-resource-group-name
     CONTROL_PLANE_MACHINE_COUNT: "1"
     KUBERNETES_VERSION: v1.32.2
-    AZURE_CONTROL_PLANE_MACHINE_TYPE: Standard_B2s
+    AZURE_CONTROL_PLANE_MACHINE_TYPE: Standard_B2s_v2
     WORKER_MACHINE_COUNT: "2"
-    AZURE_NODE_MACHINE_TYPE: Standard_B2s
+    AZURE_NODE_MACHINE_TYPE: Standard_B2s_v2
 ```
 
 Here is a practical example: creating a GPU-enabled cluster requires N-series nodes. You can set an
@@ -86,7 +86,7 @@ worker-templates:
     nvidia-gpu:
       AZURE_NODE_MACHINE_TYPE: Standard_NC6s_v3
   metadata:
-    AZURE_CONTROL_PLANE_MACHINE_TYPE: Standard_B2s
+    AZURE_CONTROL_PLANE_MACHINE_TYPE: Standard_B2s_v2
     AZURE_LOCATION: southcentralus
     KUBERNETES_VERSION: v1.32.2
     WORKER_MACHINE_COUNT: "1"
diff --git a/templates/test/ci/cluster-template-prow-clusterclass-ci-default.yaml b/templates/test/ci/cluster-template-prow-clusterclass-ci-default.yaml
diff --git a/templates/test/ci/cluster-template-prow-clusterclass-ci-rke2.yaml b/templates/test/ci/cluster-template-prow-clusterclass-ci-rke2.yaml
diff --git a/templates/test/ci/cluster-template-prow-spot.yaml b/templates/test/ci/cluster-template-prow-spot.yaml
diff --git a/templates/test/ci/prow-clusterclass-ci-default/variables.yaml b/templates/test/ci/prow-clusterclass-ci-default/variables.yaml
@@ -49,19 +49,19 @@ spec:
       schema:
         openAPIV3Schema:
           type: string
-          default: Standard_B2s
+          default: Standard_B2s_v2
     - name: workerMachineType
       required: false
       schema:
         openAPIV3Schema:
           type: string
-          default: Standard_B2s
+          default: Standard_B2s_v2
     - name: workerMachineTypeWin
       required: false
       schema:
         openAPIV3Schema:
           type: string
-          default: Standard_B2s
+          default: Standard_B2s_v2
     - name: sshPublicKey
       required: true
       schema:
diff --git a/templates/test/ci/prow-clusterclass-ci-rke2/variables.yaml b/templates/test/ci/prow-clusterclass-ci-rke2/variables.yaml
@@ -49,13 +49,13 @@ spec:
       schema:
         openAPIV3Schema:
           type: string
-          default: Standard_B2s
+          default: Standard_B2s_v2
     - name: workerMachineType
       required: false
       schema:
         openAPIV3Schema:
           type: string
-          default: Standard_B2s
+          default: Standard_B2s_v2
     - name: sshPublicKey
       required: true
       schema:
diff --git a/templates/test/ci/prow-spot/patches/spot-vm-options.yaml b/templates/test/ci/prow-spot/patches/spot-vm-options.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   template:
     spec:
-      vmSize: "Standard_B2s_v2"
+      vmSize: "Standard_B2s_v2_v2"
       spotVMOptions:
         maxPrice: 1000
         evictionPolicy: "Delete"
diff --git a/test/e2e/data/availableZonesPerLocation.json b/test/e2e/data/availableZonesPerLocation.json
