[bitnami/kube-prometheus] allow volumemounts in Thanos sidecar (#7947)

* allow volumeMounts for Thanos sidecar

* bump chart version

* Update bitnami/kube-prometheus/Chart.yaml

bump minor version, not patch

Co-authored-by: Alejandro Moreno <alemorcuq@gmail.com>

* rename 'volumeMounts' to 'extraVolumeMounts' and use template rendering

Co-authored-by: Alejandro Moreno <alemorcuq@gmail.com>
This commit is contained in:
Sebastian Glöckler
2021-10-29 16:33:21 +02:00
committed by GitHub
parent 8eefa8eae1
commit 1b0a2ceeba
4 changed files with 12 additions and 1 deletions

View File

@@ -34,4 +34,4 @@ sources:
- https://github.com/bitnami/bitnami-docker-prometheus
- https://github.com/bitnami/bitnami-docker-alertmanager
- https://github.com/prometheus-operator/kube-prometheus
version: 6.2.2
version: 6.3.0

View File

@@ -303,6 +303,7 @@ The command removes all the Kubernetes components associated with the chart and
| `prometheus.thanos.containerSecurityContext.capabilities.drop` | Linux Kernel capabilities which should be dropped | `[]` |
| `prometheus.thanos.prometheusUrl` | Override default prometheus url "http://localhost:9090" | `""` |
| `prometheus.thanos.extraArgs` | Additional arguments passed to the thanos sidecar container | `[]` |
| `prometheus.thanos.extraVolumeMounts` | Additional volumeMounts from `prometheus.volumes` for thanos sidecar container | `[]` |
| `prometheus.thanos.objectStorageConfig` | Support mounting a Secret for the objectStorageConfig of the sideCar container. | `{}` |
| `prometheus.thanos.resources.limits` | The resources limits for the Thanos sidecar container | `{}` |
| `prometheus.thanos.resources.requests` | The resources requests for the Thanos sidecar container | `{}` |

View File

@@ -249,6 +249,9 @@ spec:
{{- if not (.Values.prometheus.storageSpec.disableMountSubPath | default (not .Values.prometheus.persistence.enabled)) }}
subPath: prometheus-db
{{- end }}
{{- if .Values.prometheus.thanos.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.prometheus.thanos.extraVolumeMounts "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.prometheus.thanos.containerSecurityContext.enabled }}
# yamllint disable rule:indentation
securityContext: {{- omit .Values.prometheus.thanos.containerSecurityContext "enabled" | toYaml | nindent 8 }}

View File

@@ -952,6 +952,13 @@ prometheus:
## secretKey: thanos.yaml
##
objectStorageConfig: {}
## ref: https://github.com/thanos-io/thanos/blob/main/docs/components/sidecar.md
## @param prometheus.thanos.extraVolumeMounts Additional volumeMounts from `prometheus.volumes` for thanos sidecar container
## extraVolumeMounts:
## - name: my-secret-volume
## mountPath: /etc/thanos/secrets/my-secret
##
extraVolumeMounts: []
## Thanos sidecar container resource requests and limits.
## ref: http://kubernetes.io/docs/user-guide/compute-resources/
## We usually recommend not to specify default resources and to leave this as a conscious