github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-12 12:48:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #74424 from liggitt/drop-k8s-io-node-labels

Browse Source 
Clean up self-set node labels
This commit is contained in:
Kubernetes Prow Robot
2019-03-06 08:24:26 -08:00
committed by GitHub
parent 5ff303000a e1db43ad1b
commit 45e5f6053b
11 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubelet/app/options/options.go
View File

@@ -263,9 +263,9 @@ func ValidateKubeletFlags(f *KubeletFlags) error {
}
}
if len(unknownLabels) > 0 {
// TODO(liggitt): in 1.15, return an error
// TODO(liggitt): in 1.16, return an error
klog.Warningf("unknown 'kubernetes.io' or 'k8s.io' labels specified with --node-labels: %v", unknownLabels.List())
klog.Warningf("in 1.15, --node-labels in the 'kubernetes.io' namespace must begin with an allowed prefix (%s) or be in the specifically allowed set (%s)", strings.Join(kubeletapis.KubeletLabelNamespaces(), ", "), strings.Join(kubeletapis.KubeletLabels(), ", "))
klog.Warningf("in 1.16, --node-labels in the 'kubernetes.io' namespace must begin with an allowed prefix (%s) or be in the specifically allowed set (%s)", strings.Join(kubeletapis.KubeletLabelNamespaces(), ", "), strings.Join(kubeletapis.KubeletLabels(), ", "))
}
return nil