Skip to content

[release-2.16] fix: only delete ArgoCD cluster secrets when ManagedCluster is confirmed fully deleted#474

Merged
xiangjingli merged 1 commit intostolostron:release-2.16from
openshift-cherrypick-robot:cherry-pick-471-to-release-2.16
Feb 24, 2026
Merged

[release-2.16] fix: only delete ArgoCD cluster secrets when ManagedCluster is confirmed fully deleted#474
xiangjingli merged 1 commit intostolostron:release-2.16from
openshift-cherrypick-robot:cherry-pick-471-to-release-2.16

Conversation

@openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Feb 24, 2026

This is an automated cherry-pick of #471

/assign mikeshng

@mikeshng
fix: only delete ArgoCD cluster secrets when ManagedCluster is confir…
e7e0afc 
…med fully deleted

Never delete cluster secrets when the cluster name cannot be determined
from the secret. Previously this edge case fell through to deletion.
Also fixed e2e test reliability with controller warmup and longer timeout.

Signed-off-by: Mike Ng <ming@redhat.com>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 24, 2026
Merged
@openshift-ci openshift-ci bot requested review from fxiang1 and rokej February 24, 2026 19:11
mikeshng
mikeshng approved these changes Feb 24, 2026
View reviewed changes
Copy link
Contributor

@mikeshng mikeshng left a comment

Choose a reason for hiding this comment

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

/approve

/lgtm

/hold

@xiangjingli please feel free to unhold whenever

@openshift-ci
Copy link

openshift-ci bot commented Feb 24, 2026

[APPROVALNOTIFIER] This PR is APPROVED

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

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
Copy link

openshift-ci bot commented Feb 24, 2026

@openshift-cherrypick-robot: 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 e7e0afc 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.

@mikeshng mikeshng removed request for fxiang1 and rokej February 24, 2026 19:23
@xiangjingli xiangjingli merged commit 69888aa into stolostron:release-2.16 Feb 24, 2026
15 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mikeshng mikeshng mikeshng approved these changes

Assignees

@mikeshng mikeshng

Labels

approved dco-signoff: yes do-not-merge/hold lgtm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@openshift-cherrypick-robot @mikeshng @xiangjingli