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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed issue with kubermatic constraints delete failing when user cluster constraint is missing #6598

Merged
merged 1 commit into from
Feb 25, 2021

Conversation

lsviben
Copy link
Contributor

@lsviben lsviben commented Feb 25, 2021

What this PR does / why we need it:
Fixes an issue with kubermatic constraints delete failing when user cluster constraint is missing. It was causing such clusters to hang when being deleted because of the finalizers on the constraints.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #6597

Does this PR introduce a user-facing change?:

Fixed a bug with kubermatic constraints delete getting stuck when corresponding user cluster constraint is missing

@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 25, 2021
@lsviben
Copy link
Contributor Author

lsviben commented Feb 25, 2021

/retest

@lsviben lsviben requested a review from xrstf February 25, 2021 15:17
Copy link
Contributor

@xrstf xrstf left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 25, 2021
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 4b27cd238535ac709a5dba65b8275f965d44470c

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsviben, xrstf

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 25, 2021
@kubermatic-bot kubermatic-bot merged commit cbf4e52 into kubermatic:master Feb 25, 2021
@lsviben
Copy link
Contributor Author

lsviben commented Feb 25, 2021

/cherry-pick release/v2.16

@kubermatic-bot
Copy link
Contributor

@lsviben: #6598 failed to apply on top of branch "release/v2.16":

Applying: fixed issue with kubermatic constraints delete failing because user cluster constraint is missing
Using index info to reconstruct a base tree...
M	pkg/controller/user-cluster-controller-manager/constraint-syncer/controller.go
M	pkg/controller/user-cluster-controller-manager/constraint-syncer/controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/user-cluster-controller-manager/constraint-syncer/controller_test.go
Auto-merging pkg/controller/user-cluster-controller-manager/constraint-syncer/controller.go
CONFLICT (content): Merge conflict in pkg/controller/user-cluster-controller-manager/constraint-syncer/controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fixed issue with kubermatic constraints delete failing because user cluster constraint is missing
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:

/cherry-pick release/v2.16

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/test-infra repository.

lsviben added a commit to lsviben/kubermatic that referenced this pull request Feb 26, 2021
kubermatic-bot pushed a commit that referenced this pull request Feb 26, 2021
@lsviben lsviben deleted the fix-constraint-delete branch September 23, 2021 10:33
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. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Kubermatic Constraints cannot be deleted properly if the corresponding user cluster constraint is missing
3 participants