[0.1] Get updated cluster before removing finalizers #1173
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If the cluster actuator's Delete() call updates the cluster in the apiserver, there is a possibility that in-memory cluster object in the cluster controller is now out of date. We either need to get-then-update the cluster to remove the finalizer, or we need to use patch. The version of controller-runtime we're using in release-0.1 does not support patch in its generic client, so this change adds the get-then-update logic, and wraps it inside a retry on conflict loop. Signed-off-by: Andy Goldstein <goldsteina@vmware.com>
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
the
size/S
ncdc
changed the title
|
/approve |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ncdc, vincepri 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 |
k8s-ci-robot
added
the
approved
akutz
reviewed
Jul 24, 2019
| // | ||
| // Note 2, this is not a Patch call because the version of controller-runtime in the release-0.1 branch | ||
| // does not support patching. | ||
| err := r.Get(context.Background(), request.NamespacedName, cluster) |
There was a problem hiding this comment.
Hi @ncdc,
the version of controller-runtime in the release-0.1 branch does not support patching.
What do you mean? Both CAPA and CAPV using CAPI release-0.1 patch the cluster object using a JSON patch.
There was a problem hiding this comment.
controller-runtime's generic client doesn't have Patch support
thorsteinnth
added a commit
to NetApp/cluster-api
that referenced
this pull request
Aug 7, 2019
* Get updated cluster before removing finalizers (kubernetes-sigs#1173) If the cluster actuator's Delete() call updates the cluster in the apiserver, there is a possibility that in-memory cluster object in the cluster controller is now out of date. We either need to get-then-update the cluster to remove the finalizer, or we need to use patch. The version of controller-runtime we're using in release-0.1 does not support patch in its generic client, so this change adds the get-then-update logic, and wraps it inside a retry on conflict loop. Signed-off-by: Andy Goldstein <goldsteina@vmware.com> * Update lodash version to address CVE (kubernetes-sigs#1156) Signed-off-by: Andy Goldstein <goldsteina@vmware.com> * Update Netlify config for v1alpha1 subdomain (kubernetes-sigs#1176) * Release v0.1.8 (kubernetes-sigs#1183)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
If the cluster actuator's Delete() call updates the cluster in the
apiserver, there is a possibility that in-memory cluster object in the
cluster controller is now out of date. We either need to get-then-update
the cluster to remove the finalizer, or we need to use patch. The
version of controller-runtime we're using in release-0.1 does not
support patch in its generic client, so this change adds the
get-then-update logic, and wraps it inside a retry on conflict loop.
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 #
Special notes for your reviewer:
Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.
Release note: