From acd22a6c8ef5431801876add75dff5b99c048d46 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Fri, 12 Jun 2026 15:28:47 -0400
Subject: [PATCH] azure: use Standard v3 instance types for OCP 4.21 and older

Follow-up to the default change to Standard_D8as_v5 / Standard_D4as_v5.
Azure quota limits on the new as_v5 SKUs are being hit for older release
branches. Restore the prior s_v3 defaults for OCP 4.21 and older using
the version information already extracted in the script.

Explicit CONTROL_PLANE_INSTANCE_TYPE overrides are still honored.
COMPUTE_NODE_TYPE is only reverted when it equals the new default
(Standard_D4as_v5) to avoid clobbering intentional per-job overrides.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>

rh-pre-commit.version: 2.4.0
rh-pre-commit.check-secrets: ENABLED
---
 .../ipi/conf/azure/ipi-conf-azure-commands.sh            | 9 ++++++++-
 .../step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml | 7 +++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-commands.sh b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-commands.sh
index 01ae259a434e3..5c3c43e081ce6 100755
--- a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-commands.sh
@@ -85,7 +85,11 @@ elif [[ "${SIZE_VARIANT}" == "compact" ]]; then
 fi
 if [ -n "${master_type_prefix}" ]; then
   if [ "${OCP_ARCH}" = "amd64" ]; then
-    master_type=${master_type_prefix}as_v5
+    if ! version_gt "${version}" "4.21"; then
+      master_type=${master_type_prefix}s_v3
+    else
+      master_type=${master_type_prefix}as_v5
+    fi
   elif [ "${OCP_ARCH}" = "arm64" ]; then
     master_type=${master_type_prefix}ps_v5
   fi
@@ -93,6 +97,9 @@ fi
 if [[ -n "${CONTROL_PLANE_INSTANCE_TYPE}" ]]; then
     master_type="${CONTROL_PLANE_INSTANCE_TYPE}"
 fi
+if [ "${OCP_ARCH}" = "amd64" ] && ! version_gt "${version}" "4.21" && [[ "${COMPUTE_NODE_TYPE}" == "Standard_D4as_v5" ]]; then
+  COMPUTE_NODE_TYPE="Standard_D4s_v3"
+fi
 
 master_replicas=${CONTROL_PLANE_REPLICAS:-3}
 
diff --git a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml
index 90bd120ec33f4..f44ee352d2eb9 100644
--- a/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml
+++ b/ci-operator/step-registry/ipi/conf/azure/ipi-conf-azure-ref.yaml
@@ -29,11 +29,14 @@ ref:
     default: ""
     documentation: |-
       The instance type to use for control plane nodes.
-      When "" (default), depends on SIZE_VARIANT setting.
+      When "" (default), depends on SIZE_VARIANT and OCP version: Standard_D8as_v5 when OCP version is 4.22+,
+      Standard_D8s_v3 when OCP version is 4.21 and older (amd64 only; arm64 always uses Standard_D8ps_v5).
   - name: COMPUTE_NODE_TYPE
     default: 'Standard_D4as_v5'
     documentation: |-
-      The instance type to use for compute nodes
+      The instance type to use for compute nodes.
+      When set to the default (Standard_D4as_v5) and OCP version is 4.21 and older, the script
+      automatically substitutes Standard_D4s_v3 to stay within Azure quota limits.
   - name: COMPUTE_NODE_REPLICAS
     default: "3"
     documentation: |-