From 698529cc12c3b4a259b16379a09c44562764e28b Mon Sep 17 00:00:00 2001
From: codyshoffner <cody.shoffner@defenseunicorns.com>
Date: Fri, 9 Jan 2026 12:25:22 -0600
Subject: [PATCH 1/3] fix: remove helm template monitor add uds monitor

---
 chart/templates/postgres-monitor.yaml     | 22 ----------------------
 chart/templates/uds-package-postgres.yaml | 17 ++++++++---------
 2 files changed, 8 insertions(+), 31 deletions(-)
 delete mode 100644 chart/templates/postgres-monitor.yaml

diff --git a/chart/templates/postgres-monitor.yaml b/chart/templates/postgres-monitor.yaml
deleted file mode 100644
index 202de1c..0000000
--- a/chart/templates/postgres-monitor.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2024 Defense Unicorns
-# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
-
-{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" }}
-apiVersion: monitoring.coreos.com/v1
-kind: PodMonitor
-metadata:
-  name: postgres-exporter
-  namespace: postgres
-spec:
-  scrapeClass: istio-certs
-  namespaceSelector:
-    matchNames:
-      - postgres
-  podMetricsEndpoints:
-    - port: exporter
-      scheme: https
-      enableHttp2: false
-  selector:
-    matchLabels:
-      application: spilo
-{{- end }}
diff --git a/chart/templates/uds-package-postgres.yaml b/chart/templates/uds-package-postgres.yaml
index 01145b0..a01a209 100644
--- a/chart/templates/uds-package-postgres.yaml
+++ b/chart/templates/uds-package-postgres.yaml
@@ -8,6 +8,14 @@ metadata:
   name: postgres
   namespace: postgres
 spec:
+  monitor:
+    - selector:
+        application: spilo
+      portName: exporter
+      targetPort: 9187
+      kind: PodMonitor
+      description: "Postgres Exporter Port"
+      fallbackScrapeProtocol: PrometheusText0.0.4
   network:
     serviceMesh:
       mode: {{ if .Values.ambient }}ambient{{ else }}sidecar{{ end }}
@@ -39,15 +47,6 @@ spec:
         remoteSelector:
           app.kubernetes.io/name: postgres-operator
 
-      - direction: Ingress
-        selector:
-          application: spilo
-        remoteNamespace: monitoring
-        remoteSelector:
-          app: prometheus
-        port: 9187
-        description: "Postgres Exporter Port"
-
       - direction: Egress
         selector:
           cluster-name: pg-cluster

From 012d94592b72d7d77ac4e3e4a12efb70ee6921f6 Mon Sep 17 00:00:00 2001
From: codyshoffner <cody.shoffner@defenseunicorns.com>
Date: Fri, 9 Jan 2026 12:32:02 -0600
Subject: [PATCH 2/3] chore: bump releaser

---
 releaser.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/releaser.yaml b/releaser.yaml
index 60b001f..f7f95fd 100644
--- a/releaser.yaml
+++ b/releaser.yaml
@@ -4,10 +4,10 @@
 flavors:
   - name: upstream
     # renovate-uds: datasource=docker depName=ghcr.io/zalando/postgres-operator extractVersion=^v?(?<version>\d+\.\d+\.\d+)$
-    version: 1.15.1-uds.0
+    version: 1.15.1-uds.1
   - name: registry1
     # renovate-uds: datasource=docker depName=registry1.dso.mil/ironbank/opensource/zalando/postgres-operator extractVersion=^v?(?<version>\d+\.\d+\.\d+)$
-    version: 1.15.0-uds.0
+    version: 1.15.0-uds.1
   - name: unicorn
     # renovate-uds: datasource=docker depName=quay.io/rfcurated/zalando/postgres-operator extractVersion=^v?(?<version>\d+\.\d+\.\d+)$
-    version: 1.15.0-uds.0
+    version: 1.15.0-uds.1

From 67f747dd97e2061cb1a08e7606995015691d1557 Mon Sep 17 00:00:00 2001
From: codyshoffner <cody.shoffner@defenseunicorns.com>
Date: Fri, 9 Jan 2026 12:55:20 -0600
Subject: [PATCH 3/3] chore: remove scrape protocol

---
 chart/templates/uds-package-postgres.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/chart/templates/uds-package-postgres.yaml b/chart/templates/uds-package-postgres.yaml
index a01a209..042b628 100644
--- a/chart/templates/uds-package-postgres.yaml
+++ b/chart/templates/uds-package-postgres.yaml
@@ -15,7 +15,6 @@ spec:
       targetPort: 9187
       kind: PodMonitor
       description: "Postgres Exporter Port"
-      fallbackScrapeProtocol: PrometheusText0.0.4
   network:
     serviceMesh:
       mode: {{ if .Values.ambient }}ambient{{ else }}sidecar{{ end }}