Skip to content

Commit cdf0a8a

Browse files
LalatenduMohantyPer Goncalves da Silva
andauthored
rename control-plane labels to operator-controller-controller-manager (#969)
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]>
1 parent 1e5df38 commit cdf0a8a

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

config/base/manager/manager.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apiVersion: v1
22
kind: Namespace
33
metadata:
44
labels:
5-
control-plane: controller-manager
65
pod-security.kubernetes.io/enforce: restricted
76
pod-security.kubernetes.io/enforce-version: latest
87
name: system
@@ -15,18 +14,18 @@ metadata:
1514
annotations:
1615
kubectl.kubernetes.io/default-logs-container: manager
1716
labels:
18-
control-plane: controller-manager
17+
control-plane: operator-controller-controller-manager
1918
spec:
2019
selector:
2120
matchLabels:
22-
control-plane: controller-manager
21+
control-plane: operator-controller-controller-manager
2322
replicas: 1
2423
template:
2524
metadata:
2625
annotations:
2726
kubectl.kubernetes.io/default-container: manager
2827
labels:
29-
control-plane: controller-manager
28+
control-plane: operator-controller-controller-manager
3029
spec:
3130
affinity:
3231
nodeAffinity:
@@ -106,7 +105,7 @@ spec:
106105
cpu: 5m
107106
memory: 64Mi
108107
terminationMessagePolicy: FallbackToLogsOnError
109-
serviceAccountName: controller-manager
108+
serviceAccountName: operator-controller-controller-manager
110109
terminationGracePeriodSeconds: 10
111110
volumes:
112111
- name: cache

config/base/prometheus/monitor.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
44
kind: ServiceMonitor
55
metadata:
66
labels:
7-
control-plane: controller-manager
7+
control-plane: operator-controller-controller-manager
88
name: controller-manager-metrics-monitor
99
namespace: system
1010
spec:
@@ -17,4 +17,4 @@ spec:
1717
insecureSkipVerify: true
1818
selector:
1919
matchLabels:
20-
control-plane: controller-manager
20+
control-plane: operator-controller-controller-manager

config/base/rbac/auth_proxy_service.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
kind: Service
33
metadata:
44
labels:
5-
control-plane: controller-manager
5+
control-plane: operator-controller-controller-manager
66
name: controller-manager-metrics-service
77
namespace: system
88
spec:
@@ -12,4 +12,4 @@ spec:
1212
protocol: TCP
1313
targetPort: https
1414
selector:
15-
control-plane: controller-manager
15+
control-plane: operator-controller-controller-manager

test/upgrade-e2e/post_upgrade_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestClusterExtensionAfterOLMUpgrade(t *testing.T) {
2727
t.Log("Starting checks after OLM upgrade")
2828
ctx := context.Background()
2929

30-
managerLabelSelector := labels.Set{"control-plane": "controller-manager"}
30+
managerLabelSelector := labels.Set{"control-plane": "operator-controller-controller-manager"}
3131

3232
t.Log("Checking that the controller-manager deployment is updated")
3333
require.EventuallyWithT(t, func(ct *assert.CollectT) {

0 commit comments

Comments
 (0)