Skip to content

[release-4.20] CNTRLPLANE-2205: fix(hcco): allow for ARN reuse across components - #7383

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.20from
openshift-cherrypick-robot:cherry-pick-7366-to-release-4.20
Dec 16, 2025
Merged

[release-4.20] CNTRLPLANE-2205: fix(hcco): allow for ARN reuse across components#7383
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.20from
openshift-cherrypick-robot:cherry-pick-7366-to-release-4.20

Conversation

@openshift-cherrypick-robot

@openshift-cherrypick-robot openshift-cherrypick-robot commented Dec 12, 2025

Copy link
Copy Markdown

This is an automated cherry-pick of #7366

/assign sjenning

@sjenning openshift-cherrypick-robot
fix(hcco): allow for ARN reuse across components
0b1ca36 
This commit fixes an issue where a map is used to store secrets
to be reconciled into the hosted cluster.  The map uses the ARN
as the key, so if the ARN is reused across components, only one
of the secrets is reconciled.

Switch a slice that contains the ARN and secret ref for each
secret to be reconciled, allowing to ARN reuse.
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 12, 2025
Merged
@openshift-ci-robot

openshift-ci-robot commented Dec 12, 2025 •
edited by openshift-ci Bot
Loading

Copy link
Copy Markdown

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: CNTRLPLANE-2205

Details

In response to this:

This is an automated cherry-pick of #7366

/assign sjenning

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Dec 12, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)
  • do-not-merge/work-in-progress

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci
openshift-ci Bot requested review from csrwng and enxebre December 12, 2025 19:01
@openshift-ci openshift-ci Bot added area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release and removed do-not-merge/needs-area labels Dec 12, 2025
@sjenning

sjenning commented Dec 15, 2025

Copy link
Copy Markdown
Contributor

clean pick
/lgtm

@sjenning sjenning added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. labels Dec 15, 2025
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Dec 15, 2025
@sjenning sjenning added backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. and removed lgtm Indicates that a PR is ready to be merged. labels Dec 15, 2025
@sjenning

sjenning commented Dec 16, 2025

Copy link
Copy Markdown
Contributor

/approve
/lgtm
/verified by @sjenning

@sjenning sjenning added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 16, 2025
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Dec 16, 2025
@openshift-ci-robot

openshift-ci-robot commented Dec 16, 2025

Copy link
Copy Markdown

@sjenning: This PR has been marked as verified by @sjenning.

Details

In response to this:

/approve
/lgtm
/verified by @sjenning

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Dec 16, 2025
@openshift-ci

openshift-ci Bot commented Dec 16, 2025

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, sjenning

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 16, 2025
@sjenning

sjenning commented Dec 16, 2025

Copy link
Copy Markdown
Contributor

/test unit

@openshift-ci-robot

openshift-ci-robot commented Dec 16, 2025

Copy link
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD c733d7e and 2 for PR HEAD 0b1ca36 in total

@openshift-ci

openshift-ci Bot commented Dec 16, 2025

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot
openshift-merge-bot Bot merged commit 7b38a82 into openshift:release-4.20 Dec 16, 2025
18 checks passed
@sjenning sjenning mentioned this pull request Dec 16, 2025
Merged
@sjenning sjenning mentioned this pull request Jan 12, 2026
Merged
@devguyio devguyio mentioned this pull request Jul 1, 2026
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@csrwng csrwng Awaiting requested review from csrwng
@enxebre enxebre Awaiting requested review from enxebre

Assignees

@sjenning sjenning

Labels

acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@openshift-cherrypick-robot @openshift-ci-robot @sjenning