Merge pull request #1145 from caseydavenport/fix-labels

Fix kubeadm labels so they work across upgrade
projectcalico · Sep 27, 2017 · 9b55022 · 9b55022
2 parents 4b7aa0e + b61e95a
commit 9b55022
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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