Hypershift AKS: spread NP across AZs

Signed-off-by: Feilian Xie <fxie@redhat.com>
openshift · Oct 22, 2024 · 0f9aaa3 · 0f9aaa3
1 parent 79563f1
commit 0f9aaa3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/...provision/cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet-provision-chain.yaml b/...provision/cucushift-installer-rehearse-azure-aks-hypershift-byo-vnet-provision-chain.yaml
@@ -45,6 +45,8 @@ chain:
     default: "false"
   - name: HYPERSHIFT_EXTERNAL_DNS_DOMAIN
     default: "qe1.azure.devcluster.openshift.com"
+  - name: HYPERSHIFT_HC_ZONES
+    default: "1,2,3"
   - name: HYPERSHIFT_INFRA_AVAILABILITY_POLICY
     default: "HighlyAvailable"
   - name: HYPERSHIFT_MANAGED_SERVICE

diff --git a/...hift-installer-rehearse-azure-aks-hypershift-disaster-recovery-infra-provision-chain.yaml b/...hift-installer-rehearse-azure-aks-hypershift-disaster-recovery-infra-provision-chain.yaml
@@ -29,6 +29,8 @@ chain:
     default: "false"
   - name: HYPERSHIFT_EXTERNAL_DNS_DOMAIN
     default: "qe1.azure.devcluster.openshift.com"
+  - name: HYPERSHIFT_HC_ZONES
+    default: "1,2,3"
   - name: HYPERSHIFT_INFRA_AVAILABILITY_POLICY
     default: "HighlyAvailable"
   - name: HYPERSHIFT_MANAGED_SERVICE

diff --git a/...cucushift-installer-rehearse-azure-aks-hypershift-registry-overrides-provision-chain.yaml b/...cucushift-installer-rehearse-azure-aks-hypershift-registry-overrides-provision-chain.yaml
@@ -30,6 +30,8 @@ chain:
     default: "false"
   - name: HYPERSHIFT_EXTERNAL_DNS_DOMAIN
     default: "qe1.azure.devcluster.openshift.com"
+  - name: HYPERSHIFT_HC_ZONES
+    default: "1,2,3"
   - name: HYPERSHIFT_INFRA_AVAILABILITY_POLICY
     default: "HighlyAvailable"
   - name: HYPERSHIFT_MANAGED_SERVICE

diff --git a/ci-operator/step-registry/hypershift/azure/create/hypershift-azure-create-chain.yaml b/ci-operator/step-registry/hypershift/azure/create/hypershift-azure-create-chain.yaml
@@ -18,6 +18,12 @@ chain:
       documentation: |-
         Specifies the Azure location of the cluster. If intentionally left as an empty string, 
         it defaults to that of the management cluster.
+    - name: HYPERSHIFT_HC_ZONES
+      default: ""
+      documentation: |-
+        The availability zones in which NodePools will be created. 
+        Must be left unspecified if the region does not support AZs. 
+        If set, one nodepool per zone will be created.
     - name: HYPERSHIFT_EXTERNAL_DNS_DOMAIN
       default: ""
       documentation: "Specifies the external DNS domain. If left empty, external DNS is assumed to be disabled."
@@ -180,6 +186,10 @@ chain:
         EXTRA_ARGS+=" --infra-availability-policy=${HYPERSHIFT_INFRA_AVAILABILITY_POLICY}"
       fi
       
+      if [[ -n $HYPERSHIFT_HC_ZONES ]]; then
+        EXTRA_ARGS+=" --availability-zones=${HYPERSHIFT_HC_ZONES}"
+      fi
+      
       if [[ $HYPERSHIFT_NP_AUTOREPAIR == "true" ]]; then
         EXTRA_ARGS+=" --auto-repair"
       fi