Fix #6676: restrict builder.nodeSelector keys via operator allow list - #6679
Merged
Merged
Conversation
Signed-off-by: Harsh Mehta <harshmehta010102@gmail.com>
oscerd
approved these changes
Jun 13, 2026
squakez
approved these changes
Jun 13, 2026
squakez
left a comment
Contributor
There was a problem hiding this comment.
Thanks for the contribution, nice work!
Signed-off-by: Harsh Mehta <harshmehta010102@gmail.com>
Contributor
Author
Contributor
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
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.
Fixes #6676
Summary
Adds an operator-level allow list to restrict which node-selector label keys CR authors can
set via the
builder.nodeSelectortrait, preventing unauthorized node targeting in sharedclusters.
How it works:
Set
BUILDER_NODE_SELECTOR_ALLOWED_LABELSon the operator deployment to a comma-separatedlist of permitted label keys:
BUILDER_NODE_SELECTOR_ALLOWED_LABELS=kubernetes.io/hostname,topology.kubernetes.io/zone
Changes
pkg/platform/env_platform.go— newBuilderNodeSelectorAllowList()reads and parses the env varpkg/trait/builder.go—filterNodeSelector()applies the allow list inApply()instead of assigningt.NodeSelectordirectlypkg/platform/env_platform_test.go/pkg/trait/builder_test.go— unit tests including nil, empty, partial, full-match, and all-keys-dropped casesdocs/modules/ROOT/pages/installation/builds.adoc—BUILDER_NODE_SELECTOR_ALLOWED_LABELSadded to build env var tabledocs/modules/traits/pages/builder.adoc— NOTE block added to Node Selectors section with xref to builds config docs