Fix cluster targeting and missing customizations #1473
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
weyfonk
reviewed
Apr 18, 2023
raulcabello
force-pushed
the
targeting
branch
2 times, most recently
from
17da2f9
to
f9457f9
Compare
weyfonk
reviewed
Apr 18, 2023
manno
previously approved these changes
Apr 20, 2023
There are two types of Targets: - Targets defined in a GitRepo. These targets are used to create BundleDeployments, and are duplicated into TargetRestrictions - TargetCustomizations defined in fleet.yaml. There are used just for customization Check if there is any TargetCustomization that should be applied, and it is not in the TargetRestrictions. Add the iteration for clusters groups inside the loop of matches, that guarantees the order will never be different Signed-off-by: raul <raul.cabello@suse.com>
Co-authored-by: Corentin Néau <tan.neau@suse.com> Signed-off-by: raul <raul.cabello@suse.com>
…integration tests Signed-off-by: raul <raul.cabello@suse.com>
Co-authored-by: Corentin Néau <tan.neau@suse.com>
Conditions inside ignore conditions field will be ignored when checking the Bundle state Signed-off-by: raul <raul.cabello@suse.com>
manno
approved these changes
Apr 20, 2023
manno
changed the title
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.
There are two types of Targets:
Targetsdefined in aGitRepo. These targets are used to createBundleDeployments, and are duplicated intoTargetRestrictionsTargetCustomizationsdefined infleet.yaml. There are used just for customizationThis PR fixes two issues:
Check if there is any
TargetCustomizationthat should be applied, and it is not in theTargetRestrictions. Before we were matching target just if they were insideTargetRestrictions. This was causing some customizations to be ignoredWe were iteration a map here which order might be different in different executions. This was causing this issue. This PR adds the iteration for clusters groups inside the loop of matches, that guarantees the order will never be different.
refers to #1254