Simplify target customisations for namespace labels and annotations #2664
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
manno
reviewed
Jul 23, 2024
manno
reviewed
Jul 25, 2024
weyfonk
force-pushed
the
namespace-labels-annotations-target-custom-follow-up
branch
from
94d291f to
9fb2143
Compare
weyfonk
force-pushed
the
namespace-labels-annotations-target-custom-follow-up
branch
from
9fb2143 to
0fcd577
Compare
Now that the necessary directory has been merged into `rancher/fleet-test-data`, this commit makes use of it instead of a fork's directory.
One only needs to loop over targets once to populate both.
This fetches the cluster namespace from the cluster object itself, as opposed to using a hard-coded namespace with a seemingly arbitrary value.
Pointers to maps are superfluous, as iterating over an empty map will be a no-op, and we do not need to otherwise differentiate an empty map from an unset one. This still leaves original namespace labels and annotations as pointers to maps in bundle deployment options, for backward compatibility.
This simplifies dealing with bundle deployment options, since an empty map is semantically equivalent to a nil pointer.
weyfonk
force-pushed
the
namespace-labels-annotations-target-custom-follow-up
branch
from
0fcd577 to
8e71c25
Compare
manno
approved these changes
Aug 12, 2024
This was referenced Aug 12, 2024
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.
Follow-up to #2583.
Refers to #2262 and #2441.
This simplifies end-to-end tests and the implementation for using namespace labels and annotations as target customisations.
In bundle deployment options, maps are used directly instead of pointers to maps for namespace labels and namespace annotations.
Manual tests suggest that Kubernetes represents bundles deployments with identical YAML in both cases, ie whether pointers to maps or simple maps are used to represent those fields.