Merge branch 'main' into grafana-fix-image-renderer

Signed-off-by: MH <zanhsieh@gmail.com>
grafana · Dec 15, 2024 · ea7e1bb · ea7e1bb
2 parents e408057 + e134ec8
commit ea7e1bb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: grafana
-version: 8.7.1
+version: 8.8.1
 appVersion: 11.4.0
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.

diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl
@@ -1088,6 +1088,9 @@ containers:
       - name: {{ .Values.gossipPortName }}-udp
         containerPort: 9094
         protocol: UDP
+      - name: profiling
+        containerPort: 6060
+        protocol: TCP
     env:
       - name: POD_IP
         valueFrom:

diff --git 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: {{ .Values.imageRenderer.automountServiceAccountToken }}
       {{- with .Values.imageRenderer.securityContext }}
       securityContext:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
@@ -1360,6 +1360,7 @@ imageRenderer:
 
   # image-renderer deployment serviceAccount
   serviceAccountName: ""
+  automountServiceAccountToken: false
   # image-renderer deployment securityContext
   securityContext: {}
   # image-renderer deployment container securityContext