Adding namespaceLabels and namespaceAnnotations as TargetCustomization #2583
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
Tommy12789
force-pushed
the
2262
branch
5 times, most recently
from
1998d0f to
ed555da
Compare
Tommy12789
changed the title
manno
reviewed
Jul 11, 2024
manno
reviewed
Jul 11, 2024
| @@ -221,6 +221,12 @@ type BundleTarget struct { | |||
| ClusterGroupSelector *metav1.LabelSelector `json:"clusterGroupSelector,omitempty"` | |||
| // DoNotDeploy if set to true, will not deploy to this target. | |||
| DoNotDeploy bool `json:"doNotDeploy,omitempty"` | |||
| // NamespaceLabels are labels that will be appended to the namespace created by Fleet. | |||
| // +nullable | |||
| NamespaceLabels *map[string]string `json:"namespaceLabels,omitempty"` | |||
There was a problem hiding this comment.
I see this is already a pointer to a map in the bundledeployment type. Is that really necessary? Looking at corev1 in k8s, it seems +optional and omitempty is sufficient, unless we really need to differentiate between a null value and an empty map.
Oh, it seems we do:
fleet/internal/cmd/agent/deployer/deployer.go
Line 181 in 9d2019d
That code deletes all annotations if it's an empty map, but not if it's nil. 👍
There was a problem hiding this comment.
However that would still work with a map, as a map is effectively a pointer.
manno
approved these changes
Jul 22, 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.
Refers to #2262 #2441
Added a new parameter namespaceLabels in bundle targets to customize bundleDeployment with those labels