From f884c8ef0e77ef53092a36b68aa62a408de44fe1 Mon Sep 17 00:00:00 2001 From: Chris Werner Rau Date: Mon, 9 Sep 2024 11:35:41 +0200 Subject: [PATCH 1/2] fix: don't automount default serviceAccount Signed-off-by: Chris Werner Rau --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/image-renderer-deployment.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 87696c7225..bc39bc2123 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.5.1 +version: 8.5.2 appVersion: 11.2.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/image-renderer-deployment.yaml b/charts/grafana/templates/image-renderer-deployment.yaml index 4828aa38aa..75297cd27f 100644 --- a/charts/grafana/templates/image-renderer-deployment.yaml +++ b/charts/grafana/templates/image-renderer-deployment.yaml @@ -46,6 +46,7 @@ spec: {{- with .Values.imageRenderer.serviceAccountName }} serviceAccountName: "{{ . }}" {{- end }} + automountServiceAccountToken: {{ not (empty .Values.imageRenderer.serviceAccountName) }} {{- with .Values.imageRenderer.securityContext }} securityContext: {{- toYaml . | nindent 8 }} From 6244db77e71bd0a15345aa0f27092cd4e0f60c0f Mon Sep 17 00:00:00 2001 From: Chris Werner Rau Date: Wed, 18 Sep 2024 10:23:24 +0200 Subject: [PATCH 2/2] chore: make automountServiceAccountToken configurable this doesn't make sense, but as per request by https://github.com/grafana/helm-charts/pull/3302#issuecomment-2353413283, it has to be done Signed-off-by: Chris Werner Rau --- charts/grafana/templates/image-renderer-deployment.yaml | 2 +- charts/grafana/values.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/grafana/templates/image-renderer-deployment.yaml b/charts/grafana/templates/image-renderer-deployment.yaml index 75297cd27f..ead476e219 100644 --- a/charts/grafana/templates/image-renderer-deployment.yaml +++ b/charts/grafana/templates/image-renderer-deployment.yaml @@ -46,7 +46,7 @@ spec: {{- with .Values.imageRenderer.serviceAccountName }} serviceAccountName: "{{ . }}" {{- end }} - automountServiceAccountToken: {{ not (empty .Values.imageRenderer.serviceAccountName) }} + automountServiceAccountToken: {{ .Values.imageRenderer.automountServiceAccountToken }} {{- with .Values.imageRenderer.securityContext }} securityContext: {{- toYaml . | nindent 8 }} diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 51e94e01ff..f02c0077a3 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -1198,6 +1198,7 @@ imageRenderer: # image-renderer deployment serviceAccount serviceAccountName: "" + automountServiceAccountToken: false # image-renderer deployment securityContext securityContext: {} # image-renderer deployment container securityContext