[bitnami/prometheus-operator] Mount Prometheus data volume into Thanos sidecar (#2613)

* [bitnami/prometheus-operator] Mount Prometheus data volume into Thanos sidecar

Signed-off-by: juan131 <juan@bitnami.com>

* Add tsdb.path by default

Signed-off-by: juan131 <juan@bitnami.com>

* [bitnami/prometheus-operator] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Juan Ariza Toledano
2020-05-19 19:40:32 +02:00
committed by GitHub
parent c7751eb576
commit b46eec04e0
5 changed files with 18 additions and 15 deletions

View File

@@ -2,7 +2,7 @@ apiVersion: v1
appVersion: 0.39.0
description: The Prometheus Operator for Kubernetes provides easy monitoring definitions for Kubernetes services and deployment and management of Prometheus instances.
name: prometheus-operator
version: 0.17.0
version: 0.17.1
keywords:
- prometheus
- alertmanager

View File

@@ -4,6 +4,6 @@ dependencies:
version: 0.2.13
- name: kube-state-metrics
repository: https://charts.bitnami.com/bitnami
version: 0.2.1
digest: sha256:5ae800ac83341163dd0652ca2d744aae8947c77b97cf8e35790ce092ef01f6a2
generated: "2020-05-05T16:11:17.396711266Z"
version: 0.2.2
digest: sha256:2115a39520dc2ffdba5dd0f51178b34167aa2b8df9915e1c5d5a7e78bc37eef0
generated: "2020-05-19T15:03:18.57636418Z"

View File

@@ -102,8 +102,7 @@ spec:
{{- end }}
{{- if .Values.prometheus.storageSpec }}
storage: {{- include "prometheus-operator.tplValue" (dict "value" .Values.prometheus.storageSpec "context" $) | nindent 4 }}
{{- else }}
{{- if .Values.prometheus.persistence.enabled }}
{{- else if .Values.prometheus.persistence.enabled }}
storage:
volumeClaimTemplate:
spec:
@@ -116,7 +115,6 @@ spec:
storage: {{ .Values.prometheus.persistence.size | quote }}
{{- include "prometheus-operator.prometheus.storageClass" . | nindent 8 }}
{{- end }}
{{- end }}
{{- if .Values.prometheus.podMetadata }}
podMetadata: {{- include "prometheus-operator.tplValue" (dict "value" .Values.prometheus.podMetadata "context" $) | nindent 4 }}
{{- end }}
@@ -174,6 +172,7 @@ spec:
- --prometheus.url=http://localhost:9090
- --grpc-address=0.0.0.0:10901
- --http-address=0.0.0.0:10902
- --tsdb.path=/prometheus/
{{- if .Values.prometheus.thanos.objectStorageConfig }}
- --objstore.config=$(OBJSTORE_CONFIG)
{{- end }}
@@ -195,6 +194,10 @@ spec:
- name: http
containerPort: 10902
protocol: TCP
volumeMounts:
- mountPath: /prometheus
name: prometheus-{{ template "prometheus-operator.prometheus.fullname" . }}-db
subPath: prometheus-db
{{- end }}
{{- if .Values.prometheus.containers }}
{{- include "prometheus-operator.tplValue" (dict "value" .Values.prometheus.containers "context" $) | nindent 4 }}

View File

@@ -42,7 +42,7 @@ operator:
image:
registry: docker.io
repository: bitnami/prometheus-operator
tag: 0.39.0-debian-10-r3
tag: 0.39.0-debian-10-r8
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -208,7 +208,7 @@ operator:
image:
registry: docker.io
repository: bitnami/configmap-reload
tag: 0.3.0-debian-10-r110
tag: 0.3.0-debian-10-r113
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
@@ -239,7 +239,7 @@ prometheus:
image:
registry: docker.io
repository: bitnami/prometheus
tag: 2.18.1-debian-10-r4
tag: 2.18.1-debian-10-r8
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
@@ -633,7 +633,7 @@ alertmanager:
image:
registry: docker.io
repository: bitnami/alertmanager
tag: 0.20.0-debian-10-r110
tag: 0.20.0-debian-10-r115
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/

View File

@@ -42,7 +42,7 @@ operator:
image:
registry: docker.io
repository: bitnami/prometheus-operator
tag: 0.39.0-debian-10-r3
tag: 0.39.0-debian-10-r8
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -208,7 +208,7 @@ operator:
image:
registry: docker.io
repository: bitnami/configmap-reload
tag: 0.3.0-debian-10-r110
tag: 0.3.0-debian-10-r113
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
@@ -239,7 +239,7 @@ prometheus:
image:
registry: docker.io
repository: bitnami/prometheus
tag: 2.18.1-debian-10-r4
tag: 2.18.1-debian-10-r8
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
@@ -639,7 +639,7 @@ alertmanager:
image:
registry: docker.io
repository: bitnami/alertmanager
tag: 0.20.0-debian-10-r110
tag: 0.20.0-debian-10-r115
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/