diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml index a01703edb6..1411bc7dbf 100755 --- a/stable/prometheus/Chart.yaml +++ b/stable/prometheus/Chart.yaml @@ -1,5 +1,5 @@ name: prometheus -version: 4.1.1 +version: 4.3.0 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 diff --git a/stable/prometheus/README.md b/stable/prometheus/README.md index ae7a57cc47..c340ef5786 100644 --- a/stable/prometheus/README.md +++ b/stable/prometheus/README.md @@ -50,6 +50,7 @@ Parameter | Description | Default `alertmanager.image.tag` | alertmanager container image tag | `v0.5.1` `alertmanager.image.pullPolicy` | alertmanager container image pull policy | `IfNotPresent` `alertmanager.extraArgs` | Additional alertmanager container arguments | `{}` +`alertmanager.configMapOverrideName` | Prometheus alertmanager ConfigMap override where full-name is `{{.Release.Name}}-{{.Values.alertmanager.configMapOverrideName}}` and setting this value will prevent the default alertmanager ConfigMap from being generated | `""` `alertmanager.ingress.enabled` | If true, alertmanager Ingress will be created | `false` `alertmanager.ingress.annotations` | alertmanager Ingress annotations | `{}` `alertmanager.ingress.hosts` | alertmanager Ingress hostnames | `[]` @@ -141,6 +142,7 @@ Parameter | Description | Default `server.alertmanagerURL` | (optional) alertmanager URL; only used if alertmanager.enabled = false | `""` `server.extraArgs` | Additional Prometheus server container arguments | `{}` `server.extraHostPathMounts` | Additional Prometheus server hostPath mounts | `[]` +`server.configMapOverrideName` | Prometheus server ConfigMap override where full-name is `{{.Release.Name}}-{{.Values.server.configMapOverrideName}}` and setting this value will prevent the default server ConfigMap from being generated | `""` `server.ingress.enabled` | If true, Prometheus server Ingress will be created | `false` `server.ingress.annotations` | Prometheus server Ingress annotations | `[]` `server.ingress.hosts` | Prometheus server Ingress hostnames | `[]` diff --git a/stable/prometheus/templates/alertmanager-configmap.yaml b/stable/prometheus/templates/alertmanager-configmap.yaml index d1eda96f2d..c529365dfd 100644 --- a/stable/prometheus/templates/alertmanager-configmap.yaml +++ b/stable/prometheus/templates/alertmanager-configmap.yaml @@ -1,4 +1,4 @@ -{{- if .Values.alertmanager.enabled -}} +{{- if and .Values.alertmanager.enabled (empty .Values.alertmanager.configMapOverrideName) -}} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus/templates/alertmanager-deployment.yaml b/stable/prometheus/templates/alertmanager-deployment.yaml index 30ee9ba37d..3d624be101 100644 --- a/stable/prometheus/templates/alertmanager-deployment.yaml +++ b/stable/prometheus/templates/alertmanager-deployment.yaml @@ -73,7 +73,7 @@ spec: volumes: - name: config-volume configMap: - name: {{ template "prometheus.alertmanager.fullname" . }} + name: {{ if .Values.alertmanager.configMapOverrideName }}{{ .Release.Name }}-{{ .Values.alertmanager.configMapOverrideName }}{{- else }}{{ template "prometheus.alertmanager.fullname" . }}{{- end }} - name: storage-volume {{- if .Values.alertmanager.persistentVolume.enabled }} persistentVolumeClaim: diff --git a/stable/prometheus/templates/server-configmap.yaml b/stable/prometheus/templates/server-configmap.yaml index f5cfb400e7..f4d47cddce 100644 --- a/stable/prometheus/templates/server-configmap.yaml +++ b/stable/prometheus/templates/server-configmap.yaml @@ -1,3 +1,4 @@ +{{- if (empty .Values.server.configMapOverrideName) -}} apiVersion: v1 kind: ConfigMap metadata: @@ -10,3 +11,4 @@ metadata: name: {{ template "prometheus.server.fullname" . }} data: {{ toYaml .Values.serverFiles | indent 2 }} +{{- end }} diff --git a/stable/prometheus/templates/server-deployment.yaml b/stable/prometheus/templates/server-deployment.yaml index 8d1b1e03ad..a05ffbea5a 100644 --- a/stable/prometheus/templates/server-deployment.yaml +++ b/stable/prometheus/templates/server-deployment.yaml @@ -82,7 +82,7 @@ spec: volumes: - name: config-volume configMap: - name: {{ template "prometheus.server.fullname" . }} + name: {{ if .Values.server.configMapOverrideName }}{{ .Release.Name }}-{{ .Values.server.configMapOverrideName }}{{- else }}{{ template "prometheus.server.fullname" . }}{{- end }} - name: storage-volume {{- if .Values.server.persistentVolume.enabled }} persistentVolumeClaim: diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml index b569459767..5687bf2b14 100644 --- a/stable/prometheus/values.yaml +++ b/stable/prometheus/values.yaml @@ -23,6 +23,12 @@ alertmanager: ## extraEnv: {} + ## ConfigMap override where fullname is {{.Release.Name}}-{{.Values.alertmanager.configMapOverrideName}} + ## Defining configMapOverrideName will cause templates/alertmanager-configmap.yaml + ## to NOT generate a ConfigMap resource + ## + configMapOverrideName: "" + ingress: ## If true, alertmanager Ingress will be created ## @@ -307,6 +313,12 @@ server: # hostPath: /etc/kubernetes/certs # readOnly: true + ## ConfigMap override where fullname is {{.Release.Name}}-{{.Values.server.configMapOverrideName}} + ## Defining configMapOverrideName will cause templates/server-configmap.yaml + ## to NOT generate a ConfigMap resource + ## + configMapOverrideName: "" + ingress: ## If true, Prometheus server Ingress will be created ##