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..042b628 100644 --- a/chart/templates/uds-package-postgres.yaml +++ b/chart/templates/uds-package-postgres.yaml @@ -8,6 +8,13 @@ metadata: name: postgres namespace: postgres spec: + monitor: + - selector: + application: spilo + portName: exporter + targetPort: 9187 + kind: PodMonitor + description: "Postgres Exporter Port" network: serviceMesh: mode: {{ if .Values.ambient }}ambient{{ else }}sidecar{{ end }} @@ -39,15 +46,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 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?(?\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?(?\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?(?\d+\.\d+\.\d+)$ - version: 1.15.0-uds.0 + version: 1.15.0-uds.1