Ensure that an unchanged image is not in update result #144
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
squaremo
force-pushed
the
images-in-templates
branch
from
66cd241
to
5421d55
Compare
With reference to
#133
this commit adapts the update->result test so that it checks an
additional case: that a field with an update marker that _does_
correspond to a policy, but _doesn't_ get changed, is not included in
the results.
This test fails at present, because the method for determining the
result is to count which setters are referenced, rather than which
fields were changed.
Signed-off-by: Michael Bridgen <michael@weave.works>
The update procedure is obliged to return a Result struct with all the objects that were changed, for filling in the commit template. At present, the result is collated by running each setter on each object and seeing if the setter is used. This uses the `Set` from kyaml, with a small amount of glue. It doesn't quite work, however, because a setter may be used for a field without changing the value. The result gets an entry for each policy _mentioned_, whether or not it had a new value. There is no way to see whether a setter actually changed a field from the outside, other than by comparing a copy of the object before using the setter with the object after (which yaml.v3 does not make easy). A better approach is to get the setter to record whether it changed anything, since it is there doing the changing. This means reimplementing kyaml's `Set`. I have stripped it down to the parts needed for image updates -- so e.g., only field values are examined. Signed-off-by: Michael Bridgen <michael@weave.works>
This commit removes an unnecessary indirection through a closure. Signed-off-by: Michael Bridgen <michael@weave.works>
squaremo
force-pushed
the
images-in-templates
branch
from
1bcb7c5
to
018e9e8
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.
The first commit adapts the update->result test so that it checks an additional case: that a field with an update marker that does correspond to a policy, but doesn't get changed, is not included in the results.
The rest of the PR reimplements the setter filter, so that it will record exactly what changes are made. I have adapted it from kyaml, and stripped out a lot of generic code that is unnecessary here.
Fixes #133.