Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1326

Merged
merged 3 commits into from
Feb 14, 2025
Merged

Fix #1326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4799853
Fix
janboll Feb 14, 2025
bb5528e
Fix, use new function
janboll Feb 14, 2025
7fe4c7c
Remove or method call
janboll Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions config/config.msft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,7 @@ clouds:

# ACR
svcAcrName: arohcpsvcint
svcAcrZoneRedundancy: Disabled
ocpAcrName: arohcpocpint
ocpAcrZoneRedundancy: Disabled

# Frontend
frontend:
Expand Down
2 changes: 2 additions & 0 deletions config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,9 @@ clouds:
subscription: ARO Hosted Control Planes (EA Subscription 1)
# Shared ACRs
svcAcrName: arohcpsvcdev
svcAcrZoneRedundancy: Disabled
ocpAcrName: arohcpocpdev
ocpAcrZoneRedundancy: Disabled
# Shared Image Sync
imageSync:
rg: hcp-underlay-westus3-imagesync-dev
Expand Down
4 changes: 3 additions & 1 deletion config/public-cloud-cs-pr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
"softDelete": false
},
"ocpAcrName": "arohcpocpdev",
"ocpAcrZoneRedundancy": "Disabled",
"oidcStorageAccountName": "arohcpoidccspr",
"pko": {
"image": "arohcpsvcdev.azurecr.io/package-operator/package-operator-package",
Expand Down Expand Up @@ -264,5 +265,6 @@
"rg": "hcp-underlay-cspr-svc",
"subscription": "ARO Hosted Control Planes (EA Subscription 1)"
},
"svcAcrName": "arohcpsvcdev"
"svcAcrName": "arohcpsvcdev",
"svcAcrZoneRedundancy": "Disabled"
}
4 changes: 3 additions & 1 deletion config/public-cloud-dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
"softDelete": false
},
"ocpAcrName": "arohcpocpdev",
"ocpAcrZoneRedundancy": "Disabled",
"oidcStorageAccountName": "arohcpoidcdev",
"pko": {
"image": "arohcpsvcdev.azurecr.io/package-operator/package-operator-package",
Expand Down Expand Up @@ -264,5 +265,6 @@
"rg": "hcp-underlay-dev-svc",
"subscription": "ARO Hosted Control Planes (EA Subscription 1)"
},
"svcAcrName": "arohcpsvcdev"
"svcAcrName": "arohcpsvcdev",
"svcAcrZoneRedundancy": "Disabled"
}
4 changes: 3 additions & 1 deletion config/public-cloud-personal-dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
"softDelete": false
},
"ocpAcrName": "arohcpocpdev",
"ocpAcrZoneRedundancy": "Disabled",
"oidcStorageAccountName": "arohcpoidcusw3tst",
"pko": {
"image": "arohcpsvcdev.azurecr.io/package-operator/package-operator-package",
Expand Down Expand Up @@ -264,5 +265,6 @@
"rg": "hcp-underlay-usw3tst-svc",
"subscription": "ARO Hosted Control Planes (EA Subscription 1)"
},
"svcAcrName": "arohcpsvcdev"
"svcAcrName": "arohcpsvcdev",
"svcAcrZoneRedundancy": "Disabled"
}
6 changes: 3 additions & 3 deletions dev-infrastructure/templates/global-acr.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Sets up the global ACRs for SVC and OCP images.
*/
import { locationIsZoneRedundant } from 'common.bicep'
import { getLocationAvailabilityZones } from 'common.bicep'

param ocpAcrName string
param ocpAcrSku string
Expand All @@ -11,8 +11,8 @@ param svcAcrSku string

param location string

param svcAcrZoneRedundancy string = locationIsZoneRedundant(location) ? 'Enabled' : 'Disabled'
param ocpAcrZoneRedundancy string = locationIsZoneRedundant(location) ? 'Enabled' : 'Disabled'
param svcAcrZoneRedundancy string = length(getLocationAvailabilityZones(location)) > 0 ? 'Enabled' : 'Disabled'
param ocpAcrZoneRedundancy string = length(getLocationAvailabilityZones(location)) > 0 ? 'Enabled' : 'Disabled'

module ocpAcr '../modules/acr/acr.bicep' = {
name: ocpAcrName
Expand Down
Loading