fix: prevent nil map panic and applyset label/annotation propagation#406
Open
yehudacohen wants to merge 1 commit intohyperspike:mainfrom
Open
fix: prevent nil map panic and applyset label/annotation propagation#406yehudacohen wants to merge 1 commit intohyperspike:mainfrom
yehudacohen wants to merge 1 commit intohyperspike:mainfrom
Conversation
The labels() function used maps.Clone(valkey.Labels) which returns nil when the input is nil, causing a panic on the next map assignment. While validateValkeySpec() guards against nil labels during normal reconciliation, the labels() function should be self-contained. Additionally, when tools like KRO, ArgoCD, or kubectl apply --prune inject applyset.kubernetes.io/* labels and annotations onto the Valkey CR, the operator propagated them to child Services and StatefulSets. This caused the tools to treat those children as managed resources, leading to unintended pruning — the tool deletes the Service, the operator recreates it, and the cycle repeats. Changes: - labels(): initialize with make() instead of maps.Clone(), filter applyset.kubernetes.io/* labels before propagating to children - annotations(): copy and filter instead of returning the raw map reference, filter applyset.kubernetes.io/* annotations - Added tests for nil labels, applyset label filtering, applyset annotation filtering, and nil annotations
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
1 participant
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.
The labels() function used maps.Clone(valkey.Labels) which returns nil when the input is nil, causing a panic on the next map assignment. While validateValkeySpec() guards against nil labels during normal reconciliation, the labels() function should be self-contained.
Additionally, when tools like KRO, ArgoCD, or kubectl apply --prune inject applyset.kubernetes.io/* labels and annotations onto the Valkey CR, the operator propagated them to child Services and StatefulSets. This causes the tools to treat those children as managed resources, leading to unintended pruning: the tool deletes the Service, the operator recreates it, and the cycle repeats.
Changes: