From 588071d4a56e9cdb8793bd2294a9211f6bead915 Mon Sep 17 00:00:00 2001
From: dvirlabs <dvirlabs@gmail.com>
Date: Sun, 1 Jun 2025 14:54:32 +0300
Subject: [PATCH] Fix values

---
 .../my-values/values-prod.yaml                | 33 +++++++------------
 .../prometheus-additional-scrape-configs.yaml |  8 +++--
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/charts/kube-prometheus-stack/my-values/values-prod.yaml b/charts/kube-prometheus-stack/my-values/values-prod.yaml
index 203e674..ce16078 100644
--- a/charts/kube-prometheus-stack/my-values/values-prod.yaml
+++ b/charts/kube-prometheus-stack/my-values/values-prod.yaml
@@ -1,16 +1,14 @@
 alertmanager:
   enabled: false
 
-pushgateway:
+grafana:
   enabled: false
 
-prometheus-node-exporter:
+prometheusOperator:
   enabled: false
+  createCustomResource: false
 
-kubeStateMetrics:
-  enabled: true
-
-server:
+prometheus:
   enabled: true
 
   ingress:
@@ -29,19 +27,12 @@ server:
 
   retention: "15d"
 
-  extraFlags:
-    - web.enable-lifecycle
+  prometheusSpec:
+    additionalScrapeConfigsSecret:
+      name: prometheus-additional-scrape-configs
+      key: additional-scrape-configs.yaml
+    enableAdminAPI: true
 
-  # ❌ Remove this – not supported here
-  # additionalScrapeConfigs: /etc/prometheus/additional-scrape-configs.yaml
-
-  # ✅ Use this instead
-  additionalScrapeConfigsSecret:
-    enabled: true
-    name: prometheus-additional-scrape-configs
-    key: additional-scrape-configs.yaml
-
-  # ✅ Keep reload if you expect runtime reload on change
-  configMapReload:
-    prometheus:
-      enabled: true
+    serviceMonitorSelectorNilUsesHelmValues: false
+    podMonitorSelectorNilUsesHelmValues: false
+    ruleSelectorNilUsesHelmValues: false
diff --git a/manifests/prometheus/prometheus-additional-scrape-configs.yaml b/manifests/prometheus/prometheus-additional-scrape-configs.yaml
index 1835ed5..314d3fd 100644
--- a/manifests/prometheus/prometheus-additional-scrape-configs.yaml
+++ b/manifests/prometheus/prometheus-additional-scrape-configs.yaml
@@ -1,12 +1,14 @@
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
   name: prometheus-additional-scrape-configs
   namespace: monitoring
-data:
+  labels:
+    app.kubernetes.io/name: prometheus
+type: Opaque
+stringData:
   additional-scrape-configs.yaml: |
     - job_name: gitea
-      honor_labels: true
       metrics_path: /metrics
       static_configs:
         - targets: