[stable/prometheus] Make service account annotations configurable (#21537)

This change makes the annotations for service accounts configurable.

This change is useful when you need to set specific annotations to
service accounts, for example when using IAM Roles for service accounts
in AWS EKS.

Signed-off-by: Hyeonseop Lee <hyeonseop@ls-al.me>
This commit is contained in:
Hyeonseop Lee
2020-03-20 09:08:37 -07:00
committed by GitHub
parent b729ce76f8
commit aa5c19a1c4
7 changed files with 17 additions and 1 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: prometheus
version: 11.0.2
version: 11.0.3
appVersion: 2.16.0
description: Prometheus is a monitoring system and time series database.
home: https://prometheus.io/
+4
View File
@@ -354,14 +354,18 @@ Parameter | Description | Default
`server.strategy` | Deployment strategy | `{ "type": "RollingUpdate" }`
`serviceAccounts.alertmanager.create` | If true, create the alertmanager service account | `true`
`serviceAccounts.alertmanager.name` | name of the alertmanager service account to use or create | `{{ prometheus.alertmanager.fullname }}`
`serviceAccounts.alertmanager.annotations` | annotations for the alertmanager service account | `{}`
`serviceAccounts.kubeStateMetrics.create` | If true, create the kubeStateMetrics service account | `true`
`serviceAccounts.kubeStateMetrics.name` | name of the kubeStateMetrics service account to use or create | `{{ prometheus.kubeStateMetrics.fullname }}`
`serviceAccounts.nodeExporter.create` | If true, create the nodeExporter service account | `true`
`serviceAccounts.nodeExporter.name` | name of the nodeExporter service account to use or create | `{{ prometheus.nodeExporter.fullname }}`
`serviceAccounts.nodeExporter.annotations` | annotations for the nodeExporter service account | `{}`
`serviceAccounts.pushgateway.create` | If true, create the pushgateway service account | `true`
`serviceAccounts.pushgateway.name` | name of the pushgateway service account to use or create | `{{ prometheus.pushgateway.fullname }}`
`serviceAccounts.pushgateway.annotations` | annotations for the pushgateway service account | `{}`
`serviceAccounts.server.create` | If true, create the server service account | `true`
`serviceAccounts.server.name` | name of the server service account to use or create | `{{ prometheus.server.fullname }}`
`serviceAccounts.server.annotations` | annotations for the server service account | `{}`
`server.terminationGracePeriodSeconds` | Prometheus server Pod termination grace period | `300`
`server.retention` | (optional) Prometheus data retention | `"15d"`
`serverFiles.alerts` | (Deprecated) Prometheus server alerts configuration | `{}`
@@ -5,4 +5,6 @@ metadata:
labels:
{{- include "prometheus.alertmanager.labels" . | nindent 4 }}
name: {{ template "prometheus.serviceAccountName.alertmanager" . }}
annotations:
{{ toYaml .Values.serviceAccounts.alertmanager.annotations | indent 4 }}
{{- end -}}
@@ -5,4 +5,6 @@ metadata:
labels:
{{- include "prometheus.nodeExporter.labels" . | nindent 4 }}
name: {{ template "prometheus.serviceAccountName.nodeExporter" . }}
annotations:
{{ toYaml .Values.serviceAccounts.nodeExporter.annotations | indent 4 }}
{{- end -}}
@@ -5,4 +5,6 @@ metadata:
labels:
{{- include "prometheus.pushgateway.labels" . | nindent 4 }}
name: {{ template "prometheus.serviceAccountName.pushgateway" . }}
annotations:
{{ toYaml .Values.serviceAccounts.pushgateway.annotations | indent 4 }}
{{- end -}}
@@ -6,5 +6,7 @@ metadata:
labels:
{{- include "prometheus.server.labels" . | nindent 4 }}
name: {{ template "prometheus.serviceAccountName.server" . }}
annotations:
{{ toYaml .Values.serviceAccounts.server.annotations | indent 4 }}
{{- end }}
{{- end }}
+4
View File
@@ -13,15 +13,19 @@ serviceAccounts:
alertmanager:
create: true
name:
annotations: {}
nodeExporter:
create: true
name:
annotations: {}
pushgateway:
create: true
name:
annotations: {}
server:
create: true
name:
annotations: {}
alertmanager:
## If false, alertmanager will not be installed