Skip to content

Commit 7086abb

Browse files
stttsbertinatto
authored andcommitted
UPSTREAM: <carry>: noderestrictions: add node-role.kubernetes.io/* to 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
1 parent 465c872 commit 7086abb

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

staging/src/k8s.io/kubelet/pkg/apis/well_known_labels.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ var kubeletLabels = sets.NewString(
4545

4646
LabelOS,
4747
LabelArch,
48+
49+
// These are special for OpenShift:
50+
"node-role.kubernetes.io/control-plane",
51+
"node-role.kubernetes.io/master",
52+
"node-role.kubernetes.io/worker",
53+
"node-role.kubernetes.io/etcd",
4854
)
4955

5056
var kubeletLabelNamespaces = sets.NewString(

0 commit comments

Comments
 (0)