PVO11Y-5019 Deploy container registry monitoring to prod (#9572)

kubasikus · web-flow · commit 96ced929f300 · 2025-12-10T19:13:39.000Z
* PVO11Y-5019 Rework component structure to prepare for deployment to all member clusters

Move away from having cluster-specific deployment folders. This is not necessary, as the exporter configuration is expected to be the same across all clusters.

* PVO11Y-5019 Move ApplicationSet to member cluster folder

This aligns with the intent to deploy this monitoring exporter to all member clusters.

* PVO11Y-5019 Deploy registry monitoring to production

Use the overlay patch to set the target environment of our ApplicationSet. Also cleanup the deletion fix we previously put in place to prevent production deployment.

* Fix member-cluster-generator path

* Remove non-existant resource link

This path no longer exists.

* Fix base path

* Remove trailing space

* Add registry monitor to the member kustomization list

* Change QUAY_URL in production
diff --git a/argo-cd-apps/base/member/infra-deployments/kustomization.yaml b/argo-cd-apps/base/member/infra-deployments/kustomization.yaml
@@ -17,6 +17,7 @@ resources:
   - perf-team-prometheus-reader
   - project-controller
   - mintmaker
+  - monitoring-registry
   - nvme-storage-configurator
   - tracing-workload-otel-collector
   - tempo
diff --git a/argo-cd-apps/base/member/infra-deployments/monitoring-registry/kustomization.yaml b/argo-cd-apps/base/member/infra-deployments/monitoring-registry/kustomization.yaml
@@ -3,4 +3,4 @@ kind: Kustomization
 resources:
   - monitoring-registry.yaml
 components:
-  - ../../k-components/deploy-to-member-cluster-merge-generator
+  - ../../../../k-components/deploy-to-member-cluster-merge-generator
diff --git a/argo-cd-apps/base/member/infra-deployments/monitoring-registry/monitoring-registry.yaml b/argo-cd-apps/base/member/infra-deployments/monitoring-registry/monitoring-registry.yaml
@@ -12,13 +12,9 @@ spec:
               values:
                 sourceRoot: components/monitoring/registry
                 environment: staging
-                clusterDir: base
+                clusterDir: ""
           - list:
-              elements:
-                - nameNormalized: stone-stage-p01
-                  values.clusterDir: stone-stage-p01
-                - nameNormalized: stone-stg-rh01
-                  values.clusterDir: stone-stg-rh01
+              elements: []
   template:
     metadata:
       name: monitoring-registry-{{nameNormalized}}
diff --git a/argo-cd-apps/overlays/konflux-public-production/kustomization.yaml b/argo-cd-apps/overlays/konflux-public-production/kustomization.yaml
@@ -251,3 +251,8 @@ patches:
       kind: ApplicationSet
       version: v1alpha1
       name: monitoring-blackbox
+  - path: production-overlay-patch.yaml
+    target:
+      kind: ApplicationSet
+      version: v1alpha1
+      name: monitoring-registry
diff --git a/argo-cd-apps/overlays/konflux-public-staging/kustomization.yaml b/argo-cd-apps/overlays/konflux-public-staging/kustomization.yaml
@@ -8,7 +8,6 @@ resources:
   - ../../base/ci-helper-app
   - ../../base/eaas
   - ../../base/monitoring-blackbox
-  - ../../base/monitoring-registry
 
 namespace: konflux-public-staging
 patchesStrategicMerge:
diff --git a/argo-cd-apps/overlays/production-downstream/delete-applications.yaml b/argo-cd-apps/overlays/production-downstream/delete-applications.yaml
@@ -16,9 +16,3 @@ kind: ApplicationSet
 metadata:
   name: konflux-kite
 $patch: delete
----
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: monitoring-registry
-$patch: delete
diff --git a/argo-cd-apps/overlays/production-downstream/kustomization.yaml b/argo-cd-apps/overlays/production-downstream/kustomization.yaml
@@ -266,3 +266,8 @@ patches:
       kind: ApplicationSet
       version: v1alpha1
       name: monitoring-blackbox
+  - path: production-overlay-patch.yaml
+    target:
+      kind: ApplicationSet
+      version: v1alpha1
+      name: monitoring-registry
diff --git a/components/monitoring/registry/base/kustomization.yaml b/components/monitoring/registry/base/kustomization.yaml
@@ -1,3 +1,4 @@
-resources: []
+resources:
+  - rbac
 
 namespace: appstudio-registry-exporter
diff --git a/components/monitoring/registry/base/rbac/kustomization.yaml b/components/monitoring/registry/base/rbac/kustomization.yaml
diff --git a/components/monitoring/registry/base/rbac/registry-maintainers.yaml b/components/monitoring/registry/base/rbac/registry-maintainers.yaml
diff --git a/components/monitoring/registry/production/kustomization.yaml b/components/monitoring/registry/production/kustomization.yaml
@@ -0,0 +1,25 @@
+resources:
+  - ../base
+  - https://github.com/redhat-appstudio/o11y/config/exporters/monitoring/registry/base?ref=8c762c63b8ff446d8116ac07d7d0894ce67aa13b
+
+images:
+  - name: quay.io/redhat-appstudio/o11y
+    newName: quay.io/redhat-appstudio/o11y
+    newTag: 8c762c63b8ff446d8116ac07d7d0894ce67aa13b
+
+# Quay repository name is generated from the namespace name
+patches:
+  - patch: |-
+      apiVersion: apps/v1
+      kind: DaemonSet
+      metadata:
+        name: registry-exporter-ds
+        namespace: appstudio-registry-exporter
+      spec:
+        template:
+          spec:
+            containers:
+              - name: exporters
+                env:
+                - name: QUAY_URL
+                  value: quay.io/redhat-user-workloads/appstudio-registry-exporter/appstudio-registry-exporter
diff --git a/components/monitoring/registry/staging/kustomization.yaml b/components/monitoring/registry/staging/kustomization.yaml
@@ -1,6 +1,5 @@
 resources:
-  - ../../base
-  - rbac
+  - ../base
   - https://github.com/redhat-appstudio/o11y/config/exporters/monitoring/registry/base?ref=7f967e4e03b1402dc07dbea757b728a2d8ac1d36
 
 images:
diff --git a/components/monitoring/registry/staging/stone-stage-p01/kustomization.yaml b/components/monitoring/registry/staging/stone-stage-p01/kustomization.yaml
diff --git a/components/monitoring/registry/staging/stone-stg-rh01/kustomization.yaml b/components/monitoring/registry/staging/stone-stg-rh01/kustomization.yaml
