From f30ef8f54740069dbfb3f50da1c554c1ddad7682 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Thu, 29 Oct 2020 13:56:01 +0100 Subject: [PATCH] UPSTREAM: : noderestrictions: add node-role.kubernetes.io/* to allowed node labels Server side validation of node labels was added in https://github.com/kubernetes/kubernetes/pull/90307. We only disabled kubelet-side validation before to make our node role labels work. --- pkg/kubelet/apis/well_known_labels.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/kubelet/apis/well_known_labels.go b/pkg/kubelet/apis/well_known_labels.go index 96890b553f7e8..4a655c7a0c6db 100644 --- a/pkg/kubelet/apis/well_known_labels.go +++ b/pkg/kubelet/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(