[v0.14] Fix namespace label equality check and nil map panic#5173
Merged
Conversation
Compare the computed desired state against the current namespace labels and annotations instead of comparing raw options directly. The previous reflect.DeepEqual check could never return true because ns.Labels always includes kubernetes.io/metadata.name (and now also preserved pod-security labels), causing an unnecessary updateNamespace call on every reconcile even when no label changes were needed.
addLabelsFromOptions panics when ns.Labels is nil (maps.Clone returns nil) and NamespaceLabels options are non-nil. Add the same nil guard already present for annotations. Update the function doc comment to reflect the actual label retention rules: options labels, kubernetes.io/metadata.name, and existing pod-security.kubernetes.io/* labels are preserved; pod-security labels from options are ignored.
thardeck
changed the title
p-se
approved these changes
May 20, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Backports two fixes from #5156 to release/v0.14.
The previous
reflect.DeepEqualcomparison checked rawBundleDeploymentoptions directly againstns.Labels, which always includeskubernetes.io/metadata.nameand preserved pod-security labels. The check never held, causing an unnecessaryupdateNamespacecall on every reconcile. Replace withmaps.Clone+maps.Equalon the computed desired state.maps.Clonereturns nil when its source is nil, so whenns.Labelsis nil andNamespaceLabelsoptions are non-empty the pod-security check would panic. Add a nil guard matching the one already present for annotations.