Skip to content

Commit

Permalink
UPSTREAM: <carry>: noderestrictions: add node-role.kubernetes.io/* to…
Browse files Browse the repository at this point in the history
… allowed node labels

Server side validation of node labels was added in kubernetes#90307. We only disabled kubelet-side validation before to make our node role labels work.

UPSTREAM: <carry>: add control plane to allow roles

OpenShift-Rebase-Source: 38bfed3
OpenShift-Rebase-Source: aff4434
  • Loading branch information
sttts authored and bertinatto committed Aug 24, 2023
1 parent 465c872 commit 7086abb
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions staging/src/k8s.io/kubelet/pkg/apis/well_known_labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ var kubeletLabels = sets.NewString(

LabelOS,
LabelArch,

// These are special for OpenShift:
"node-role.kubernetes.io/control-plane",
"node-role.kubernetes.io/master",
"node-role.kubernetes.io/worker",
"node-role.kubernetes.io/etcd",
)

var kubeletLabelNamespaces = sets.NewString(
Expand Down

0 comments on commit 7086abb

Please sign in to comment.