diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index bbf453b8bac3..0dabd7219232 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -23,7 +23,7 @@ name: kube-prometheus-stack sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus -version: 62.6.0 +version: 62.7.0 appVersion: v0.76.1 kubeVersion: ">=1.19.0-0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/serviceaccount.yaml index 55511da36b7b..15ff86e61775 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/serviceaccount.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/deployment/serviceaccount.yaml @@ -8,6 +8,9 @@ metadata: labels: app: {{ template "kube-prometheus-stack.name" . }}-operator {{- include "kube-prometheus-stack.prometheus-operator-webhook.labels" . | indent 4 }} + {{- with .Values.prometheusOperator.admissionWebhooks.deployment.serviceAccount.annotations }} + annotations: {{- toYaml . | nindent 4 }} + {{- end }} {{- if .Values.global.imagePullSecrets }} imagePullSecrets: {{ include "kube-prometheus-stack.imagePullSecrets" . | trim | indent 2 }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml index 8dab40c60943..b89d6a63dc9c 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml @@ -10,6 +10,9 @@ metadata: labels: app: {{ template "kube-prometheus-stack.name" $ }}-admission {{- include "kube-prometheus-stack.prometheus-operator-webhook.labels" $ | nindent 4 }} + {{- with .Values.prometheusOperator.admissionWebhooks.patch.serviceAccount.annotations }} + annotations: {{- toYaml . | nindent 4 }} + {{- end }} automountServiceAccountToken: {{ .Values.prometheusOperator.admissionWebhooks.patch.serviceAccount.automountServiceAccountToken }} {{- if .Values.global.imagePullSecrets }} imagePullSecrets: diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/serviceaccount.yaml index 4f84974f9b00..0b09798add85 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/serviceaccount.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/serviceaccount.yaml @@ -6,6 +6,9 @@ metadata: namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: {{- include "kube-prometheus-stack.prometheus-operator.labels" . | nindent 4 }} + {{- with .Values.prometheusOperator.serviceAccount.annotations }} + annotations: {{- toYaml . | nindent 4 }} + {{- end }} automountServiceAccountToken: {{ .Values.prometheusOperator.serviceAccount.automountServiceAccountToken }} {{- if .Values.global.imagePullSecrets }} imagePullSecrets: diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index 69f2c07d2124..f0619b063fdd 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -2310,6 +2310,7 @@ prometheusOperator: ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ ## serviceAccount: + annotations: {} automountServiceAccountToken: false create: true name: "" @@ -2531,6 +2532,7 @@ prometheusOperator: ## serviceAccount: create: true + annotations: {} automountServiceAccountToken: true # Security context for create job container @@ -2612,6 +2614,7 @@ prometheusOperator: create: true name: "" automountServiceAccountToken: true + annotations: {} ## Configuration for Prometheus operator service ##