upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-04 22:33:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove the kubernetes.io/cluster-service label from the Deployment templates

Browse source
This commit is contained in:
Lucas Käldström 2017-02-02 22:08:47 +02:00
parent d6f7ae2ffb
commit 876153d491
No known key found for this signature in database
GPG key ID: 3FA3783D77751514
2 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/kubeadm/app/master/templates.go
View file

@ -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:

5
cmd/kubeadm/app/phases/addons/manifests.go
View file

@ -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"}]'