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. openshift-rebase(v1.24):source=6da1c7d4562
bertinatto · Sep 20, 2022 · 38bfed3 · 38bfed3
1 parent 7bf2f1f
commit 38bfed3
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/staging/src/k8s.io/kubelet/pkg/apis/well_known_labels.go b/staging/src/k8s.io/kubelet/pkg/apis/well_known_labels.go
@@ -45,6 +45,11 @@ var kubeletLabels = sets.NewString(
 
 	LabelOS,
 	LabelArch,
+
+	// These are special for OpenShift:
+	"node-role.kubernetes.io/master",
+	"node-role.kubernetes.io/worker",
+	"node-role.kubernetes.io/etcd",
 )
 
 var kubeletLabelNamespaces = sets.NewString(