From 3a92eee2e4a8b79145b46f0cf1d046de8ea3784e Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Thu, 25 Jul 2024 15:44:17 -0700 Subject: [PATCH 1/7] Update regions for new sub based on failures Signed-off-by: James Sturtevant --- hack/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/util.sh b/hack/util.sh index f9e124ff53c..5386d1aaba0 100755 --- a/hack/util.sh +++ b/hack/util.sh @@ -63,7 +63,7 @@ capz::util::should_build_ccm() { # all test regions must support AvailabilityZones capz::util::get_random_region() { - local REGIONS=("australiaeast" "canadacentral" "eastus" "eastus2" "northcentralus" "northeurope" "uksouth" "westeurope" "westus2") + local REGIONS=("australiaeast" "canadacentral" "germanywestcentral" "mexicocentral" "northcentralus" "northeurope" "uksouth" "switzerlandnorth" "brazilsouth") echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}" } # all regions below must have GPU availability for the chosen GPU VM SKU From 6754b61819269b93b510263c17e75b99c5181b32 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Thu, 25 Jul 2024 15:44:17 -0700 Subject: [PATCH 2/7] Update regions for new sub based on failures Signed-off-by: James Sturtevant --- hack/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/util.sh b/hack/util.sh index 5386d1aaba0..e237e3b8182 100755 --- a/hack/util.sh +++ b/hack/util.sh @@ -63,7 +63,7 @@ capz::util::should_build_ccm() { # all test regions must support AvailabilityZones capz::util::get_random_region() { - local REGIONS=("australiaeast" "canadacentral" "germanywestcentral" "mexicocentral" "northcentralus" "northeurope" "uksouth" "switzerlandnorth" "brazilsouth") + local REGIONS=("australiaeast" "brazilsouth" "canadacentral" "germanywestcentral" "mexicocentral" "northcentralus" "northeurope" "switzerlandnorth" "uksouth" ) echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}" } # all regions below must have GPU availability for the chosen GPU VM SKU From 9e33d5313c765c5211fb8020c231c576761790f8 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Fri, 26 Jul 2024 11:05:34 -0700 Subject: [PATCH 3/7] Update to newer version sku's that are same 'size' We've been seen alot of failures with the Standard_D2s_v3 so trying out going to a new sku version that might be more avaliable in regions Signed-off-by: James Sturtevant --- templates/test/ci/cluster-template-prow-aks-aso.yaml | 6 +++--- .../test/ci/cluster-template-prow-aks-clusterclass.yaml | 4 ++-- templates/test/ci/cluster-template-prow-aks.yaml | 6 +++--- templates/test/ci/prow-aks-aso/kustomization.yaml | 2 +- templates/test/ci/prow-aks-aso/patches/aks-pool2.yaml | 2 +- .../patches/aks-clusterclass-pool0.yaml | 2 +- .../patches/aks-clusterclass-pool1.yaml | 2 +- templates/test/ci/prow-aks/patches/aks-pool0.yaml | 2 +- templates/test/ci/prow-aks/patches/aks-pool1.yaml | 2 +- templates/test/ci/prow-aks/patches/aks-pool2.yaml | 2 +- test/e2e/aks_spot.go | 2 +- test/e2e/azure_test.go | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/templates/test/ci/cluster-template-prow-aks-aso.yaml b/templates/test/ci/cluster-template-prow-aks-aso.yaml index cfea8653ed4..37a25eb547d 100644 --- a/templates/test/ci/cluster-template-prow-aks-aso.yaml +++ b/templates/test/ci/cluster-template-prow-aks-aso.yaml @@ -105,7 +105,7 @@ spec: owner: name: ${CLUSTER_NAME} type: VirtualMachineScaleSets - vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} + vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachinePool @@ -146,7 +146,7 @@ spec: owner: name: ${CLUSTER_NAME} type: VirtualMachineScaleSets - vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} + vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachinePool @@ -188,4 +188,4 @@ spec: owner: name: ${CLUSTER_NAME} type: VirtualMachineScaleSets - vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} + vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} diff --git a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml index 22a9952ad6d..df9d0770c1a 100644 --- a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml +++ b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml @@ -116,7 +116,7 @@ spec: name: pool0 osDiskSizeGB: 30 osDiskType: Managed - sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} + sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: AzureManagedMachinePoolTemplate @@ -181,7 +181,7 @@ spec: osDiskSizeGB: 40 osDiskType: Ephemeral scaleSetPriority: Regular - sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} + sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} taints: - effect: NoSchedule key: type diff --git a/templates/test/ci/cluster-template-prow-aks.yaml b/templates/test/ci/cluster-template-prow-aks.yaml index c145187bb0f..e1bb891dc6f 100644 --- a/templates/test/ci/cluster-template-prow-aks.yaml +++ b/templates/test/ci/cluster-template-prow-aks.yaml @@ -86,7 +86,7 @@ spec: name: pool0 osDiskSizeGB: 30 osDiskType: Managed - sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} + sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachinePool @@ -169,7 +169,7 @@ spec: osDiskSizeGB: 40 osDiskType: Ephemeral scaleSetPriority: Regular - sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} + sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} taints: - effect: NoSchedule key: type @@ -217,4 +217,4 @@ spec: mode: User name: pool2 osType: Windows - sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} + sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} diff --git a/templates/test/ci/prow-aks-aso/kustomization.yaml b/templates/test/ci/prow-aks-aso/kustomization.yaml index 517448bc8be..8137c23eeff 100644 --- 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_D2s_v3}" + value: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}" 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 index a12346f24a2..592e34d5fb0 100644 --- 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_D2s_v3}" + vmSize: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}" 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 index 0c7b26b42bf..e7c8070c97a 100644 --- a/templates/test/ci/prow-aks-clusterclass/patches/aks-clusterclass-pool0.yaml +++ b/templates/test/ci/prow-aks-clusterclass/patches/aks-clusterclass-pool0.yaml @@ -12,4 +12,4 @@ spec: enableUltraSSD: true availabilityZones: ["1", "2"] name: pool0 - sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}" + sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}" 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 index f2ca9d23329..9d718473ae9 100644 --- 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_D2s_v3}" + sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}" 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 index aa6a17bdea6..ce90bb970c8 100644 --- a/templates/test/ci/prow-aks/patches/aks-pool0.yaml +++ b/templates/test/ci/prow-aks/patches/aks-pool0.yaml @@ -10,4 +10,4 @@ spec: enableUltraSSD: true availabilityZones: ["1", "2"] name: pool0 - sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}" + sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}" diff --git a/templates/test/ci/prow-aks/patches/aks-pool1.yaml b/templates/test/ci/prow-aks/patches/aks-pool1.yaml index e0b6ca8f580..e5dbe5430a9 100644 --- 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_D2s_v3}" + sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}" 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 index 36d78db72a1..781786bd384 100644 --- 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_D2s_v3}" + sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}" osType: Windows name: pool2 diff --git a/test/e2e/aks_spot.go b/test/e2e/aks_spot.go index 5f35e561104..74adefc5d3d 100644 --- 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_D2s_v3", + SKU: "Standard_D2ds_v5", ScaleSetPriority: ptr.To(string(armcontainerservice.ScaleSetPrioritySpot)), Scaling: &scaling, SpotMaxPrice: &spotMaxPrice, diff --git a/test/e2e/azure_test.go b/test/e2e/azure_test.go index d60fd75d88e..b282cbf4538 100644 --- 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_D2s_v3` by setting the + // You can override the default SKU `Standard_D2ds_v5` 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() { From b0385559f488dc51d27bc2140b1b653068ab6292 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Fri, 26 Jul 2024 11:20:01 -0700 Subject: [PATCH 4/7] mexico central doesn't suppor storage types we use Signed-off-by: James Sturtevant --- hack/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/util.sh b/hack/util.sh index e237e3b8182..7525e859f64 100755 --- a/hack/util.sh +++ b/hack/util.sh @@ -63,7 +63,7 @@ capz::util::should_build_ccm() { # all test regions must support AvailabilityZones capz::util::get_random_region() { - local REGIONS=("australiaeast" "brazilsouth" "canadacentral" "germanywestcentral" "mexicocentral" "northcentralus" "northeurope" "switzerlandnorth" "uksouth" ) + local REGIONS=("australiaeast" "brazilsouth" "canadacentral" "eastus2" "germanywestcentral" "northcentralus" "northeurope" "switzerlandnorth" "uksouth" ) echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}" } # all regions below must have GPU availability for the chosen GPU VM SKU From 31575edd20f48d645f6343ec831d9c137178ff05 Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Mon, 29 Jul 2024 20:30:36 +0000 Subject: [PATCH 5/7] update regions --- hack/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/util.sh b/hack/util.sh index 7525e859f64..32c219129e7 100755 --- a/hack/util.sh +++ b/hack/util.sh @@ -63,7 +63,7 @@ capz::util::should_build_ccm() { # all test regions must support AvailabilityZones capz::util::get_random_region() { - local REGIONS=("australiaeast" "brazilsouth" "canadacentral" "eastus2" "germanywestcentral" "northcentralus" "northeurope" "switzerlandnorth" "uksouth" ) + local REGIONS=("australiaeast" "canadacentral" "francecentral" "germanywestcentral" "northeurope" "switzerlandnorth" "uksouth" ) echo "${REGIONS[${RANDOM} % ${#REGIONS[@]}]}" } # all regions below must have GPU availability for the chosen GPU VM SKU From 2ffb530e9823a022a53c6e7e21ad0734560717eb Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Mon, 29 Jul 2024 20:33:30 +0000 Subject: [PATCH 6/7] remove UltraSSD from AKS e2e templates --- templates/test/ci/cluster-template-prow-aks-clusterclass.yaml | 1 - templates/test/ci/cluster-template-prow-aks.yaml | 1 - .../ci/prow-aks-clusterclass/patches/aks-clusterclass-pool0.yaml | 1 - templates/test/ci/prow-aks/patches/aks-pool0.yaml | 1 - 4 files changed, 4 deletions(-) diff --git a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml index df9d0770c1a..a91c0dd4657 100644 --- a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml +++ b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml @@ -110,7 +110,6 @@ spec: - "1" - "2" enableNodePublicIP: false - enableUltraSSD: true maxPods: 30 mode: System name: pool0 diff --git a/templates/test/ci/cluster-template-prow-aks.yaml b/templates/test/ci/cluster-template-prow-aks.yaml index e1bb891dc6f..2a4014c5e5a 100644 --- a/templates/test/ci/cluster-template-prow-aks.yaml +++ b/templates/test/ci/cluster-template-prow-aks.yaml @@ -80,7 +80,6 @@ spec: - "1" - "2" enableNodePublicIP: false - enableUltraSSD: true maxPods: 30 mode: System name: pool0 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 index e7c8070c97a..6d7dcadd736 100644 --- a/templates/test/ci/prow-aks-clusterclass/patches/aks-clusterclass-pool0.yaml +++ b/templates/test/ci/prow-aks-clusterclass/patches/aks-clusterclass-pool0.yaml @@ -9,7 +9,6 @@ spec: osDiskType: "Managed" osDiskSizeGB: 30 enableNodePublicIP: false - enableUltraSSD: true availabilityZones: ["1", "2"] name: pool0 sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}" diff --git a/templates/test/ci/prow-aks/patches/aks-pool0.yaml b/templates/test/ci/prow-aks/patches/aks-pool0.yaml index ce90bb970c8..aeccdec0833 100644 --- a/templates/test/ci/prow-aks/patches/aks-pool0.yaml +++ b/templates/test/ci/prow-aks/patches/aks-pool0.yaml @@ -7,7 +7,6 @@ spec: osDiskType: "Managed" osDiskSizeGB: 30 enableNodePublicIP: false - enableUltraSSD: true availabilityZones: ["1", "2"] name: pool0 sku: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5}" From 9bedf0835112eaa4b73da85d8b12bbe361c9e123 Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Mon, 29 Jul 2024 20:39:06 +0000 Subject: [PATCH 7/7] revert SKU to Standard_D2s_v3 --- templates/test/ci/cluster-template-prow-aks-aso.yaml | 6 +++--- .../test/ci/cluster-template-prow-aks-clusterclass.yaml | 4 ++-- templates/test/ci/cluster-template-prow-aks.yaml | 6 +++--- templates/test/ci/prow-aks-aso/kustomization.yaml | 2 +- templates/test/ci/prow-aks-aso/patches/aks-pool2.yaml | 2 +- .../patches/aks-clusterclass-pool0.yaml | 2 +- .../patches/aks-clusterclass-pool1.yaml | 2 +- templates/test/ci/prow-aks/patches/aks-pool0.yaml | 2 +- templates/test/ci/prow-aks/patches/aks-pool1.yaml | 2 +- templates/test/ci/prow-aks/patches/aks-pool2.yaml | 2 +- test/e2e/aks_spot.go | 2 +- test/e2e/azure_test.go | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/templates/test/ci/cluster-template-prow-aks-aso.yaml b/templates/test/ci/cluster-template-prow-aks-aso.yaml index 37a25eb547d..cfea8653ed4 100644 --- a/templates/test/ci/cluster-template-prow-aks-aso.yaml +++ b/templates/test/ci/cluster-template-prow-aks-aso.yaml @@ -105,7 +105,7 @@ spec: owner: name: ${CLUSTER_NAME} type: VirtualMachineScaleSets - vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} + vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachinePool @@ -146,7 +146,7 @@ spec: owner: name: ${CLUSTER_NAME} type: VirtualMachineScaleSets - vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} + vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachinePool @@ -188,4 +188,4 @@ spec: owner: name: ${CLUSTER_NAME} type: VirtualMachineScaleSets - vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} + vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} diff --git a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml index a91c0dd4657..c0a3e993ba5 100644 --- a/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml +++ b/templates/test/ci/cluster-template-prow-aks-clusterclass.yaml @@ -115,7 +115,7 @@ spec: name: pool0 osDiskSizeGB: 30 osDiskType: Managed - sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} + sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: AzureManagedMachinePoolTemplate @@ -180,7 +180,7 @@ spec: osDiskSizeGB: 40 osDiskType: Ephemeral scaleSetPriority: Regular - sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} + sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} taints: - effect: NoSchedule key: type diff --git a/templates/test/ci/cluster-template-prow-aks.yaml b/templates/test/ci/cluster-template-prow-aks.yaml index 2a4014c5e5a..207ec1e1b0b 100644 --- a/templates/test/ci/cluster-template-prow-aks.yaml +++ b/templates/test/ci/cluster-template-prow-aks.yaml @@ -85,7 +85,7 @@ spec: name: pool0 osDiskSizeGB: 30 osDiskType: Managed - sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} + sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachinePool @@ -168,7 +168,7 @@ spec: osDiskSizeGB: 40 osDiskType: Ephemeral scaleSetPriority: Regular - sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2ds_v5} + sku: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3} taints: - effect: NoSchedule key: type @@ -216,4 +216,4 @@ spec: mode: User name: pool2 osType: Windows - 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-aso/kustomization.yaml b/templates/test/ci/prow-aks-aso/kustomization.yaml index 8137c23eeff..517448bc8be 100644 --- 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 index 592e34d5fb0..a12346f24a2 100644 --- 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 index 6d7dcadd736..3795991975b 100644 --- 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 index 9d718473ae9..f2ca9d23329 100644 --- 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 index aeccdec0833..19cfaa220d6 100644 --- 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 index e5dbe5430a9..e0b6ca8f580 100644 --- 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 index 781786bd384..36d78db72a1 100644 --- 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 index 74adefc5d3d..5f35e561104 100644 --- 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 index b282cbf4538..d60fd75d88e 100644 --- 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() {