diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml index ea54f8470a..483728dd67 100644 --- a/stable/prometheus/Chart.yaml +++ b/stable/prometheus/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus -version: 11.0.4 +version: 11.0.5 appVersion: 2.16.0 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ diff --git a/stable/prometheus/README.md b/stable/prometheus/README.md index 5805941bb2..9b95cc0e01 100644 --- a/stable/prometheus/README.md +++ b/stable/prometheus/README.md @@ -211,6 +211,7 @@ Parameter | Description | Default `nodeExporter.image.tag` | node-exporter container image tag | `v0.18.1` `nodeExporter.image.pullPolicy` | node-exporter container image pull policy | `IfNotPresent` `nodeExporter.extraArgs` | Additional node-exporter container arguments | `{}` +`nodeExporter.extraInitContainers` | Init containers to launch alongside the node-exporter | `[]` `nodeExporter.extraHostPathMounts` | Additional node-exporter hostPath mounts | `[]` `nodeExporter.extraConfigmapMounts` | Additional node-exporter configMap mounts | `[]` `nodeExporter.hostNetwork` | If true, node-exporter pods share the host network namespace | `true` @@ -241,6 +242,7 @@ Parameter | Description | Default `pushgateway.image.tag` | pushgateway container image tag | `v1.0.1` `pushgateway.image.pullPolicy` | pushgateway container image pull policy | `IfNotPresent` `pushgateway.extraArgs` | Additional pushgateway container arguments | `{}` +`pushgateway.extraInitContainers` | Init containers to launch alongside the pushgateway | `[]` `pushgateway.ingress.enabled` | If true, pushgateway Ingress will be created | `false` `pushgateway.ingress.annotations` | pushgateway Ingress annotations | `{}` `pushgateway.ingress.hosts` | pushgateway Ingress hostnames | `[]` diff --git a/stable/prometheus/templates/alertmanager-deployment.yaml b/stable/prometheus/templates/alertmanager-deployment.yaml index 16ff669504..c943254720 100644 --- a/stable/prometheus/templates/alertmanager-deployment.yaml +++ b/stable/prometheus/templates/alertmanager-deployment.yaml @@ -33,6 +33,10 @@ spec: schedulerName: "{{ .Values.alertmanager.schedulerName }}" {{- end }} serviceAccountName: {{ template "prometheus.serviceAccountName.alertmanager" . }} + {{- if .Values.alertmanager.extraInitContainers }} + initContainers: +{{ toYaml .Values.alertmanager.extraInitContainers | indent 8 }} + {{- end }} {{- if .Values.alertmanager.priorityClassName }} priorityClassName: "{{ .Values.alertmanager.priorityClassName }}" {{- end }} diff --git a/stable/prometheus/templates/node-exporter-daemonset.yaml b/stable/prometheus/templates/node-exporter-daemonset.yaml index 478f10a9ba..aee32dab3f 100644 --- a/stable/prometheus/templates/node-exporter-daemonset.yaml +++ b/stable/prometheus/templates/node-exporter-daemonset.yaml @@ -30,6 +30,10 @@ spec: {{- end }} spec: serviceAccountName: {{ template "prometheus.serviceAccountName.nodeExporter" . }} + {{- if .Values.nodeExporter.extraInitContainers }} + initContainers: +{{ toYaml .Values.nodeExporter.extraInitContainers | indent 8 }} + {{- end }} {{- if .Values.nodeExporter.priorityClassName }} priorityClassName: "{{ .Values.nodeExporter.priorityClassName }}" {{- end }} diff --git a/stable/prometheus/templates/pushgateway-deployment.yaml b/stable/prometheus/templates/pushgateway-deployment.yaml index a681eda382..53cc06d94f 100644 --- a/stable/prometheus/templates/pushgateway-deployment.yaml +++ b/stable/prometheus/templates/pushgateway-deployment.yaml @@ -30,6 +30,10 @@ spec: {{- include "prometheus.pushgateway.labels" . | nindent 8 }} spec: serviceAccountName: {{ template "prometheus.serviceAccountName.pushgateway" . }} + {{- if .Values.pushgateway.extraInitContainers }} + initContainers: +{{ toYaml .Values.pushgateway.extraInitContainers | indent 8 }} + {{- end }} {{- if .Values.pushgateway.priorityClassName }} priorityClassName: "{{ .Values.pushgateway.priorityClassName }}" {{- end }} diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml index 5b3998c848..9288ee83c0 100644 --- a/stable/prometheus/values.yaml +++ b/stable/prometheus/values.yaml @@ -51,6 +51,10 @@ alertmanager: ## extraArgs: {} + ## Additional InitContainers to initialize the pod + ## + extraInitContainers: [] + ## The URL prefix at which the container can be accessed. Useful in the case the '-web.external-url' includes a slug ## so that the various internal URLs are still able to access as they are in the default case. ## (Optional) @@ -441,6 +445,10 @@ nodeExporter: ## extraArgs: {} + ## Additional InitContainers to initialize the pod + ## + extraInitContainers: [] + ## Additional node-exporter hostPath mounts ## extraHostPathMounts: [] @@ -925,6 +933,10 @@ pushgateway: ## for example: persistence.file: /data/pushgateway.data extraArgs: {} + ## Additional InitContainers to initialize the pod + ## + extraInitContainers: [] + ingress: ## If true, pushgateway Ingress will be created ##