Merge pull request #268 from rakeshgm/add-labels-4.16

Bug 2280342: add resources to transformer config
red-hat-storage · May 15, 2024 · 375df57 · 375df57
2 parents 83aad0c + 360d0ec
commit 375df57
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 1 deletion.
diff --git a/config/dr-cluster/default/kustomization.yaml b/config/dr-cluster/default/kustomization.yaml
@@ -31,6 +31,8 @@ transformers:
     path: metadata/labels
   - kind: Service
     path: spec/selector
+  - kind: ConfigMap
+    path: metadata/labels
 
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
 # crd/kustomization.yaml

diff --git a/config/dr-cluster/manifests/idr/kustomization.yaml b/config/dr-cluster/manifests/idr/kustomization.yaml
@@ -10,6 +10,7 @@ configMapGenerator:
     disableNameSuffixHash: true
     labels:
       config.openshift.io/inject-trusted-cabundle: "true"
+      app: ramen-dr-cluster
 
 patchesStrategicMerge:
 - manager_openshift_trusted_cabundle.yaml

diff --git a/config/dr-cluster/manifests/odr/kustomization.yaml b/config/dr-cluster/manifests/odr/kustomization.yaml
@@ -10,6 +10,7 @@ configMapGenerator:
     disableNameSuffixHash: true
     labels:
       config.openshift.io/inject-trusted-cabundle: "true"
+      app: ramen-dr-cluster
 
 patchesStrategicMerge:
 - manager_openshift_trusted_cabundle.yaml

diff --git a/config/hub/default/k8s/kustomization.yaml b/config/hub/default/k8s/kustomization.yaml
@@ -31,7 +31,14 @@ transformers:
     path: metadata/labels
   - kind: Service
     path: spec/selector
-
+  - kind: ServiceMonitor
+    path: metadata/labels
+  - kind: ServiceMonitor
+    path: spec/selector/matchLabels
+  - kind: ConfigMap
+    path: metadata/labels
+  - kind: PrometheusRule
+    path: metadata/labels
 
 # Mount the controller config file for loading manager configurations
 # through a ComponentConfig type

diff --git a/config/hub/default/ocp/kustomization.yaml b/config/hub/default/ocp/kustomization.yaml
@@ -31,6 +31,14 @@ transformers:
     path: metadata/labels
   - kind: Service
     path: spec/selector
+  - kind: ServiceMonitor
+    path: metadata/labels
+  - kind: ServiceMonitor
+    path: spec/selector/matchLabels
+  - kind: ConfigMap
+    path: metadata/labels
+  - kind: PrometheusRule
+    path: metadata/labels  
 
 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
 #-../prometheus

diff --git a/config/hub/manifests/idr/kustomization.yaml b/config/hub/manifests/idr/kustomization.yaml
@@ -10,6 +10,7 @@ configMapGenerator:
     disableNameSuffixHash: true
     labels:
       config.openshift.io/inject-trusted-cabundle: "true"
+      app: ramen-hub
 
 patchesStrategicMerge:
 - manager_openshift_trusted_cabundle.yaml

diff --git a/config/hub/manifests/odr/kustomization.yaml b/config/hub/manifests/odr/kustomization.yaml
@@ -10,6 +10,7 @@ configMapGenerator:
     disableNameSuffixHash: true
     labels:
       config.openshift.io/inject-trusted-cabundle: "true"
+      app: ramen-hub
 
 patchesStrategicMerge:
 - manager_openshift_trusted_cabundle.yaml