Skip to content

Commit f43e666

Browse files
committed
fix: labels according to kubernetes conventions
Fix is based on changes in kubebuilder.
1 parent 05f8b7b commit f43e666

29 files changed

+51
-250
lines changed

bundle/manifests/rhtas-operator-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@ apiVersion: monitoring.coreos.com/v1
22
kind: ServiceMonitor
33
metadata:
44
labels:
5-
app.kubernetes.io/component: metrics
6-
app.kubernetes.io/created-by: rhtas-operator
7-
app.kubernetes.io/instance: controller-manager-metrics-monitor
85
app.kubernetes.io/managed-by: kustomize
9-
app.kubernetes.io/name: servicemonitor
10-
app.kubernetes.io/part-of: rhtas-operator
11-
control-plane: operator-controller-manager
6+
app.kubernetes.io/name: rhtas-operator
7+
control-plane: controller-manager
128
name: rhtas-operator-controller-manager-metrics-monitor
139
spec:
1410
endpoints:
1511
- path: /metrics
1612
port: metrics
1713
selector:
1814
matchLabels:
19-
control-plane: operator-controller-manager
15+
app.kubernetes.io/name: rhtas-operator
16+
control-plane: controller-manager

bundle/manifests/rhtas-operator-controller-manager-metrics-service_v1_service.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ kind: Service
33
metadata:
44
creationTimestamp: null
55
labels:
6-
control-plane: operator-controller-manager
6+
app.kubernetes.io/managed-by: kustomize
7+
app.kubernetes.io/name: rhtas-operator
8+
control-plane: controller-manager
79
name: rhtas-operator-controller-manager-metrics-service
810
spec:
911
ports:
1012
- name: metrics
1113
port: 8080
1214
targetPort: metrics
1315
selector:
14-
control-plane: operator-controller-manager
16+
app.kubernetes.io/name: rhtas-operator
17+
control-plane: controller-manager
1518
status:
1619
loadBalancer: {}

bundle/manifests/rhtas-operator.clusterserviceversion.yaml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ metadata:
297297
]
298298
capabilities: Seamless Upgrades
299299
containerImage: registry.redhat.io/rhtas/rhtas-rhel9-operator@sha256:0332d8e99dca5eb443a0de6800817d286057498374faa7a9d59b592efb453a3a
300-
createdAt: "2025-05-15T07:09:19Z"
300+
createdAt: "2025-05-15T11:50:45Z"
301301
features.operators.openshift.io/cnf: "false"
302302
features.operators.openshift.io/cni: "false"
303303
features.operators.openshift.io/csi: "false"
@@ -603,26 +603,24 @@ spec:
603603
serviceAccountName: rhtas-operator-controller-manager
604604
deployments:
605605
- label:
606-
app.kubernetes.io/component: manager
607-
app.kubernetes.io/created-by: rhtas-operator
608-
app.kubernetes.io/instance: operator-controller-manager
609606
app.kubernetes.io/managed-by: kustomize
610-
app.kubernetes.io/name: deployment
611-
app.kubernetes.io/part-of: rhtas-operator
612-
control-plane: operator-controller-manager
607+
app.kubernetes.io/name: rhtas-operator
608+
control-plane: controller-manager
613609
name: rhtas-operator-controller-manager
614610
spec:
615611
replicas: 1
616612
selector:
617613
matchLabels:
618-
control-plane: operator-controller-manager
614+
app.kubernetes.io/name: rhtas-operator
615+
control-plane: controller-manager
619616
strategy: {}
620617
template:
621618
metadata:
622619
annotations:
623620
kubectl.kubernetes.io/default-container: manager
624621
labels:
625-
control-plane: operator-controller-manager
622+
app.kubernetes.io/name: rhtas-operator
623+
control-plane: controller-manager
626624
spec:
627625
containers:
628626
- args:

config/default/manager_auth_proxy_patch.yaml

Lines changed: 0 additions & 39 deletions
This file was deleted.

config/manager/manager.yaml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ apiVersion: v1
22
kind: Namespace
33
metadata:
44
labels:
5-
control-plane: operator-controller-manager
6-
app.kubernetes.io/name: namespace
7-
app.kubernetes.io/instance: operator
8-
app.kubernetes.io/component: manager
9-
app.kubernetes.io/created-by: rhtas-operator
10-
app.kubernetes.io/part-of: rhtas-operator
5+
control-plane: controller-manager
6+
app.kubernetes.io/name: rhtas-operator
117
app.kubernetes.io/managed-by: kustomize
128
name: openshift-rhtas-operator
139
---
@@ -17,24 +13,22 @@ metadata:
1713
name: operator-controller-manager
1814
namespace: openshift-rhtas-operator
1915
labels:
20-
control-plane: operator-controller-manager
21-
app.kubernetes.io/name: deployment
22-
app.kubernetes.io/instance: operator-controller-manager
23-
app.kubernetes.io/component: manager
24-
app.kubernetes.io/created-by: rhtas-operator
25-
app.kubernetes.io/part-of: rhtas-operator
16+
control-plane: controller-manager
17+
app.kubernetes.io/name: rhtas-operator
2618
app.kubernetes.io/managed-by: kustomize
2719
spec:
2820
selector:
2921
matchLabels:
30-
control-plane: operator-controller-manager
22+
control-plane: controller-manager
23+
app.kubernetes.io/name: rhtas-operator
3124
replicas: 1
3225
template:
3326
metadata:
3427
annotations:
3528
kubectl.kubernetes.io/default-container: manager
3629
labels:
37-
control-plane: operator-controller-manager
30+
control-plane: controller-manager
31+
app.kubernetes.io/name: rhtas-operator
3832
spec:
3933
# TODO(user): Uncomment the following code to configure the nodeAffinity expression
4034
# according to the platforms which are supported by your solution.

config/manager/metrics_service.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@ apiVersion: v1
22
kind: Service
33
metadata:
44
labels:
5-
control-plane: operator-controller-manager
5+
control-plane: controller-manager
6+
app.kubernetes.io/name: rhtas-operator
7+
app.kubernetes.io/managed-by: kustomize
68
name: operator-controller-manager-metrics-service
79
spec:
810
ports:
911
- name: metrics
1012
port: 8080
1113
targetPort: metrics
1214
selector:
13-
control-plane: operator-controller-manager
15+
control-plane: controller-manager
16+
app.kubernetes.io/name: rhtas-operator

config/prometheus/monitor.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@ apiVersion: monitoring.coreos.com/v1
44
kind: ServiceMonitor
55
metadata:
66
labels:
7-
control-plane: operator-controller-manager
8-
app.kubernetes.io/name: servicemonitor
9-
app.kubernetes.io/instance: controller-manager-metrics-monitor
10-
app.kubernetes.io/component: metrics
11-
app.kubernetes.io/created-by: rhtas-operator
12-
app.kubernetes.io/part-of: rhtas-operator
7+
control-plane: controller-manager
8+
app.kubernetes.io/name: rhtas-operator
139
app.kubernetes.io/managed-by: kustomize
1410
name: operator-controller-manager-metrics-monitor
1511
namespace: openshift-rhtas-operator
@@ -19,4 +15,5 @@ spec:
1915
port: metrics
2016
selector:
2117
matchLabels:
22-
control-plane: operator-controller-manager
18+
control-plane: controller-manager
19+
app.kubernetes.io/name: rhtas-operator

config/rbac/auth_proxy_client_clusterrole.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

config/rbac/auth_proxy_role.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

config/rbac/auth_proxy_role_binding.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)