Skip to content

fix(acr): cache governance policy propagator image - #6829

Merged
openshift-merge-bot[bot] merged 1 commit into
Azure:mainfrom
mmazur:cache-governance-policy-propagator
Sep 8, 2026
Merged

fix(acr): cache governance policy propagator image#6829
openshift-merge-bot[bot] merged 1 commit into
Azure:mainfrom
mmazur:cache-governance-policy-propagator

Conversation

@mmazur

Copy link
Copy Markdown
Collaborator

https://redhat.atlassian.net/browse/AROSLSRE-2029

Why

PR #6827 pins the governance policy propagator to an image published under the quay.io/redhat-user-workloads/crt-redhat-acm-tenant namespace. The existing SVC ACR wildcard maps acm-d-cache/* to quay.io/acm-d/*, so it cannot resolve that image.

Add a fixed ACR cache rule mapping the CRT repository to acm-d-cache/governance-policy-propagator-acm-216. The fixed target can coexist with the existing wildcard rule and is deployed to every SVC ACR through the global infrastructure template.

Dependency and rollout order

PR checks deploy the Region entrypoint and do not deploy Global infrastructure, so #6827 cannot pass E2E until this cache rule exists in the shared development ACR.

  1. Merge this PR.
  2. Deploy the Microsoft.Azure.ARO.HCP.Global entrypoint so the cache rule reaches all SVC ACRs, including the shared development ACR used by PR checks.
  3. Retry E2E on fix(acm): pin governance policy propagator image #6827.

PR #6827 remains draft until this PR is merged and the Global deployment completes. Production rollout must preserve the same Global-before-Region ordering.

Validation

  • az bicep lint --file dev-infrastructure/templates/global-acr.bicep
  • az bicep build --file dev-infrastructure/templates/global-acr.bicep --stdout
  • git diff --check

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

The change is small, consistent with existing ACR cache rule patterns in this template, and aligns with the stated dependency/rollout needs for #6827.

Pull request overview

Adds a dedicated Azure Container Registry (SVC ACR) artifact cache rule so PR #6827 can pull the governance-policy-propagator image from the quay.io/redhat-user-workloads/crt-redhat-acm-tenant namespace despite the existing acm-d-cache/* -> quay.io/acm-d/* wildcard rule. This is a global infrastructure change that ensures the cache rule is deployed to every SVC ACR via the Global entrypoint.

Changes:

  • Add a fixed ACR cache rule mapping acm-d-cache/governance-policy-propagator-acm-216 to quay.io/redhat-user-workloads/crt-redhat-acm-tenant/governance-policy-propagator-acm-216.
  • Use the existing Quay credential identifiers (quay-username / quay-password) for the new cache rule.
File summaries
File Description
dev-infrastructure/templates/global-acr.bicep Adds a specific SVC ACR cache rule to override/avoid the existing acm-d-cache/* wildcard mapping for the governance policy propagator image.
Review details
  • Files reviewed: 1/1 changed files
  • Comments generated: 0
  • Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@stevekuznetsov

Copy link
Copy Markdown
Contributor

/lgtm
/approve

@openshift-ci

openshift-ci Bot commented Sep 4, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mmazur, stevekuznetsov

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@mmazur

Copy link
Copy Markdown
Collaborator Author

/retry

@mmazur

Copy link
Copy Markdown
Collaborator Author

/retest

3 similar comments
@mmazur

Copy link
Copy Markdown
Collaborator Author

/retest

@mmazur

Copy link
Copy Markdown
Collaborator Author

/retest

@mmazur

Copy link
Copy Markdown
Collaborator Author

/retest

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 1540c9e and 2 for PR HEAD f92d84a in total

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 97fe87f and 1 for PR HEAD f92d84a in total

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD b7db1d9 and 0 for PR HEAD f92d84a in total

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/hold

Revision f92d84a was retested 3 times: holding

@mmazur

Copy link
Copy Markdown
Collaborator Author

/retest

@mmazur

Copy link
Copy Markdown
Collaborator Author

/retest
/unhold

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD f648e80 and 2 for PR HEAD f92d84a in total

@openshift-merge-bot
openshift-merge-bot Bot merged commit 7b4d320 into Azure:main Sep 8, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants