Clean up other SKU types

Author: mboersma

api/v1beta1/azuremanagedmachinepooltemplate_webhook_test.go

@@ -102,7 +102,7 @@ func TestManagedMachinePoolTemplateUpdateWebhook(t *testing.T) {
 				ammpt.Spec.Template.Spec.SKU = "Standard_D2s_v5"
 			}),
 			machinePoolTemplate: getAzureManagedMachinePoolTemplate(func(ammpt *AzureManagedMachinePoolTemplate) {
-				ammpt.Spec.Template.Spec.SKU = "Standard_D4s_v3"
+				ammpt.Spec.Template.Spec.SKU = "Standard_D4s_v5"
 			}),
 			wantErr: true,
 		},

azure/scope/machine_test.go

@@ -1933,7 +1933,7 @@ func TestMachineScope_NICSpecs(t *testing.T) {
 				},
 				cache: &MachineCache{
 					VMSKU: resourceskus.SKU{
-						Name: ptr.To("Standard_D2v2"),
+						Name: ptr.To("Standard_D2s_v5"),
 					},
 				},
 			},
@@ -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_D2s_v5"),
 					},
 					ClusterName: "cluster",
 					AdditionalTags: infrav1.Tags{

azure/services/networkinterfaces/spec_test.go

@@ -43,7 +43,7 @@ var (
 		ClusterName:           "my-cluster",
 	}
 	fakeSku = resourceskus.SKU{
-		Name: ptr.To("Standard_D2v2"),
+		Name: ptr.To("Standard_D2s_v5"),
 		Kind: ptr.To(string(resourceskus.VirtualMachines)),
 		Locations: []*string{
 			ptr.To("fake-location"),

docs/book/src/developers/getting-started-with-capi-operator.md

@@ -166,12 +166,12 @@ managedMachinePoolSpecs:
   pool0:
     count: 1
     mode: System
-    vmSize: Standard_DS2_v2
+    vmSize: Standard_D2s_v5
     type: VirtualMachineScaleSets
   pool1:
     count: 1
     mode: User
-    vmSize: Standard_DS2_v2
+    vmSize: Standard_D2s_v5
     type: VirtualMachineScaleSets
 ```
 

docs/book/src/managed/managedcluster.md

@@ -198,7 +198,7 @@ metadata:
 spec:
   mode: User
   osDiskSizeGB: 40
-  sku: Standard_D2s_v4
+  sku: Standard_D2s_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.

templates/test/ci/cluster-template-prow-edgezone.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   template:
     spec:
-      vmSize: ${AZURE_EDGEZONE_CONTROL_PLANE_MACHINE_TYPE:=Standard_DS2_v2}
+      vmSize: ${AZURE_EDGEZONE_CONTROL_PLANE_MACHINE_TYPE:=Standard_D2s_v5}
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: AzureMachineTemplate
@@ -16,4 +16,4 @@ metadata:
 spec:
   template:
     spec:
-      vmSize: ${AZURE_EDGEZONE_NODE_MACHINE_TYPE:=Standard_DS4_v2}
+      vmSize: ${AZURE_EDGEZONE_NODE_MACHINE_TYPE:=Standard_D4s_v5}

templates/test/ci/cluster-template-prow-spot.yaml

@@ -5,7 +5,7 @@ metadata:
 spec:
   template:
     spec:
-      vmSize: "Standard_B2s_v2_v2"
+      vmSize: "Standard_B2s_v2"
       spotVMOptions:
         maxPrice: 1000
         evictionPolicy: "Delete"

templates/test/ci/prow-edgezone/patches/machine-type.yaml

@@ -1198,7 +1198,7 @@ var _ = Describe("Workload cluster creation", func() {
 	// ci-e2e.sh and Prow CI skip this test by default. To include this test, set `GINKGO_SKIP=""`.
 	// This spec expects a user-assigned identity named "cloud-provider-user-identity" in a "capz-ci"
 	// resource group. Override these defaults by setting the USER_IDENTITY and CI_RG environment variables.
-	// You can also override the default SKU `Standard_DS2_v2` and `Standard_DS4_v2` storage by setting
+	// You can also override the default SKU `Standard_D2s_v5` and `Standard_D4s_v5` SKUs by setting
 	// the `AZURE_EDGEZONE_CONTROL_PLANE_MACHINE_TYPE` and `AZURE_EDGEZONE_NODE_MACHINE_TYPE` environment variables.
 	Context("Creating clusters on public MEC [OPTIONAL]", func() {
 		It("with 1 control plane nodes and 1 worker node", func() {