[bitnami/kube-prometheus] fix storage annotations and initContainers (#12189)

Signed-off-by: Tiko JG <vjgarcera@gmail.com>

Signed-off-by: Tiko JG <vjgarcera@gmail.com>
This commit is contained in:
Tiko JG
2022-08-31 12:16:50 +02:00
committed by GitHub
parent c21386da93
commit 71a6fbba8a
2 changed files with 6 additions and 4 deletions

View File

@@ -35,4 +35,4 @@ sources:
- https://github.com/bitnami/containers/tree/main/bitnami/prometheus
- https://github.com/bitnami/containers/tree/main/bitnami/alertmanager
- https://github.com/prometheus-operator/kube-prometheus
version: 8.1.2
version: 8.1.3

View File

@@ -143,6 +143,7 @@ spec:
storage:
volumeClaimTemplate:
metadata:
{{- if or .Values.prometheus.persistence.annotations .Values.commonAnnotations }}
annotations:
{{- if .Values.prometheus.persistence.annotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.prometheus.persistence.annotations "context" $) | nindent 10 }}
@@ -150,6 +151,7 @@ spec:
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 10 }}
{{- end }}
{{- end }}
{{- if .Values.commonLabels }}
labels: {{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 10 }}
{{- end }}
@@ -226,10 +228,10 @@ spec:
{{- end }}
{{- include "kube-prometheus.imagePullSecrets" . | indent 2 }}
{{- if or .Values.prometheus.containers .Values.prometheus.thanos.create .Values.prometheus.containerSecurityContext.enabled .Values.prometheus.containerSecurityContext.enabled .Values.operator.prometheusConfigReloader.containerSecurityContext.enabled }}
{{- if .Values.prometheus.initContainers }}
initContainers:
{{- if .Values.prometheus.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.prometheus.initContainers "context" $) | nindent 4 }}
{{- end }}
{{- include "common.tplvalues.render" (dict "value" .Values.prometheus.initContainers "context" $) | nindent 4 }}
{{- end }}
containers:
{{- if .Values.prometheus.thanos.create }}
- name: thanos-sidecar