Apply labels and annotations only in the correct paths #1499
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
…n the GVK Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
ANeumann82
requested review from
alenkacz,
gerred,
jbarrick-mesosphere,
kensipe,
nfnt and
zen-dog
as code owners
zen-dog
approved these changes
May 8, 2020
| @@ -107,6 +107,9 @@ func TestSetDependenciesHash(t *testing.T) { | |||
| assert.NilError(t, err) | |||
| assert.DeepEqual(t, pod("somename", "namespace"), p) | |||
| }}, | |||
| {name: "no change in unstructured CRD", obj: unstructuredCrd("crd", "namespace"), assert: func(us *unstructured.Unstructured) { | |||
There was a problem hiding this comment.
So there is no easy way to collect the CRDs as part of the diagnostics (or cleanup for that matter) 😞
There was a problem hiding this comment.
You mean because it didn't change? That's not correct, this test is specifically about the dependencies hash - no dependencies for CRDs, therefore no change.
I've extended one test in enhancer_test.go to verify that and make it more obvious that the top-level annotations in metadata/annotations and metadata/labels are always added.
Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
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.
Adding labels/annotations in all possible paths and relying on conversion to typed objects to remove invalid paths obviously only works for resources where we have the typed objects available. For almost all CRDs this leaves the resources with unwanted labels and annotations in multiple locations.
We now have custom lists for locations based on the G(V)K.
Signed-off-by: Andreas Neumann aneumann@mesosphere.com
Fixes #1498