kustomize/bases/prometheus/kustomization.yaml

@@ -11,10 +11,6 @@ secretGenerator:
     literals:
       - username=changeme
       - password=changeme
-  - name: additional-scrape-configs
-    behavior: create
-    literals:
-      - prometheus-additional.yaml=
 
 configurations:
   - kustomizeconfig/namereference.yaml

kustomize/bases/prometheus/kustomizeconfig/namereference.yaml

@@ -5,5 +5,3 @@ nameReference:
         path: spec/remoteWrite/basicAuth/username/name
       - kind: Prometheus
         path: spec/remoteWrite/basicAuth/password/name
-      - kind: Prometheus
-        path: spec/additionalScrapeConfigs/name

kustomize/bases/prometheus/prometheus.yaml

@@ -18,9 +18,6 @@ spec:
   probeSelector:
     matchLabels:
       monitor: prometheus
-  additionalScrapeConfigs:
-    name: additional-scrape-configs
-    key: prometheus-additional.yaml
   # remoteWrite:
   #   - url: changeme
   #     basicAuth:

kustomize/overlays/prod/configurations/prometheus/prometheus-additional.yaml

@@ -1,3 +0,0 @@
-- job_name: additional/bastion-haproxy
-  static_configs:
-  - targets: ["192.168.20.10:8080"]

kustomize/overlays/prod/kustomization.yaml

@@ -1,4 +1,4 @@
-resources:
+bases:
   # - ../../namespaces/kubernetes-dashboard
   - ../../namespaces/gitea
   - ../../namespaces/grafana
@@ -12,19 +12,19 @@ images:
   - name: gitea/gitea
     newTag: 1.16.9
   - name: grafana/grafana
-    newTag: 9.2.1
+    newTag: 9.0.4
   # - name: prom/node-exporter
   #   newTag: v0.18.1
   - name: prom/blackbox-exporter
     newName: badjware/blackbox-exporter-tweak
     newTag: 0.21.1 
   - name: drone/drone
-    newTag: 2.14.0
+    newTag: 2.7.0
   - name: drone/drone-runner-kube
-    newTag: 1.0.0-rc.3
+    newTag: 1.0.0-rc.2
   - name: nextcloud
     newName: badjware/nextcloud-tweak
-    newTag: 24.0.6
+    newTag: 24.0.3
   - name: postgres
     newTag: 9.6.23
   - name: redis
@@ -78,12 +78,6 @@ secretGenerator:
   #   literals:
   #     - username=${ssm:/k3s/prod/monitoring/grafana-cloud/username}
   #     - password=${ssm:/k3s/prod/monitoring/grafana-cloud/password}
-  - name: additional-scrape-configs
-    type: Opaque
-    namespace: monitoring
-    behavior: replace
-    files:
-      - prometheus-additional.yaml=configurations/prometheus/prometheus-additional.yaml
 
 # allow "kubectl apply -l managed-by=kustomize --prune ..."
 commonLabels: