Skip to content

🐛 Refresh external managed token secret if service account is deleted #78

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.

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

Merged

Conversation

zhujian7
Copy link

@zhujian7 zhujian7 commented Jun 6, 2024

…open-cluster-management-io#504)

* Refresh external managed token secret if service account is deleted

Signed-off-by: zhujian <[email protected]>

* Debug e2e

Signed-off-by: zhujian <[email protected]>

---------

Signed-off-by: zhujian <[email protected]>
Copy link

sonarqubecloud bot commented Jun 6, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@zhujian7 zhujian7 changed the title 🐛 Refresh external managed token secret if service account is deleted… 🐛 Refresh external managed token secret if service account is deleted Jun 6, 2024
@zhujian7
Copy link
Author

zhujian7 commented Jun 6, 2024

/test integration

@zhujian7 zhujian7 requested a review from qiujian16 June 7, 2024 02:19
@zhujian7
Copy link
Author

zhujian7 commented Jun 7, 2024

/assign @elgnay @qiujian16

@qiujian16
Copy link
Collaborator

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm label Jun 7, 2024
Copy link

openshift-ci bot commented Jun 7, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qiujian16, zhujian7

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

The pull request process is described here

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 label Jun 7, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit e3b484d into stolostron:backplane-2.6 Jun 7, 2024
8 checks passed
@zhujian7
Copy link
Author

/cherrypick backplane-2.5

@openshift-cherrypick-robot

@zhujian7: #78 failed to apply on top of branch "backplane-2.5":

Applying: 🐛 Refresh external managed token secret if service account is deleted (#504)
Using index info to reconstruct a base tree...
M	.github/workflows/e2e.yml
M	pkg/operator/helpers/sa_syncer.go
M	pkg/operator/helpers/sa_syncer_test.go
M	pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_controller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/operators/clustermanager/controllers/clustermanagercontroller/clustermanager_controller.go
Auto-merging pkg/operator/helpers/sa_syncer_test.go
CONFLICT (content): Merge conflict in pkg/operator/helpers/sa_syncer_test.go
Auto-merging pkg/operator/helpers/sa_syncer.go
CONFLICT (content): Merge conflict in pkg/operator/helpers/sa_syncer.go
Auto-merging .github/workflows/e2e.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 🐛 Refresh external managed token secret if service account is deleted (#504)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick backplane-2.5

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.

openshift-merge-bot bot pushed a commit that referenced this pull request Sep 4, 2024
…s deleted (#117)

* Refresh external managed token secret if service account ns changes (open-cluster-management-io#458)

Signed-off-by: zhujian <[email protected]>

* 🐛 Refresh external managed token secret if service account is deleted (open-cluster-management-io#504) (#78)

* Refresh external managed token secret if service account is deleted



* Debug e2e



---------

Signed-off-by: zhujian <[email protected]>

---------

Signed-off-by: zhujian <[email protected]>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/ocm that referenced this pull request Sep 9, 2024
…open-cluster-management-io#504) (stolostron#78)

* Refresh external managed token secret if service account is deleted

* Debug e2e

---------

Signed-off-by: zhujian <[email protected]>
openshift-merge-bot bot pushed a commit that referenced this pull request Sep 10, 2024
…s deleted (#123)

* Refresh external managed token secret if service account ns changes (open-cluster-management-io#458)

Signed-off-by: zhujian <[email protected]>

* 🐛 Refresh external managed token secret if service account is deleted (open-cluster-management-io#504) (#78)

* Refresh external managed token secret if service account is deleted

* Debug e2e

---------

Signed-off-by: zhujian <[email protected]>

---------

Signed-off-by: zhujian <[email protected]>
Co-authored-by: Jian Zhu <[email protected]>
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.

4 participants