Skip to content

Commit 72ff530

Browse files
authored
Merge pull request kubernetes#85290 from ialidzhikov/enh/calico-cluster-service-removal
Clean up cluster-service label from calico-policy-controller
2 parents de63e57 + 0e93282 commit 72ff530

39 files changed

+0
-39
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
33
metadata:
44
name: bgpconfigurations.crd.projectcalico.org
55
labels:
6-
kubernetes.io/cluster-service: "true"
76
addonmanager.kubernetes.io/mode: Reconcile
87
spec:
98
scope: Cluster

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
33
metadata:
44
name: bgppeers.crd.projectcalico.org
55
labels:
6-
kubernetes.io/cluster-service: "true"
76
addonmanager.kubernetes.io/mode: Reconcile
87
spec:
98
scope: Cluster

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ kind: CustomResourceDefinition
33
metadata:
44
name: blockaffinities.crd.projectcalico.org
55
labels:
6-
kubernetes.io/cluster-service: "true"
76
addonmanager.kubernetes.io/mode: Reconcile
87
spec:
98
scope: Cluster

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ metadata:
44
name: calico
55
namespace: kube-system
66
labels:
7-
kubernetes.io/cluster-service: "true"
87
addonmanager.kubernetes.io/mode: Reconcile
98
rules:
109
# The CNI plugin needs to get pods, nodes, and namespaces.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ kind: ClusterRoleBinding
33
metadata:
44
name: calico
55
labels:
6-
kubernetes.io/cluster-service: "true"
76
addonmanager.kubernetes.io/mode: Reconcile
87
roleRef:
98
apiGroup: rbac.authorization.k8s.io

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1
33
metadata:
44
name: calico-cpva
55
labels:
6-
kubernetes.io/cluster-service: "true"
76
addonmanager.kubernetes.io/mode: Reconcile
87
rules:
98
- apiGroups: [""]

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1
33
metadata:
44
name: calico-cpva
55
labels:
6-
kubernetes.io/cluster-service: "true"
76
addonmanager.kubernetes.io/mode: Reconcile
87
subjects:
98
- kind: ServiceAccount

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ metadata:
44
name: calico-cpva
55
namespace: kube-system
66
labels:
7-
kubernetes.io/cluster-service: "true"
87
addonmanager.kubernetes.io/mode: Reconcile

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ metadata:
44
name: calico-node
55
namespace: kube-system
66
labels:
7-
kubernetes.io/cluster-service: "true"
87
addonmanager.kubernetes.io/mode: Reconcile
98
k8s-app: calico-node
109
spec:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ metadata:
44
name: calico-node-vertical-autoscaler
55
namespace: kube-system
66
labels:
7-
kubernetes.io/cluster-service: "true"
87
addonmanager.kubernetes.io/mode: Reconcile
98
data:
109
node-autoscaler: |-

0 commit comments

Comments
 (0)