cluster

commit e006e590c8bb9e13ff7e747c18579bd03e7f4e77
parent 533e97a512ba160dbaf881fe095d596c1df1dc90
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sun, 19 Mar 2023 20:17:15 +0100

Fix podmonitors

Diffstat:
M
README.md
 | 
4
+++-
M
apps/base/kube-prometheus-stack/release.yaml
 | 
8
+++-----

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
@@ -139,7 +139,7 @@ infra-controllers       main@sha1:21ebd912      False   True    Applied revision
 
 - Migrate old deployments here
   - [ ] Gitea
-  - [ ] Woodpecker
+  - [x] Woodpecker
   - [ ] Docker repo
   - [ ] Traefik
   - [x] Certmanager
@@ -147,6 +147,8 @@ infra-controllers       main@sha1:21ebd912      False   True    Applied revision
   - [ ] Synapse
   - [ ] Mjolnir
   - [ ] Keycloak
+  - [x] Prometheus/grafana
+  - [x] Cosign
   - [ ] ...
 - Port validate script
 - Setup CI for github and woodpecker
diff --git a/apps/base/kube-prometheus-stack/release.yaml b/apps/base/kube-prometheus-stack/release.yaml
@@ -19,6 +19,9 @@ spec:
     crds: CreateReplace
   # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml
   values:
+    prometheus:
+      prometheusSpec:
+        podMonitorSelectorNilUsesHelmValues: false
     alertmanager:
       alertmanagerSpec:
         useExistingSecret: true
@@ -67,11 +70,6 @@ spec:
                 path: /var/lib/grafana/dashboards/nats
       dashboards:
         monitoring:
-          prometheus-blackbox-exporter:
-            # Ref: https://grafana.com/dashboards/7587
-            gnetId: 7587
-            revision: 3
-            datasource: Prometheus
           cilium-dashboard:
             url: https://raw.githubusercontent.com/cilium/cilium/v1.13.1/examples/kubernetes/addons/prometheus/files/grafana-dashboards/cilium-dashboard.json
           cilium-operator-dashboard: