Make ACR Zone redundancy toggable

Azure · Feb 14, 2025 · 72e2a5c · 72e2a5c
1 parent 8079b86
commit 72e2a5c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/config/config.msft.yaml b/config/config.msft.yaml
@@ -246,7 +246,9 @@ clouds:
 
           # ACR
           svcAcrName: arohcpsvcint
+          svcAcrZoneRedundancy: Disabled
           ocpAcrName: arohcpocpint
+          ocpAcrZoneRedundancy: Disabled
 
           # Frontend
           frontend:

diff --git a/config/config.schema.json b/config/config.schema.json
@@ -769,6 +769,9 @@
       "ocpAcrName": {
         "type": "string"
       },
+      "ocpAcrZoneRedundancy": {
+        "type": "string"
+      },
       "oidcStorageAccountName": {
         "type": "string"
       },
@@ -862,6 +865,9 @@
       },
       "svcAcrName": {
         "type": "string"
+      },
+      "svcAcrZoneRedundancy": {
+        "type": "string"
       }
     },
     "additionalProperties": false,

diff --git a/dev-infrastructure/configurations/global-acr.tmpl.bicepparam b/dev-infrastructure/configurations/global-acr.tmpl.bicepparam
@@ -7,3 +7,6 @@ param ocpAcrName = '{{ .ocpAcrName }}'
 param ocpAcrSku = 'Premium'
 
 param location = '{{ .global.region }}'
+
+param svcAcrZoneRedundancy = '{{ .svcAcrZoneRedundancy }}'
+param ocpAcrZoneRedundancy = '{{ .ocpAcrZoneRedundancy }}'
diff --git a/dev-infrastructure/templates/global-acr.bicep b/dev-infrastructure/templates/global-acr.bicep
@@ -11,13 +11,16 @@ param svcAcrSku string
 
 param location string
 
+param svcAcrZoneRedundancy string = locationIsZoneRedundant(location) ? 'Enabled' : 'Disabled'
+param ocpAcrZoneRedundancy string = locationIsZoneRedundant(location) ? 'Enabled' : 'Disabled'
+
 module ocpAcr '../modules/acr/acr.bicep' = {
   name: ocpAcrName
   params: {
     acrName: ocpAcrName
     acrSku: ocpAcrSku
     location: location
-    zoneRedundancy: locationIsZoneRedundant(location) ? 'Enabled' : 'Disabled'
+    zoneRedundancy: svcAcrZoneRedundancy
   }
 }
 
@@ -27,6 +30,6 @@ module svcAcr '../modules/acr/acr.bicep' = {
     acrName: svcAcrName
     acrSku: svcAcrSku
     location: location
-    zoneRedundancy: locationIsZoneRedundant(location) ? 'Enabled' : 'Disabled'
+    zoneRedundancy: ocpAcrZoneRedundancy
   }
 }