revert SKU to Standard_D2s_v3

kubernetes-sigs · Jul 29, 2024 · 9bedf08 · 9bedf08
1 parent 2ffb530
commit 9bedf08
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 17 deletions.
diff --git a/templates/test/ci/cluster-template-prow-aks-aso.yaml b/templates/test/ci/cluster-template-prow-aks-aso.yaml
diff --git a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml
diff --git a/templates/test/ci/cluster-template-prow-aks.yaml b/templates/test/ci/cluster-template-prow-aks.yaml
diff --git a/templates/test/ci/prow-aks-aso/kustomization.yaml b/templates/test/ci/prow-aks-aso/kustomization.yaml
@@ -41,7 +41,7 @@ patches:
       value: ManagedClustersAgentPool
     - op: replace
       path: /spec/resources/0/spec/vmSize
-      value: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}"
+      value: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}"
   target:
     kind: AzureASOManagedMachinePool
 

diff --git a/templates/test/ci/prow-aks-aso/patches/aks-pool2.yaml b/templates/test/ci/prow-aks-aso/patches/aks-pool2.yaml
@@ -35,5 +35,5 @@ spec:
         name: ${CLUSTER_NAME}
       mode: User
       type: VirtualMachineScaleSets
-      vmSize: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}"
+      vmSize: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}"
       osType: Windows
diff --git a/templates/test/ci/prow-aks-clusterclass/patches/aks-clusterclass-pool0.yaml b/templates/test/ci/prow-aks-clusterclass/patches/aks-clusterclass-pool0.yaml
@@ -11,4 +11,4 @@ spec:
       enableNodePublicIP: false
       availabilityZones: ["1", "2"]
       name: pool0
-      sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}"
+      sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}"
diff --git a/templates/test/ci/prow-aks-clusterclass/patches/aks-clusterclass-pool1.yaml b/templates/test/ci/prow-aks-clusterclass/patches/aks-clusterclass-pool1.yaml
@@ -17,7 +17,7 @@ spec:
       nodeLabels:
         "type": "shared"
       name: pool1
-      sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}"
+      sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}"
       kubeletConfig:
         cpuManagerPolicy: "static"
         cpuCfsQuota: true

diff --git a/templates/test/ci/prow-aks/patches/aks-pool0.yaml b/templates/test/ci/prow-aks/patches/aks-pool0.yaml
@@ -9,4 +9,4 @@ spec:
   enableNodePublicIP: false
   availabilityZones: ["1", "2"]
   name: pool0
-  sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}"
+  sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}"
diff --git a/templates/test/ci/prow-aks/patches/aks-pool1.yaml b/templates/test/ci/prow-aks/patches/aks-pool1.yaml
@@ -15,7 +15,7 @@ spec:
   nodeLabels:
     "type": "shared"
   name: pool1
-  sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}"
+  sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}"
   kubeletConfig:
     cpuManagerPolicy: "static"
     cpuCfsQuota: true

diff --git a/templates/test/ci/prow-aks/patches/aks-pool2.yaml b/templates/test/ci/prow-aks/patches/aks-pool2.yaml
@@ -25,6 +25,6 @@ metadata:
   name: "${CLUSTER_NAME}-pool2"
 spec:
   mode: User
-  sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}"
+  sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}"
   osType: Windows
   name: pool2
diff --git a/test/e2e/aks_spot.go b/test/e2e/aks_spot.go
@@ -68,7 +68,7 @@ func AKSSpotSpec(ctx context.Context, inputGetter func() AKSSpotSpecInput) {
 		Spec: infrav1.AzureManagedMachinePoolSpec{
 			AzureManagedMachinePoolClassSpec: infrav1.AzureManagedMachinePoolClassSpec{
 				Mode:             "User",
-				SKU:              "Standard_D2ds_v5",
+				SKU:              "Standard_D2s_v3",
 				ScaleSetPriority: ptr.To(string(armcontainerservice.ScaleSetPrioritySpot)),
 				Scaling:          &scaling,
 				SpotMaxPrice:     &spotMaxPrice,

diff --git a/test/e2e/azure_test.go b/test/e2e/azure_test.go
@@ -673,7 +673,7 @@ var _ = Describe("Workload cluster creation", func() {
 		})
 	})
 
-	// You can override the default SKU `Standard_D2ds_v5` by setting the
+	// You can override the default SKU `Standard_D2s_v3` by setting the
 	// `AZURE_AKS_NODE_MACHINE_TYPE` environment variable.
 	Context("Creating an AKS cluster for control plane tests [Managed Kubernetes]", func() {
 		It("with a single control plane node and 1 node", func() {