github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40886 from luxas/kubeadm_remove_clusterservice

Browse Source 
Automatic merge from submit-queue

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

**What this PR does / why we need it**:

As discussed on Slack, these labels have no function when not using the addon-manager, so it's best to remove them to avoid confusion.

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
@thockin @mikedanese @pires @MrHohn @bowei @dmmcquay @deads2k @philips
This commit is contained in:
Kubernetes Submit Queue 2017-02-06 04:06:05 -08:00 committed by GitHub
commit d504b2665e
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: metadata:
labels: labels:
k8s-app: kube-discovery k8s-app: kube-discovery
kubernetes.io/cluster-service: "true"
name: kube-discovery name: kube-discovery
namespace: kube-system namespace: kube-system
spec: spec:
@ -54,7 +53,6 @@ spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: kube-discovery k8s-app: kube-discovery
kubernetes.io/cluster-service: "true"
template: template:
metadata: metadata:
labels: labels:

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

@ -53,7 +53,6 @@ kind: DaemonSet
metadata: metadata:
labels: labels:
k8s-app: kube-proxy k8s-app: kube-proxy
kubernetes.io/cluster-service: "true"
name: kube-proxy name: kube-proxy
namespace: kube-system namespace: kube-system
spec: spec:
@ -64,7 +63,6 @@ spec:
metadata: metadata:
labels: labels:
k8s-app: kube-proxy k8s-app: kube-proxy
kubernetes.io/cluster-service: "true"
annotations: annotations:
# TODO: Move this to the beta tolerations field below as soon as the Tolerations field exists in PodSpec # 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"}]' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated","value":"master","effect":"NoSchedule"}]'
@ -102,7 +100,6 @@ kind: Deployment
metadata: metadata:
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
kubernetes.io/cluster-service: "true"
name: kube-dns name: kube-dns
namespace: kube-system namespace: kube-system
spec: spec:
@ -110,7 +107,6 @@ spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: kube-dns k8s-app: kube-dns
kubernetes.io/cluster-service: "true"
strategy: strategy:
rollingUpdate: rollingUpdate:
maxSurge: 1 maxSurge: 1
@ -120,7 +116,6 @@ spec:
metadata: metadata:
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
kubernetes.io/cluster-service: "true"
annotations: annotations:
# TODO: Move this to the beta tolerations field below as soon as the Tolerations field exists in PodSpec # 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"}]' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated","value":"master","effect":"NoSchedule"}]'