use bindplane prometheus image and remove configmap

observIQ · Feb 15, 2024 · 98e9227 · 98e9227
1 parent 056462f
commit 98e9227
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 44 deletions.
diff --git a/charts/bindplane/templates/bindplane.yaml b/charts/bindplane/templates/bindplane.yaml
@@ -368,7 +368,7 @@ spec:
         {{- if eq (include "bindplane.deployment_type" .) "StatefulSet" }}
         {{- if and (.Values.prometheus.enable) (.Values.prometheus.enableSideCar) }}
         - name: prometheus
-          image: prom/prometheus:v2.47.2
+          image: ghcr.io/observiq/bindplane-prometheus:{{ include "bindplane.tag" . }}
           ports:
             - containerPort: 9090
               name: http
@@ -392,15 +392,6 @@ spec:
             capabilities:
               drop: ["ALL"]
           volumeMounts:
-            - name: {{ include "bindplane.fullname" . }}-prometheus-config
-              mountPath: /etc/prometheus/prometheus.yml
-              subPath: prometheus.yml
-            - name: {{ include "bindplane.fullname" . }}-prometheus-config
-              mountPath: /etc/prometheus/rules.yml
-              subPath: rules.yml
-            - name: {{ include "bindplane.fullname" . }}-prometheus-config
-              mountPath: /etc/prometheus/web.yml
-              subPath: web.yml
             - name: {{ include "bindplane.fullname" . }}-prometheus-data
               mountPath: /var/lib/prometheus/tsdb
         {{- end }}
@@ -439,13 +430,6 @@ spec:
             secretName: {{ .Values.prometheus.tls.secret.name }}
         {{- end }}
         {{- end }}
-        {{- if eq (include "bindplane.deployment_type" .) "StatefulSet" }}
-        {{- if and (.Values.prometheus.enable) (.Values.prometheus.enableSideCar) }}
-        - name: {{ include "bindplane.fullname" . }}-prometheus-config
-          configMap:
-            name: {{ include "bindplane.fullname" . }}-prometheus-config
-        {{- end }}
-        {{- end }}
   {{- if eq (include "bindplane.deployment_type" .) "StatefulSet" }}
   volumeClaimTemplates:
     {{- if eq .Values.backend.type "bbolt" }}

diff --git a/charts/bindplane/templates/prometheus_config.yaml b/charts/bindplane/templates/prometheus_config.yaml