diff --git a/roles/kubernetes-apps/ansible/files/coredns-sa.yml b/roles/kubernetes-apps/ansible/files/coredns-sa.yml
index 64d9c4dae27d29ae9eeabd9c763861da69cb5d82..daebd6a8e00b98d07a16b41614c15d3cdf489e61 100644
--- a/roles/kubernetes-apps/ansible/files/coredns-sa.yml
+++ b/roles/kubernetes-apps/ansible/files/coredns-sa.yml
@@ -5,5 +5,4 @@ metadata:
name: coredns
namespace: kube-system
labels:
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
diff --git a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
index c7337eef9f53091a012a4888760a5e71a580764e..81903f3dcec6c70f7a381eed8ed9637d9119dbad 100644
--- a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
@@ -6,7 +6,6 @@ metadata:
namespace: kube-system
labels:
k8s-app: "kube-dns{{ coredns_ordinal_suffix }}"
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/name: "coredns{{ coredns_ordinal_suffix }}"
spec:
diff --git a/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2
index 5f7f6d09b92ed6e78b67741da4443fd9a14d59cc..7903e2629be1f8e1442a2e36d31447907a07732a 100644
--- a/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2
@@ -6,7 +6,6 @@ metadata:
namespace: kube-system
labels:
k8s-app: kube-dns{{ coredns_ordinal_suffix }}
- kubernetes.io/cluster-service: "true"
kubernetes.io/name: "coredns{{ coredns_ordinal_suffix }}"
addonmanager.kubernetes.io/mode: Reconcile
annotations:
diff --git a/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2 b/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
index 34b8c8c193b34f365798a96a17c2154d684ec2cd..024f5adde9fc6a8b4d60a9033af43c7728a3ffc0 100644
--- a/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
@@ -228,7 +228,6 @@ apiVersion: v1
metadata:
labels:
k8s-app: kubernetes-dashboard
- kubernetes.io/cluster-service: "true"
name: kubernetes-dashboard
namespace: kube-system
spec:
diff --git a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2 b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
index 53e691c9577aeec97a5db6dce377a1c6218894fb..4a966e47767579d26a8ec0edf4de0ffed4eca749 100644
--- a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
@@ -20,7 +20,6 @@ metadata:
namespace: kube-system
labels:
k8s-app: dns-autoscaler{{ coredns_ordinal_suffix }}
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
spec:
selector:
diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-psp.yml.j2 b/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-psp.yml.j2
index 32fb0c1a0e15bf064128db6161631f733e1dde13..9be7c84f791f97988f72cacb3675aaf06dd9dc44 100644
--- a/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-psp.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/netchecker-agent-hostnet-psp.yml.j2
@@ -11,7 +11,6 @@ metadata:
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default'
{% endif %}
labels:
- kubernetes.io/cluster-service: 'true'
addonmanager.kubernetes.io/mode: Reconcile
spec:
privileged: false
diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-agent-sa.yml.j2 b/roles/kubernetes-apps/ansible/templates/netchecker-agent-sa.yml.j2
index d842faa6c076b0dd1b1fcfd3b340cb1cfd00df6c..c54404327790a9a1144471f45a2a98986527252a 100644
--- a/roles/kubernetes-apps/ansible/templates/netchecker-agent-sa.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/netchecker-agent-sa.yml.j2
@@ -3,5 +3,3 @@ kind: ServiceAccount
metadata:
name: netchecker-agent
namespace: {{ netcheck_namespace }}
- labels:
- kubernetes.io/cluster-service: "true"
diff --git a/roles/kubernetes-apps/ansible/templates/netchecker-server-sa.yml.j2 b/roles/kubernetes-apps/ansible/templates/netchecker-server-sa.yml.j2
index 26d15f3a860c3cebef3c6b321818dae073cbb8d3..e3ec07ff3463f1c4744e5b5e07a7eebc4fd90d84 100644
--- a/roles/kubernetes-apps/ansible/templates/netchecker-server-sa.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/netchecker-server-sa.yml.j2
@@ -3,5 +3,3 @@ kind: ServiceAccount
metadata:
name: netchecker-server
namespace: {{ netcheck_namespace }}
- labels:
- kubernetes.io/cluster-service: "true"
diff --git a/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2 b/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
index 9f0c0ceec56703262b0839232955192e5d207ef7..158757523190f0f016776baedeb39854b307705d 100644
--- a/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
@@ -5,7 +5,6 @@ metadata:
namespace: kube-system
labels:
k8s-app: kube-dns
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
spec:
selector:
diff --git a/roles/kubernetes-apps/ansible/templates/nodelocaldns-sa.yml.j2 b/roles/kubernetes-apps/ansible/templates/nodelocaldns-sa.yml.j2
index 5d18742afb790c581a56a62aea93576c7da42194..bd962d8ca50fd90b0ea104321e3180fde7516c70 100644
--- a/roles/kubernetes-apps/ansible/templates/nodelocaldns-sa.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/nodelocaldns-sa.yml.j2
@@ -4,5 +4,4 @@ metadata:
name: nodelocaldns
namespace: kube-system
labels:
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
diff --git a/roles/kubernetes-apps/cluster_roles/files/oci-rbac.yml b/roles/kubernetes-apps/cluster_roles/files/oci-rbac.yml
index 58eb2afa9dc286429d27e1c0cf90b2dfb3bc3b86..a1ecb214b252779499bf74285e24d3ca26c72e68 100644
--- a/roles/kubernetes-apps/cluster_roles/files/oci-rbac.yml
+++ b/roles/kubernetes-apps/cluster_roles/files/oci-rbac.yml
@@ -9,8 +9,6 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole
metadata:
name: system:cloud-controller-manager
- labels:
- kubernetes.io/cluster-service: "true"
rules:
- apiGroups:
- ""
diff --git a/roles/kubernetes-apps/cluster_roles/templates/psp-cr.yml.j2 b/roles/kubernetes-apps/cluster_roles/templates/psp-cr.yml.j2
index c1199f9381e6d816f9fccb422e5ca743b3316dc9..d9f0e8d53bd87fe231aca3cff07f597942237d67 100644
--- a/roles/kubernetes-apps/cluster_roles/templates/psp-cr.yml.j2
+++ b/roles/kubernetes-apps/cluster_roles/templates/psp-cr.yml.j2
@@ -4,7 +4,6 @@ kind: ClusterRole
metadata:
name: psp:privileged
labels:
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
rules:
- apiGroups:
@@ -21,7 +20,6 @@ kind: ClusterRole
metadata:
name: psp:restricted
labels:
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
rules:
- apiGroups:
diff --git a/roles/kubernetes-apps/cluster_roles/templates/psp-crb.yml.j2 b/roles/kubernetes-apps/cluster_roles/templates/psp-crb.yml.j2
index 6cade2883b772f73b3d32092cf2198ddc879c0e8..7513c3c5fa61a5d942bcaaa0c9dae93450611b97 100644
--- a/roles/kubernetes-apps/cluster_roles/templates/psp-crb.yml.j2
+++ b/roles/kubernetes-apps/cluster_roles/templates/psp-crb.yml.j2
@@ -40,7 +40,6 @@ metadata:
nodes to mirror pods bound to themselves.'
labels:
addonmanager.kubernetes.io/mode: Reconcile
- kubernetes.io/cluster-service: 'true'
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
diff --git a/roles/kubernetes-apps/cluster_roles/templates/psp.yml.j2 b/roles/kubernetes-apps/cluster_roles/templates/psp.yml.j2
index b96186e3ebdfc7ef3dab5b48bc45778ce3dc6fde..1e1e070e189c1a79748ce3df284ba8bbeefc99b8 100644
--- a/roles/kubernetes-apps/cluster_roles/templates/psp.yml.j2
+++ b/roles/kubernetes-apps/cluster_roles/templates/psp.yml.j2
@@ -11,7 +11,6 @@ metadata:
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default'
{% endif %}
labels:
- kubernetes.io/cluster-service: 'true'
addonmanager.kubernetes.io/mode: Reconcile
spec:
privileged: false
@@ -53,7 +52,6 @@ metadata:
annotations:
seccomp.security.alpha.kubernetes.io/allowedProfileNames: '*'
labels:
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
spec:
privileged: true
diff --git a/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/psp-cephfs-provisioner.yml.j2 b/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/psp-cephfs-provisioner.yml.j2
index b1e9b0ac117f9b4e7096bacc80fb3232a92d8073..291870c987c2779831a6908ce9753a6882280789 100644
--- a/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/psp-cephfs-provisioner.yml.j2
+++ b/roles/kubernetes-apps/external_provisioner/cephfs_provisioner/templates/psp-cephfs-provisioner.yml.j2
@@ -11,7 +11,6 @@ metadata:
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default'
{% endif %}
labels:
- kubernetes.io/cluster-service: 'true'
addonmanager.kubernetes.io/mode: Reconcile
spec:
privileged: false
diff --git a/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-psp.yml.j2 b/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-psp.yml.j2
index af56db6bc822861bc8ddc1b3bd32e9ca3ac2533c..2b8c310c2156f956aa71e90aa1aead5ab22e2e3a 100644
--- a/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-psp.yml.j2
+++ b/roles/kubernetes-apps/external_provisioner/local_path_provisioner/templates/local-path-storage-psp.yml.j2
@@ -11,7 +11,6 @@ metadata:
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default'
{% endif %}
labels:
- kubernetes.io/cluster-service: 'true'
addonmanager.kubernetes.io/mode: Reconcile
spec:
privileged: true
diff --git a/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-psp.yml.j2 b/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-psp.yml.j2
index 12bdd04010816cb9cd74c23787978b7ec6eeb98d..6ec5601b258326824b3656e27a6db2acc8b7182f 100644
--- a/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-psp.yml.j2
+++ b/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-psp.yml.j2
@@ -11,7 +11,6 @@ metadata:
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default'
{% endif %}
labels:
- kubernetes.io/cluster-service: 'true'
addonmanager.kubernetes.io/mode: Reconcile
spec:
privileged: true
diff --git a/roles/kubernetes-apps/external_provisioner/rbd_provisioner/templates/psp-rbd-provisioner.yml.j2 b/roles/kubernetes-apps/external_provisioner/rbd_provisioner/templates/psp-rbd-provisioner.yml.j2
index 947675514ddf438d502984573867b16654b05d32..a314f0104f5701efc467e51e06ad8ecfd486477b 100644
--- a/roles/kubernetes-apps/external_provisioner/rbd_provisioner/templates/psp-rbd-provisioner.yml.j2
+++ b/roles/kubernetes-apps/external_provisioner/rbd_provisioner/templates/psp-rbd-provisioner.yml.j2
@@ -11,7 +11,6 @@ metadata:
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default'
{% endif %}
labels:
- kubernetes.io/cluster-service: 'true'
addonmanager.kubernetes.io/mode: Reconcile
spec:
privileged: false
diff --git a/roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2 b/roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2
index 09b8157250aae2c87434cfc3f8ea43fcdafc593d..d7eb974a31b990b94a65b43a26d68a57b58926cc 100644
--- a/roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2
+++ b/roles/kubernetes-apps/helm/templates/tiller-sa.yml.j2
@@ -4,5 +4,3 @@ kind: ServiceAccount
metadata:
name: tiller
namespace: {{ tiller_namespace }}
- labels:
- kubernetes.io/cluster-service: "true"
diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/psp-ingress-nginx.yml.j2 b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/psp-ingress-nginx.yml.j2
index 0eac6aa2c9d835ea0ecfed2ae8b446cbb99c8066..c83ea435c7910bd3900b77628aa853aa185299c2 100644
--- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/psp-ingress-nginx.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/psp-ingress-nginx.yml.j2
@@ -11,7 +11,6 @@ metadata:
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default'
{% endif %}
labels:
- kubernetes.io/cluster-service: 'true'
addonmanager.kubernetes.io/mode: Reconcile
spec:
privileged: false
diff --git a/roles/kubernetes-apps/metrics_server/templates/auth-delegator.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/auth-delegator.yaml.j2
index cbaa6250689dd5594286ee3176be23b7f77c9160..92f82047c1535f48fb7d36a62681c7de25ac8b3e 100644
--- a/roles/kubernetes-apps/metrics_server/templates/auth-delegator.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/auth-delegator.yaml.j2
@@ -3,7 +3,6 @@ kind: ClusterRoleBinding
metadata:
name: metrics-server:system:auth-delegator
labels:
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/roles/kubernetes-apps/metrics_server/templates/auth-reader.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/auth-reader.yaml.j2
index 60da052c1c5df4dead83fbdd659ced9837ded2c8..e02b8ead9295c5057b028a398dc30f90ecf01fe4 100644
--- a/roles/kubernetes-apps/metrics_server/templates/auth-reader.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/auth-reader.yaml.j2
@@ -4,7 +4,6 @@ metadata:
name: metrics-server-auth-reader
namespace: kube-system
labels:
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/roles/kubernetes-apps/metrics_server/templates/metrics-apiservice.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/metrics-apiservice.yaml.j2
index 51770da689e7ead4523cfe9f1e0d86ed04a8010f..fae0b354e910ec20040037ae7fcc5129e6ece949 100644
--- a/roles/kubernetes-apps/metrics_server/templates/metrics-apiservice.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/metrics-apiservice.yaml.j2
@@ -3,7 +3,6 @@ kind: APIService
metadata:
name: v1beta1.metrics.k8s.io
labels:
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
spec:
service:
diff --git a/roles/kubernetes-apps/metrics_server/templates/metrics-server-cm.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/metrics-server-cm.yaml.j2
index f969ff7590def135212fb4219fe4c2980cb65fd4..e95d966217711c3fbd07e2c122f958ca32aae1a3 100644
--- a/roles/kubernetes-apps/metrics_server/templates/metrics-server-cm.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/metrics-server-cm.yaml.j2
@@ -5,7 +5,6 @@ metadata:
name: metrics-server-config
namespace: kube-system
labels:
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: EnsureExists
data:
NannyConfiguration: |-
diff --git a/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
index 9e27626e7b72c0f3e95d508802536aaf95530e7c..733918bc557080d6894802b8b2decb201f48da84 100644
--- a/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
@@ -6,7 +6,6 @@ metadata:
namespace: kube-system
labels:
app.kubernetes.io/name: metrics-server
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
version: {{ metrics_server_version }}
spec:
diff --git a/roles/kubernetes-apps/metrics_server/templates/metrics-server-sa.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/metrics-server-sa.yaml.j2
index fa79edca412a0801fbc8d36c706716690d5bdad8..94444ca813f989c9dd373426ab025f0e2abb7f8e 100644
--- a/roles/kubernetes-apps/metrics_server/templates/metrics-server-sa.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/metrics-server-sa.yaml.j2
@@ -5,5 +5,4 @@ metadata:
name: metrics-server
namespace: kube-system
labels:
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
diff --git a/roles/kubernetes-apps/metrics_server/templates/metrics-server-service.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/metrics-server-service.yaml.j2
index aa01cd64577423f496439417b5651ac4c2ed2a7c..9af0aa214e8df3501b9942fe1b821d6e48e09660 100644
--- a/roles/kubernetes-apps/metrics_server/templates/metrics-server-service.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/metrics-server-service.yaml.j2
@@ -5,7 +5,6 @@ metadata:
namespace: kube-system
labels:
addonmanager.kubernetes.io/mode: Reconcile
- kubernetes.io/cluster-service: "true"
app.kubernetes.io/name: "metrics-server"
spec:
selector:
diff --git a/roles/kubernetes-apps/metrics_server/templates/resource-reader-clusterrolebinding.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/resource-reader-clusterrolebinding.yaml.j2
index 0e59d5ed0524b1dd155b1eaae788b40848b5c4dc..038cfd80aa0d1378dab2ae6414edde7a2f94a3c0 100644
--- a/roles/kubernetes-apps/metrics_server/templates/resource-reader-clusterrolebinding.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/resource-reader-clusterrolebinding.yaml.j2
@@ -4,7 +4,6 @@ kind: ClusterRoleBinding
metadata:
name: system:metrics-server
labels:
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/roles/kubernetes-apps/metrics_server/templates/resource-reader.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/resource-reader.yaml.j2
index f457eb6a1092675beb2ee818aa90e4dbbde2a25e..9f7bc7f383e76095fbcf393531a020e906a6f383 100644
--- a/roles/kubernetes-apps/metrics_server/templates/resource-reader.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/resource-reader.yaml.j2
@@ -3,7 +3,6 @@ kind: ClusterRole
metadata:
name: system:metrics-server
labels:
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
rules:
- apiGroups:
diff --git a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2 b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
index 628e02671d77b4d4a5417ad07fc201a67c034891..cf4516f4aeab466b8f0f03c5edc912efe5de3e86 100644
--- a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
+++ b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
@@ -5,21 +5,18 @@ metadata:
namespace: kube-system
labels:
k8s-app: calico-kube-controllers
- kubernetes.io/cluster-service: "true"
spec:
replicas: 1
strategy:
type: Recreate
selector:
matchLabels:
- kubernetes.io/cluster-service: "true"
k8s-app: calico-kube-controllers
template:
metadata:
name: calico-kube-controllers
namespace: kube-system
labels:
- kubernetes.io/cluster-service: "true"
k8s-app: calico-kube-controllers
spec:
nodeSelector:
diff --git a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-sa.yml.j2 b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-sa.yml.j2
index e42e89d1894628f9cd5931c2b721038d1f938b57..269d0a14d9b7cdd011019ec65f6837d96da34fd1 100644
--- a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-sa.yml.j2
+++ b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-sa.yml.j2
@@ -4,5 +4,3 @@ kind: ServiceAccount
metadata:
name: calico-kube-controllers
namespace: kube-system
- labels:
- kubernetes.io/cluster-service: "true"
diff --git a/roles/kubernetes-apps/registry/README.md b/roles/kubernetes-apps/registry/README.md
index 1c7d1f3032352278e41e34c8033232c868244616..0a943eddd0ff5870ed0e0a7a59ded90afa6c3b54 100644
--- a/roles/kubernetes-apps/registry/README.md
+++ b/roles/kubernetes-apps/registry/README.md
@@ -38,8 +38,6 @@ kind: PersistentVolume
apiVersion: v1
metadata:
name: kube-system-kube-registry-pv
- labels:
- kubernetes.io/cluster-service: "true"
spec:
{% if pillar.get('cluster_registry_disk_type', '') == 'gce' %}
capacity:
@@ -81,8 +79,6 @@ apiVersion: v1
metadata:
name: kube-registry-pvc
namespace: kube-system
- labels:
- kubernetes.io/cluster-service: "true"
spec:
accessModes:
- ReadWriteOnce
@@ -112,7 +108,6 @@ metadata:
labels:
k8s-app: registry
version: v0
- kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
@@ -123,7 +118,6 @@ spec:
labels:
k8s-app: registry
version: v0
- kubernetes.io/cluster-service: "true"
spec:
containers:
- name: registry
@@ -165,7 +159,6 @@ metadata:
namespace: kube-system
labels:
k8s-app: registry
- kubernetes.io/cluster-service: "true"
kubernetes.io/name: "KubeRegistry"
spec:
selector:
@@ -193,7 +186,6 @@ metadata:
namespace: kube-system
labels:
k8s-app: kube-registry-proxy
- kubernetes.io/cluster-service: "true"
version: v0.4
spec:
template:
@@ -201,7 +193,6 @@ spec:
labels:
k8s-app: kube-registry-proxy
kubernetes.io/name: "kube-registry-proxy"
- kubernetes.io/cluster-service: "true"
version: v0.4
spec:
containers:
diff --git a/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
index b3947eb18956e2bbdf9dc0b3221feedc9669dd3c..e431b323d73fd29afd93bb3aebc2f44cc12990d2 100644
--- a/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
@@ -6,7 +6,6 @@ metadata:
namespace: {{ registry_namespace }}
labels:
k8s-app: registry-proxy
- kubernetes.io/cluster-service: "true"
version: v{{ registry_proxy_image_tag }}
spec:
selector:
@@ -18,7 +17,6 @@ spec:
labels:
k8s-app: registry-proxy
kubernetes.io/name: "registry-proxy"
- kubernetes.io/cluster-service: "true"
version: v{{ registry_proxy_image_tag }}
spec:
priorityClassName: {% if registry_namespace == 'kube-system' %}system-node-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
diff --git a/roles/kubernetes-apps/registry/templates/registry-proxy-psp.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-proxy-psp.yml.j2
index 9b12be2209132d2c5c67ea515e4ee3449e75c060..20b10896292c43a11586553aa5e4cf4d821e8aaf 100644
--- a/roles/kubernetes-apps/registry/templates/registry-proxy-psp.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-proxy-psp.yml.j2
@@ -11,7 +11,6 @@ metadata:
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default'
{% endif %}
labels:
- kubernetes.io/cluster-service: 'true'
addonmanager.kubernetes.io/mode: Reconcile
spec:
privileged: false
diff --git a/roles/kubernetes-apps/registry/templates/registry-proxy-sa.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-proxy-sa.yml.j2
index 0c18fa22769321d3a53518aada7bfa8ab6106422..418ee5fc48ab7f8d2fc2632ac807334cb4edc55a 100644
--- a/roles/kubernetes-apps/registry/templates/registry-proxy-sa.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-proxy-sa.yml.j2
@@ -3,5 +3,3 @@ kind: ServiceAccount
metadata:
name: registry-proxy
namespace: {{ registry_namespace }}
- labels:
- kubernetes.io/cluster-service: "true"
diff --git a/roles/kubernetes-apps/registry/templates/registry-psp.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-psp.yml.j2
index 512f8a4e7be89320938a708d4e7c872f29ce2c5e..5004cd8215e8a4cbe86360974e0911d79594eba3 100644
--- a/roles/kubernetes-apps/registry/templates/registry-psp.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-psp.yml.j2
@@ -11,7 +11,6 @@ metadata:
apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default'
{% endif %}
labels:
- kubernetes.io/cluster-service: 'true'
addonmanager.kubernetes.io/mode: Reconcile
spec:
privileged: false
diff --git a/roles/kubernetes-apps/registry/templates/registry-pvc.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-pvc.yml.j2
index 0db26db96c9303f835b0b56e34dda552d2ab2566..30b707460cead835b1c9a6a2931e2bd21b70eac9 100644
--- a/roles/kubernetes-apps/registry/templates/registry-pvc.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-pvc.yml.j2
@@ -5,7 +5,6 @@ metadata:
name: registry-pvc
namespace: {{ registry_namespace }}
labels:
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
spec:
accessModes:
diff --git a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
index 827f60a1ff052328384bfb524b5ce423612532c5..b3e46ff0edf1eebac1952bb40f416679cf35acfe 100644
--- a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
@@ -7,7 +7,6 @@ metadata:
labels:
k8s-app: registry
version: v{{ registry_image_tag }}
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
spec:
replicas: 1
@@ -20,7 +19,6 @@ spec:
labels:
k8s-app: registry
version: v{{ registry_image_tag }}
- kubernetes.io/cluster-service: "true"
spec:
priorityClassName: {% if registry_namespace == 'kube-system' %}system-cluster-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
serviceAccountName: registry
diff --git a/roles/kubernetes-apps/registry/templates/registry-sa.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-sa.yml.j2
index b9e48b8e13969370804abd820b2ab1b57410e300..20f95151abf594185ba48a3d8ea7663477096569 100644
--- a/roles/kubernetes-apps/registry/templates/registry-sa.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-sa.yml.j2
@@ -3,5 +3,3 @@ kind: ServiceAccount
metadata:
name: registry
namespace: {{ registry_namespace }}
- labels:
- kubernetes.io/cluster-service: "true"
diff --git a/roles/kubernetes-apps/registry/templates/registry-svc.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-svc.yml.j2
index 4e1b52fa494d3a8cfac7f5d55ff990eb300df2ec..4ebf8626b77640997322c351bdbf2429614a931c 100644
--- a/roles/kubernetes-apps/registry/templates/registry-svc.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-svc.yml.j2
@@ -6,7 +6,6 @@ metadata:
namespace: {{ registry_namespace }}
labels:
k8s-app: registry
- kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/name: "KubeRegistry"
spec:
diff --git a/roles/network_plugin/calico/templates/calico-node-sa.yml.j2 b/roles/network_plugin/calico/templates/calico-node-sa.yml.j2
index 68b1c286f9ba7ce445418db05a390251d69ff022..ea721b3f3d8f28c28205e85f55add543116c0051 100644
--- a/roles/network_plugin/calico/templates/calico-node-sa.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-node-sa.yml.j2
@@ -4,5 +4,3 @@ kind: ServiceAccount
metadata:
name: calico-node
namespace: kube-system
- labels:
- kubernetes.io/cluster-service: "true"
diff --git a/roles/network_plugin/canal/templates/canal-node-sa.yml.j2 b/roles/network_plugin/canal/templates/canal-node-sa.yml.j2
index aa168d15c14d43d493493fe23109c5f859cd45d3..582d55bbd9ba6f24b5065eae163d32206d94d83b 100644
--- a/roles/network_plugin/canal/templates/canal-node-sa.yml.j2
+++ b/roles/network_plugin/canal/templates/canal-node-sa.yml.j2
@@ -4,6 +4,3 @@ kind: ServiceAccount
metadata:
name: canal
namespace: kube-system
- labels:
- kubernetes.io/cluster-service: "true"
-
diff --git a/roles/network_plugin/cilium/templates/cilium-ds.yml.j2 b/roles/network_plugin/cilium/templates/cilium-ds.yml.j2
index 6166e9fe6ed5689374db6b46736f564a226c9754..370dba2257afd49625baa2e35846810a81e158fe 100755
--- a/roles/network_plugin/cilium/templates/cilium-ds.yml.j2
+++ b/roles/network_plugin/cilium/templates/cilium-ds.yml.j2
@@ -3,14 +3,12 @@ kind: DaemonSet
metadata:
labels:
k8s-app: cilium
- kubernetes.io/cluster-service: "true"
name: cilium
namespace: kube-system
spec:
selector:
matchLabels:
k8s-app: cilium
- kubernetes.io/cluster-service: "true"
template:
metadata:
annotations:
@@ -26,7 +24,6 @@ spec:
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated","operator":"Equal","value":"master","effect":"NoSchedule"}]'
labels:
k8s-app: cilium
- kubernetes.io/cluster-service: "true"
spec:
containers:
- args:
diff --git a/roles/network_plugin/contiv/templates/contiv-netmaster-serviceaccount.yml.j2 b/roles/network_plugin/contiv/templates/contiv-netmaster-serviceaccount.yml.j2
index 758ea449336307555a5cf3cb7e7bdca4f62e2a46..9f8e2c46744e76fc9cd19c2bffcb6218f68798fe 100644
--- a/roles/network_plugin/contiv/templates/contiv-netmaster-serviceaccount.yml.j2
+++ b/roles/network_plugin/contiv/templates/contiv-netmaster-serviceaccount.yml.j2
@@ -3,5 +3,3 @@ kind: ServiceAccount
metadata:
name: contiv-netmaster
namespace: kube-system
- labels:
- kubernetes.io/cluster-service: "true"
diff --git a/roles/network_plugin/contiv/templates/contiv-netplugin-serviceaccount.yml.j2 b/roles/network_plugin/contiv/templates/contiv-netplugin-serviceaccount.yml.j2
index 8d00ec8cb43f4d2cbba1a6eefbf7658cc04ff283..89f7f0a86ede5ea5a058c237fcb5e7baa4654d70 100644
--- a/roles/network_plugin/contiv/templates/contiv-netplugin-serviceaccount.yml.j2
+++ b/roles/network_plugin/contiv/templates/contiv-netplugin-serviceaccount.yml.j2
@@ -3,5 +3,3 @@ kind: ServiceAccount
metadata:
name: contiv-netplugin
namespace: kube-system
- labels:
- kubernetes.io/cluster-service: "true"