diff --git a/cmd/kubeadm/app/master/templates.go b/cmd/kubeadm/app/master/templates.go index 9c51ed88cbc..97b45bdb039 100644 --- a/cmd/kubeadm/app/master/templates.go +++ b/cmd/kubeadm/app/master/templates.go @@ -46,7 +46,6 @@ kind: Deployment metadata: labels: k8s-app: kube-discovery - kubernetes.io/cluster-service: "true" name: kube-discovery namespace: kube-system spec: @@ -54,7 +53,6 @@ spec: selector: matchLabels: k8s-app: kube-discovery - kubernetes.io/cluster-service: "true" template: metadata: labels: diff --git a/cmd/kubeadm/app/phases/addons/manifests.go b/cmd/kubeadm/app/phases/addons/manifests.go index f79b7e111a7..3d475551dd6 100644 --- a/cmd/kubeadm/app/phases/addons/manifests.go +++ b/cmd/kubeadm/app/phases/addons/manifests.go @@ -53,7 +53,6 @@ kind: DaemonSet metadata: labels: k8s-app: kube-proxy - kubernetes.io/cluster-service: "true" name: kube-proxy namespace: kube-system spec: @@ -64,7 +63,6 @@ spec: metadata: labels: k8s-app: kube-proxy - kubernetes.io/cluster-service: "true" annotations: # TODO: Move this to the beta tolerations field below as soon as the Tolerations field exists in PodSpec scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated","value":"master","effect":"NoSchedule"}]' @@ -102,7 +100,6 @@ kind: Deployment metadata: labels: k8s-app: kube-dns - kubernetes.io/cluster-service: "true" name: kube-dns namespace: kube-system spec: @@ -110,7 +107,6 @@ spec: selector: matchLabels: k8s-app: kube-dns - kubernetes.io/cluster-service: "true" strategy: rollingUpdate: maxSurge: 1 @@ -120,7 +116,6 @@ spec: metadata: labels: k8s-app: kube-dns - kubernetes.io/cluster-service: "true" annotations: # TODO: Move this to the beta tolerations field below as soon as the Tolerations field exists in PodSpec scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated","value":"master","effect":"NoSchedule"}]'