Correct cluster drift using patches #822
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
hiddeco
added
enhancement
hiddeco
force-pushed
the
correct-drift-apply
branch
from
8cf7783 to
84a08e2
Compare
hiddeco
force-pushed
the
correct-drift-apply
branch
from
84a08e2 to
f6abde6
Compare
hiddeco
changed the title
hiddeco
force-pushed
the
correct-drift-apply
branch
5 times, most recently
from
270619b to
001b2d1
Compare
14 tasks
hiddeco
force-pushed
the
correct-drift-apply
branch
2 times, most recently
from
39ae10d to
5055ebd
Compare
This changes the cluster drift correction behavior from performing a Helm upgrade to performing create and patch API requests based on the JSON Patch data. Doing this is much lighter than performing a full release cycle, and deals with the issue of Helm being unable to restore state of Custom Resources without the `--force` flag being set. Which has unwanted side-effects like forcing objects through a deletion/creation cycle. After a drift correction attempt a Kubernetes Event is emitted, which contains a summary of the created and patched resources, and a collection of any (potential) errors. As the goal is to restore state as best as we can, the drift correction will be re-attempted until all resources have been restored to the desired state. Signed-off-by: Hidde Beydals <[email protected]>
hiddeco
force-pushed
the
correct-drift-apply
branch
from
5055ebd to
ccd8f88
Compare
There was a problem hiding this comment.
I've tested this with various custom resources changes and found no issues except for the meta.helm.sh/release annotations missing from objects which have been deleted and restored.
Fixed in: 0131f22
hiddeco
force-pushed
the
correct-drift-apply
branch
4 times, most recently
from
d20e120 to
04cb4f8
Compare
This ensures that the metadata labels and annotations Helm adds during the creation of resources are included while diffing them. As they are not part of the manifest but should be restored in case they are e.g. removed or modified. Signed-off-by: Hidde Beydals <[email protected]>
hiddeco
force-pushed
the
correct-drift-apply
branch
from
04cb4f8 to
0131f22
Compare
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.
This changes the cluster drift correction behavior from performing a
Helm upgrade to performing create and patch API requests based on the
JSON Patch data.
Doing this is much lighter than performing a full release cycle, and
deals with the issue of Helm being unable to restore state of Custom
Resources without the
--forceflag being set. Which has unwantedside-effects like forcing objects through a deletion/creation cycle.
After a drift correction attempt a Kubernetes Event is emitted, which
contains a summary of the created and patched resources, and a
collection of any (potential) errors.
As the goal is to restore state as best as we can, the drift correction
will be re-attempted until all resources have been restored to the
desired state.
Fixes #805