Add initContainers support for prometheus server (#17218)

Signed-off-by: Laurent Godet <mevoyasf@gmail.com>
This commit is contained in:
Laurent Godet
2019-10-21 06:07:38 -07:00
committed by Kubernetes Prow Robot
parent f5c4b195e4
commit 67ed74b614
4 changed files with 13 additions and 4 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
apiVersion: v1
name: prometheus
version: 9.1.3
appVersion: 2.11.1
version: 9.2.0
appVersion: 2.13.1
description: Prometheus is a monitoring system and time series database.
home: https://prometheus.io/
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
+2 -1
View File
@@ -246,7 +246,7 @@ Parameter | Description | Default
`server.enabled` | If false, Prometheus server will not be created | `true`
`server.name` | Prometheus server container name | `server`
`server.image.repository` | Prometheus server container image repository | `prom/prometheus`
`server.image.tag` | Prometheus server container image tag | `v2.11.1`
`server.image.tag` | Prometheus server container image tag | `v2.13.1`
`server.image.pullPolicy` | Prometheus server container image pull policy | `IfNotPresent`
`server.enableAdminApi` | If true, Prometheus administrative HTTP API will be enabled. Please note, that you should take care of administrative API access protection (ingress or some frontend Nginx with auth) before enabling it. | `false`
`server.skipTSDBLock` | If true, Prometheus skip TSDB locking. | `false`
@@ -255,6 +255,7 @@ Parameter | Description | Default
`server.global.scrape_timeout` | How long until a scrape request times out | `10s`
`server.global.evaluation_interval` | How frequently to evaluate rules | `1m`
`server.extraArgs` | Additional Prometheus server container arguments | `{}`
`server.extraInitContainers` | Init containers to launch alongside the server | `[]`
`server.prefixURL` | The prefix slug at which the server can be accessed | ``
`server.baseURL` | The external url at which the server can be accessed | ``
`server.env` | Prometheus server environment variables | `[]`
@@ -38,6 +38,10 @@ spec:
schedulerName: "{{ .Values.server.schedulerName }}"
{{- end }}
serviceAccountName: {{ template "prometheus.serviceAccountName.server" . }}
{{- if .Values.server.extraInitContainers }}
initContainers:
{{ toYaml .Values.server.extraInitContainers | indent 8 }}
{{- end }}
containers:
- name: {{ template "prometheus.name" . }}-{{ .Values.server.name }}-{{ .Values.configmapReload.name }}
image: "{{ .Values.configmapReload.image.repository }}:{{ .Values.configmapReload.image.tag }}"
+5 -1
View File
@@ -543,7 +543,7 @@ server:
##
image:
repository: prom/prometheus
tag: v2.11.1
tag: v2.13.1
pullPolicy: IfNotPresent
## prometheus server priorityClassName
@@ -601,6 +601,10 @@ server:
##
extraArgs: {}
## Additional InitContainers to initialize the pod
##
extraInitContainers: []
## Additional Prometheus server Volume mounts
##
extraVolumeMounts: []