From b61e95aa9352558d48f633ad10125204a510ce80 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Wed, 27 Sep 2017 16:56:17 -0700 Subject: [PATCH] Fix kubeadm labels so they work across upgrade --- .../kubernetes/installation/hosted/kubeadm/1.5/calico.yaml | 4 ++-- .../kubernetes/installation/hosted/kubeadm/1.6/calico.yaml | 4 ++-- .../kubernetes/installation/hosted/kubeadm/1.5/calico.yaml | 4 ++-- .../kubernetes/installation/hosted/kubeadm/1.6/calico.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/master/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml b/master/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml index 918832a0de3..0aa42f64d63 100644 --- a/master/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml +++ b/master/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml @@ -299,7 +299,7 @@ metadata: name: calico-policy-controller namespace: kube-system labels: - k8s-app: calico-policy + k8s-app: calico-policy-controller spec: # Turn this deployment off in favor of the kube-controllers deployment above. replicas: 0 @@ -310,7 +310,7 @@ spec: name: calico-policy-controller namespace: kube-system labels: - k8s-app: calico-policy + k8s-app: calico-policy-controller spec: hostNetwork: true containers: diff --git a/master/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml b/master/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml index 1c3e2563974..4d1ba4ab124 100644 --- a/master/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml +++ b/master/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml @@ -331,7 +331,7 @@ metadata: name: calico-policy-controller namespace: kube-system labels: - k8s-app: calico-policy + k8s-app: calico-policy-controller spec: # Turn this deployment off in favor of the kube-controllers deployment above. replicas: 0 @@ -342,7 +342,7 @@ spec: name: calico-policy-controller namespace: kube-system labels: - k8s-app: calico-policy + k8s-app: calico-policy-controller spec: hostNetwork: true serviceAccountName: calico-kube-controllers diff --git a/v2.6/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml b/v2.6/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml index 918832a0de3..0aa42f64d63 100644 --- a/v2.6/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml +++ b/v2.6/getting-started/kubernetes/installation/hosted/kubeadm/1.5/calico.yaml @@ -299,7 +299,7 @@ metadata: name: calico-policy-controller namespace: kube-system labels: - k8s-app: calico-policy + k8s-app: calico-policy-controller spec: # Turn this deployment off in favor of the kube-controllers deployment above. replicas: 0 @@ -310,7 +310,7 @@ spec: name: calico-policy-controller namespace: kube-system labels: - k8s-app: calico-policy + k8s-app: calico-policy-controller spec: hostNetwork: true containers: diff --git a/v2.6/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml b/v2.6/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml index 1c3e2563974..4d1ba4ab124 100644 --- a/v2.6/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml +++ b/v2.6/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml @@ -331,7 +331,7 @@ metadata: name: calico-policy-controller namespace: kube-system labels: - k8s-app: calico-policy + k8s-app: calico-policy-controller spec: # Turn this deployment off in favor of the kube-controllers deployment above. replicas: 0 @@ -342,7 +342,7 @@ spec: name: calico-policy-controller namespace: kube-system labels: - k8s-app: calico-policy + k8s-app: calico-policy-controller spec: hostNetwork: true serviceAccountName: calico-kube-controllers