Skip to content

Commit 53bf9fb

Browse files
osmmanosmman
committed
fix: labels according to kubernetes conventions
Fix is based on changes in kubebuilder.
1 parent 81e884a commit 53bf9fb

30 files changed

+60
-259
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: 13 additions & 15 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-06T10:29:24Z"
300+
createdAt: "2025-05-13T12:48:47Z"
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:
@@ -640,11 +638,11 @@ spec:
640638
- name: RELATED_IMAGE_TRILLIAN_DB
641639
value: registry.redhat.io/rhtas/trillian-database-rhel9@sha256:1921a746556119f6e0d6a41dfb528555e38eda4ff046ebb889e7f8a66c13cd03
642640
- name: RELATED_IMAGE_TRILLIAN_NETCAT
643-
value: registry.redhat.io/openshift4/ose-tools-rhel9@sha256:62f19013939f81cd3fb2cfaa47b826952a0b0bb1b1325cd38f01441604188bd6
641+
value: registry.redhat.io/openshift4/ose-tools-rhel9@sha256:595f1e12be349f012ef2ce2414f9acbb25f710773c6dd37ab1c4d6081634ce0a
644642
- name: RELATED_IMAGE_TRILLIAN_CREATE_TREE
645643
value: registry.redhat.io/rhtas/createtree-rhel9@sha256:56518f269821a2ef6f6e7158933694c25eda132cbf5db0c3e81aa274c22fa3f4
646644
- name: RELATED_IMAGE_FULCIO_SERVER
647-
value: registry.redhat.io/rhtas/fulcio-rhel9@sha256:9ccb7764f3812c71a1a802c39c722360a35b9e98239ac4b1761f5dfae1e1c0ac
645+
value: registry.redhat.io/rhtas/fulcio-rhel9@sha256:aed2deb06ee8a121d68e38e6ed07bf378213f50e646278004a54108857973fc2
648646
- name: RELATED_IMAGE_REKOR_REDIS
649647
value: registry.redhat.io/rhtas/trillian-redis-rhel9@sha256:2f8e0dace36fe0631ade827d21bf48c25e502a02b0e8d20d26804cf75880ec02
650648
- name: RELATED_IMAGE_REKOR_SERVER
@@ -658,7 +656,7 @@ spec:
658656
- name: RELATED_IMAGE_CTLOG
659657
value: registry.redhat.io/rhtas/certificate-transparency-rhel9@sha256:166c74603a075a57df7c47cc78ffdc5a1b7523744d66b2532e6451ac756fe65b
660658
- name: RELATED_IMAGE_HTTP_SERVER
661-
value: registry.redhat.io/ubi9/httpd-24@sha256:2b6b324b10d142e8618ad2818edbb7793376f0def0d49603772b8fb64a53439d
659+
value: registry.redhat.io/ubi9/httpd-24@sha256:87f232768f58423776d56db593862aff5024c106d357ec2d443ef48f0ae8019e
662660
- name: RELATED_IMAGE_SEGMENT_REPORTING
663661
value: registry.redhat.io/rhtas/segment-reporting-rhel9@sha256:67dd8978930084aaf02d9c4ad212888dca235af136b25b2b94b6be4c3b934c74
664662
- name: RELATED_IMAGE_TIMESTAMP_AUTHORITY
@@ -778,11 +776,11 @@ spec:
778776
name: trillian-log-server
779777
- image: registry.redhat.io/rhtas/trillian-database-rhel9@sha256:1921a746556119f6e0d6a41dfb528555e38eda4ff046ebb889e7f8a66c13cd03
780778
name: trillian-db
781-
- image: registry.redhat.io/openshift4/ose-tools-rhel9@sha256:62f19013939f81cd3fb2cfaa47b826952a0b0bb1b1325cd38f01441604188bd6
779+
- image: registry.redhat.io/openshift4/ose-tools-rhel9@sha256:595f1e12be349f012ef2ce2414f9acbb25f710773c6dd37ab1c4d6081634ce0a
782780
name: trillian-netcat
783781
- image: registry.redhat.io/rhtas/createtree-rhel9@sha256:56518f269821a2ef6f6e7158933694c25eda132cbf5db0c3e81aa274c22fa3f4
784782
name: trillian-create-tree
785-
- image: registry.redhat.io/rhtas/fulcio-rhel9@sha256:9ccb7764f3812c71a1a802c39c722360a35b9e98239ac4b1761f5dfae1e1c0ac
783+
- image: registry.redhat.io/rhtas/fulcio-rhel9@sha256:aed2deb06ee8a121d68e38e6ed07bf378213f50e646278004a54108857973fc2
786784
name: fulcio-server
787785
- image: registry.redhat.io/rhtas/trillian-redis-rhel9@sha256:2f8e0dace36fe0631ade827d21bf48c25e502a02b0e8d20d26804cf75880ec02
788786
name: rekor-redis
@@ -796,7 +794,7 @@ spec:
796794
name: tuf
797795
- image: registry.redhat.io/rhtas/certificate-transparency-rhel9@sha256:166c74603a075a57df7c47cc78ffdc5a1b7523744d66b2532e6451ac756fe65b
798796
name: ctlog
799-
- image: registry.redhat.io/ubi9/httpd-24@sha256:2b6b324b10d142e8618ad2818edbb7793376f0def0d49603772b8fb64a53439d
797+
- image: registry.redhat.io/ubi9/httpd-24@sha256:87f232768f58423776d56db593862aff5024c106d357ec2d443ef48f0ae8019e
800798
name: http-server
801799
- image: registry.redhat.io/rhtas/segment-reporting-rhel9@sha256:67dd8978930084aaf02d9c4ad212888dca235af136b25b2b94b6be4c3b934c74
802800
name: segment-reporting

‎bundle/manifests/rhtas-related-images_v1_configmap.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ data:
33
RELATED_IMAGE_BACKFILL_REDIS: registry.redhat.io/rhtas/rekor-backfill-redis-rhel9@sha256:c748eed487228737c0543438a54252829644c26604742371650166c5361f88a6
44
RELATED_IMAGE_CLIENT_SERVER: registry.redhat.io/rhtas/client-server-rhel9@sha256:e9a175b14891e7bdd724cdd7d98129bcc8bc3f87435020292ede514534ae23a0
55
RELATED_IMAGE_CTLOG: registry.redhat.io/rhtas/certificate-transparency-rhel9@sha256:166c74603a075a57df7c47cc78ffdc5a1b7523744d66b2532e6451ac756fe65b
6-
RELATED_IMAGE_FULCIO_SERVER: registry.redhat.io/rhtas/fulcio-rhel9@sha256:9ccb7764f3812c71a1a802c39c722360a35b9e98239ac4b1761f5dfae1e1c0ac
7-
RELATED_IMAGE_HTTP_SERVER: registry.redhat.io/ubi9/httpd-24@sha256:2b6b324b10d142e8618ad2818edbb7793376f0def0d49603772b8fb64a53439d
6+
RELATED_IMAGE_FULCIO_SERVER: registry.redhat.io/rhtas/fulcio-rhel9@sha256:aed2deb06ee8a121d68e38e6ed07bf378213f50e646278004a54108857973fc2
7+
RELATED_IMAGE_HTTP_SERVER: registry.redhat.io/ubi9/httpd-24@sha256:87f232768f58423776d56db593862aff5024c106d357ec2d443ef48f0ae8019e
88
RELATED_IMAGE_REKOR_REDIS: registry.redhat.io/rhtas/trillian-redis-rhel9@sha256:2f8e0dace36fe0631ade827d21bf48c25e502a02b0e8d20d26804cf75880ec02
99
RELATED_IMAGE_REKOR_SEARCH_UI: registry.redhat.io/rhtas/rekor-search-ui-rhel9@sha256:8ca88a1bdbf69700795cedb4ffac83b6b186f9e091a9da54b1826021c686e6ec
1010
RELATED_IMAGE_REKOR_SERVER: registry.redhat.io/rhtas/rekor-server-rhel9@sha256:d2b2c382f0351e8c46922fc11aa4bc73ce63a77559981c6130faf922c8611dd8
@@ -14,7 +14,7 @@ data:
1414
RELATED_IMAGE_TRILLIAN_DB: registry.redhat.io/rhtas/trillian-database-rhel9@sha256:1921a746556119f6e0d6a41dfb528555e38eda4ff046ebb889e7f8a66c13cd03
1515
RELATED_IMAGE_TRILLIAN_LOG_SERVER: registry.redhat.io/rhtas/trillian-logserver-rhel9@sha256:99285a83df8fd97e4fb0338feb35aa556171890154a00ec24ee7473ac8241d32
1616
RELATED_IMAGE_TRILLIAN_LOG_SIGNER: registry.redhat.io/rhtas/trillian-logsigner-rhel9@sha256:ee9be1a0edbe52d31fcf9755ac3ec3aeb2d5e8388e47ac8c2e2d83125fd50c44
17-
RELATED_IMAGE_TRILLIAN_NETCAT: registry.redhat.io/openshift4/ose-tools-rhel9@sha256:62f19013939f81cd3fb2cfaa47b826952a0b0bb1b1325cd38f01441604188bd6
17+
RELATED_IMAGE_TRILLIAN_NETCAT: registry.redhat.io/openshift4/ose-tools-rhel9@sha256:595f1e12be349f012ef2ce2414f9acbb25f710773c6dd37ab1c4d6081634ce0a
1818
RELATED_IMAGE_TUF: registry.redhat.io/rhtas/tuffer-rhel9@sha256:6884b1997a98a0c6b83543a64d849408a658e45021f2050b267c6de184edce72
1919
kind: ConfigMap
2020
metadata:

‎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.

0 commit comments

Comments
 (0)