Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃悰 Fix incorrect cleaning of deletion annotations #2288

Merged
merged 1 commit into from
Nov 7, 2022

Conversation

davidfestal
Copy link
Member

Summary

This PR fixes an incorrect cleaning of SyncTarget-related deletion annotations.

Related issue(s)

Fixes #2287

Copy link
Contributor

@qiujian16 qiujian16 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

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 1, 2022
Signed-off-by: David Festal <dfestal@redhat.com>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 1, 2022
@@ -188,6 +188,9 @@ func TestComputePlacement(t *testing.T) {
}, map[string]string{
"state.workload.kcp.dev/cluster-3": "Sync",
}, nil, nil, "ns"),
wantAnnotationPatch: map[string]interface{}{
Copy link
Member Author

Choose a reason for hiding this comment

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

@sttts do you agree that the test was previously wrong, or was it on purpose that the deletion annotation would be kept even when rescheduling to the SyncTarget ?

Copy link
Member

Choose a reason for hiding this comment

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

not sure. Leaving that to @qiujian16 and @jmprusi

@sttts
Copy link
Member

sttts commented Nov 7, 2022

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 7, 2022

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 7, 2022
@qiujian16
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 7, 2022
@openshift-merge-robot openshift-merge-robot merged commit 251d43f into kcp-dev:main Nov 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug: deletion annotation not removed when scheduler scheduled this resource again
4 participants