Skip to content

Backport low-risk fixes from #555 to release-2.17 - #587

Merged
xiangjingli merged 1 commit into
release-2.17from
backport-555-release-2.17
Aug 10, 2026
Merged

Backport low-risk fixes from #555 to release-2.17#587
xiangjingli merged 1 commit into
release-2.17from
backport-555-release-2.17

Conversation

@xiangjingli

Copy link
Copy Markdown
Contributor

https://redhat.atlassian.net/browse/ACM-37277

Backports Fix 1-4 from PR #555 (gitopscluster controller sync up argocd cluster secret once its MSA token gets rotated):

  • Fix 1: Correct the Secret cache label selector (remove invalid comma-containing label key, use argocd.argoproj.io/secret-type=cluster)
  • Fix 2: Extend MSA predicate to also fire on ExpirationTimestamp changes
  • Fix 3: Add a direct MSA token secret watch via a secondary label-scoped cache and MSATokenSecretPredicateFunc
  • Fix 4: Add 5-minute periodic requeue to cap the max authentication gap

Fix 5 (de-label ArgoCD cluster secret before deletion) is intentionally excluded from this backport since it depends on cleanupOldArgoClusterSecrets logic whose applicability varies across older release branches; tracked separately.

Backports Fix 1-4 from PR #555 (gitopscluster controller sync up argocd
cluster secret once its MSA token gets rotated):

- Fix 1: Correct the Secret cache label selector (remove invalid
  comma-containing label key, use argocd.argoproj.io/secret-type=cluster)
- Fix 2: Extend MSA predicate to also fire on ExpirationTimestamp changes
- Fix 3: Add a direct MSA token secret watch via a secondary label-scoped
  cache and MSATokenSecretPredicateFunc
- Fix 4: Add 5-minute periodic requeue to cap the max authentication gap

Fix 5 (de-label ArgoCD cluster secret before deletion) is intentionally
excluded from this backport since it depends on cleanupOldArgoClusterSecrets
logic whose applicability varies across older release branches; tracked
separately.

Signed-off-by: Xiangjing Li <xiangli@redhat.com>
@coderabbitai

coderabbitai Bot commented Aug 10, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

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.

⚙️ Run configuration

Configuration used: Repository: stolostron/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 24f55422-539d-4e26-b538-bfdf415e8f17

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

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@openshift-ci
openshift-ci Bot requested a review from falconizmi August 10, 2026 04:29
@openshift-ci

openshift-ci Bot commented Aug 10, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xiangjingli

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 requested a review from mikeshng August 10, 2026 04:29
@sonarqubecloud

Copy link
Copy Markdown

Quality Gate Failed Quality Gate failed

Failed conditions
2.1% Coverage on New Code (required ≥ 70%)

See analysis details on SonarQube Cloud

@openshift-ci

openshift-ci Bot commented Aug 10, 2026

Copy link
Copy Markdown

@xiangjingli: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/sonarcloud 88874d0 link true /test sonarcloud

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.

@xiangjingli
xiangjingli merged commit 90eeb80 into release-2.17 Aug 10, 2026
16 of 19 checks passed
@xiangjingli
xiangjingli deleted the backport-555-release-2.17 branch August 10, 2026 13:40
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.

1 participant