Merge pull request #85290 from ialidzhikov/enh/calico-cluster-service-removal

Clean up cluster-service label from calico-policy-controller

cluster/addons/calico-policy-controller/bgpconfigurations-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: bgpconfigurations.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/bgppeers-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: bgppeers.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/blockaffinity-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: blockaffinities.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/calico-clusterrole.yaml

@@ -4,7 +4,6 @@ metadata:
   name: calico
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 rules:
   # The CNI plugin needs to get pods, nodes, and namespaces.

cluster/addons/calico-policy-controller/calico-clusterrolebinding.yaml

@@ -3,7 +3,6 @@ kind: ClusterRoleBinding
 metadata:
   name: calico
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 roleRef:
   apiGroup: rbac.authorization.k8s.io

cluster/addons/calico-policy-controller/calico-cpva-clusterrole.yaml

@@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: calico-cpva
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 rules:
   - apiGroups: [""]

cluster/addons/calico-policy-controller/calico-cpva-clusterrolebinding.yaml

@@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: calico-cpva
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 subjects:
   - kind: ServiceAccount

cluster/addons/calico-policy-controller/calico-cpva-serviceaccount.yaml

@@ -4,5 +4,4 @@ metadata:
   name: calico-cpva
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile

cluster/addons/calico-policy-controller/calico-node-daemonset.yaml

@@ -4,7 +4,6 @@ metadata:
   name: calico-node
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
     k8s-app: calico-node
 spec:

cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-configmap.yaml

@@ -4,7 +4,6 @@ metadata:
   name: calico-node-vertical-autoscaler
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 data:
   node-autoscaler: |-

cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-deployment.yaml

@@ -5,7 +5,6 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: calico-node-autoscaler
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1

cluster/addons/calico-policy-controller/calico-serviceaccount.yaml

@@ -4,5 +4,4 @@ metadata:
   name: calico
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile

cluster/addons/calico-policy-controller/clusterinformations-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: clusterinformations.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/felixconfigurations-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: felixconfigurations.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/globalbgpconfig-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: globalbgpconfigs.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/globalfelixconfig-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: globalfelixconfigs.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/globalnetworkpolicy-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: globalnetworkpolicies.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/globalnetworksets-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: globalnetworksets.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/hostendpoints-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: hostendpoints.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/ipamblock-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: ipamblocks.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/ipamconfig-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: ipamconfigs.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/ipamhandle-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: ipamhandles.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/ippool-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: ippools.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Cluster

cluster/addons/calico-policy-controller/networkpolicies-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: networkpolicies.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Namespaced

cluster/addons/calico-policy-controller/networkset-crd.yaml

@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
 metadata:
   name: networksets.crd.projectcalico.org
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   scope: Namespaced

cluster/addons/calico-policy-controller/podsecuritypolicies/calico-node-psp-binding.yaml

@@ -5,7 +5,6 @@ metadata:
   namespace: kube-system
   labels:
     addonmanager.kubernetes.io/mode: Reconcile
-    kubernetes.io/cluster-service: "true"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

cluster/addons/calico-policy-controller/typha-deployment.yaml

@@ -4,7 +4,6 @@ metadata:
   name: calico-typha
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
     k8s-app: calico-typha
 spec:

cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-clusterrole.yaml

@@ -3,7 +3,6 @@ kind: ClusterRole
 metadata:
   name: typha-cpha
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 rules:
   - apiGroups: [""]

cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-clusterrolebinding.yaml

@@ -3,7 +3,6 @@ kind: ClusterRoleBinding
 metadata:
   name: typha-cpha
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 roleRef:
   apiGroup: rbac.authorization.k8s.io

cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-configmap.yaml

@@ -4,7 +4,6 @@ metadata:
   name: calico-typha-horizontal-autoscaler
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 data:
   ladder: |-

cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-deployment.yaml

@@ -5,7 +5,6 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: calico-typha-autoscaler
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1

cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-role.yaml

@@ -4,7 +4,6 @@ metadata:
   name: typha-cpha
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 rules:
   - apiGroups: [""]

cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-rolebinding.yaml

@@ -4,7 +4,6 @@ metadata:
   name: typha-cpha
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 roleRef:
   apiGroup: rbac.authorization.k8s.io

cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-serviceaccount.yaml

@@ -4,5 +4,4 @@ metadata:
   name: typha-cpha
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile

cluster/addons/calico-policy-controller/typha-vertical-autoscaler-clusterrole.yaml

@@ -3,7 +3,6 @@ kind: ClusterRole
 metadata:
   name: typha-cpva
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 rules:
   - apiGroups: [""]

cluster/addons/calico-policy-controller/typha-vertical-autoscaler-clusterrolebinding.yaml

@@ -3,7 +3,6 @@ kind: ClusterRoleBinding
 metadata:
   name: typha-cpva
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 roleRef:
   apiGroup: rbac.authorization.k8s.io

cluster/addons/calico-policy-controller/typha-vertical-autoscaler-configmap.yaml

@@ -4,7 +4,6 @@ metadata:
   name: calico-typha-vertical-autoscaler
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 data:
   typha-autoscaler: |-

cluster/addons/calico-policy-controller/typha-vertical-autoscaler-deployment.yaml

@@ -5,7 +5,6 @@ metadata:
   namespace: kube-system
   labels:
     k8s-app: calico-typha-autoscaler
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
 spec:
   replicas: 1

cluster/addons/calico-policy-controller/typha-vertical-autoscaler-serviceaccount.yaml

@@ -4,5 +4,4 @@ metadata:
   name: typha-cpva
   namespace: kube-system
   labels:
-    kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile