remove serviceAccountName from Deployment and StatefulSet, when it's …

…disabled (#1684)
VictoriaMetrics · Nov 5, 2024 · 9559f33 · 9559f33
1 parent 9852491
commit 9559f33
Show file tree

Hide file tree

Showing 21 changed files with 44 additions and 18 deletions.
diff --git a/charts/victoria-metrics-agent/CHANGELOG.md b/charts/victoria-metrics-agent/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- Fix Deployment/StatefulSets when `serviceAccount.name` is empty and `serviceAccount.create: false`. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/1683).
 
 ## 0.14.5
 

diff --git a/charts/victoria-metrics-agent/templates/deployment.yaml b/charts/victoria-metrics-agent/templates/deployment.yaml
@@ -30,7 +30,9 @@ spec:
       {{- $annotations := merge (dict "checksum/config" (include (print .Template.BasePath "/configmap.yaml") . | sha256sum)) (deepCopy .Values.podAnnotations) }}
       annotations: {{ toYaml $annotations | nindent 8 }}
     spec:
+      {{- if or (.Values.serviceAccount).name (.Values.serviceAccount).create }}
       serviceAccountName: {{ (.Values.serviceAccount).name | default $fullname }}
+      {{- end }}
       {{- if .Values.podSecurityContext.enabled }}
       securityContext: {{ include "vm.securityContext" (dict "securityContext" .Values.podSecurityContext "helm" .) | nindent 8 }}
       {{- end }}

diff --git a/charts/victoria-metrics-agent/templates/statefulset.yaml b/charts/victoria-metrics-agent/templates/statefulset.yaml
@@ -31,7 +31,9 @@ spec:
       {{- $annotations := merge (dict "checksum/config" (include (print .Template.BasePath "/configmap.yaml") . | sha256sum)) (deepCopy .Values.podAnnotations) }}
       annotations: {{ toYaml $annotations | nindent 8 }}
     spec:
+      {{- if or (.Values.serviceAccount).name (.Values.serviceAccount).create }}
       serviceAccountName: {{ (.Values.serviceAccount).name | default $fullname }}
+      {{- end }}
       {{- if .Values.podSecurityContext.enabled }}
       securityContext: {{ include "vm.securityContext" (dict "securityContext" .Values.podSecurityContext "helm" .) | nindent 8 }}
       {{- end }}

diff --git a/charts/victoria-metrics-alert/CHANGELOG.md b/charts/victoria-metrics-alert/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- Fix Deployment/StatefulSets when `serviceAccount.name` is empty and `serviceAccount.create: false`. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/1683).
 
 ## 0.12.4
 

diff --git a/charts/victoria-metrics-alert/templates/alertmanager-deployment.yaml b/charts/victoria-metrics-alert/templates/alertmanager-deployment.yaml
@@ -28,8 +28,10 @@ spec:
       {{- $annotations = merge $annotations (deepCopy $app.podMetadata.annotations) }}
       annotations: {{ toYaml $annotations | nindent 8 }}
     spec:
+      {{- if or (.Values.serviceAccount).name (.Values.serviceAccount).create }}
       serviceAccountName: {{ (.Values.serviceAccount).name | default $sa }}
       automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
+      {{- end }}
       {{- if $app.podSecurityContext.enabled }}
       securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
       {{- end }}

diff --git a/charts/victoria-metrics-alert/templates/server-deployment.yaml b/charts/victoria-metrics-alert/templates/server-deployment.yaml
@@ -38,11 +38,13 @@ spec:
       {{- $annotations = merge $annotations $app.podAnnotations }}
       annotations: {{ toYaml $annotations | nindent 8 }}
     spec:
+      {{- if or (.Values.serviceAccount).name (.Values.serviceAccount).create }}
       serviceAccountName: {{ (.Values.serviceAccount).name | default $sa }}
+      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
+      {{- end }}
       {{- if $app.podSecurityContext.enabled }}
       securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
       {{- end }}
-      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
       {{- with ($app.imagePullSecrets | default .Values.global.imagePullSecrets) }}
       imagePullSecrets: {{ toYaml . | nindent 8 }}
       {{- end }}

diff --git a/charts/victoria-metrics-auth/CHANGELOG.md b/charts/victoria-metrics-auth/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- Fix Deployment/StatefulSets when `serviceAccount.name` is empty and `serviceAccount.create: false`. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/1683).
 
 ## 0.7.4
 

diff --git a/charts/victoria-metrics-auth/templates/deployment.yaml b/charts/victoria-metrics-auth/templates/deployment.yaml
@@ -22,7 +22,9 @@ spec:
       {{- $annotations := merge (dict "checksum/config" (include (print .Template.BasePath "/secret.yaml") . | sha256sum)) .Values.podAnnotations }}
       annotations: {{ toYaml $annotations | nindent 8 }}
     spec:
-      serviceAccountName: {{ .Values.serviceAccount.name | default $fullname }}
+      {{- if or (.Values.serviceAccount).name (.Values.serviceAccount).create }}
+      serviceAccountName: {{ (.Values.serviceAccount).name | default $fullname }}
+      {{- end }}
       {{- if .Values.podSecurityContext.enabled }}
       securityContext: {{ include "vm.securityContext" (dict "securityContext" .Values.podSecurityContext "helm" .) | nindent 8 }}
       {{- end }}

diff --git a/charts/victoria-metrics-cluster/CHANGELOG.md b/charts/victoria-metrics-cluster/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- Fix Deployment/StatefulSets when `serviceAccount.name` is empty and `serviceAccount.create: false`. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/1683).
 
 ## 0.14.7
 

diff --git a/charts/victoria-metrics-cluster/Chart.yaml b/charts/victoria-metrics-cluster/Chart.yaml
@@ -3,7 +3,7 @@ type: application
 appVersion: v1.106.0
 description: Victoria Metrics Cluster version - high-performance, cost-effective and scalable TSDB, long-term remote storage for Prometheus
 name: victoria-metrics-cluster
-version: 0.14.7
+version: 0.14.8
 sources:
   - https://github.com/VictoriaMetrics/helm-charts
 icon: https://avatars.githubusercontent.com/u/43720803?s=200&v=4

diff --git a/charts/victoria-metrics-cluster/templates/vminsert-deployment.yaml b/charts/victoria-metrics-cluster/templates/vminsert-deployment.yaml
@@ -35,7 +35,6 @@ spec:
       {{- with $app.priorityClassName }}
       priorityClassName: {{ . }}
       {{- end }}
-      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
       {{- with $app.initContainers }}
       initContainers: {{ toYaml . | nindent 8 }}
       {{- end }}
@@ -125,7 +124,10 @@ spec:
       {{- if $app.podSecurityContext.enabled }}
       securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
       {{- end }}
+      {{- if or (.Values.serviceAccount).name (.Values.serviceAccount).create }}
+      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
       serviceAccountName: {{ (.Values.serviceAccount).name | default $sa }}
+      {{- end }}
       {{- with $app.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
       {{- end }}

diff --git a/charts/victoria-metrics-cluster/templates/vmselect-deployment.yaml b/charts/victoria-metrics-cluster/templates/vmselect-deployment.yaml
@@ -36,7 +36,6 @@ spec:
       {{- with $app.priorityClassName }}
       priorityClassName: {{ . }}
       {{- end }}
-      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
       {{- with $app.initContainers }}
       initContainers: {{ toYaml . | nindent 8 }}
       {{- end }}
@@ -106,7 +105,10 @@ spec:
       {{- if $app.podSecurityContext.enabled }}
       securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
       {{- end }}
+      {{- if or (.Values.serviceAccount).name (.Values.serviceAccount).create }}
+      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
       serviceAccountName: {{ (.Values.serviceAccount).name | default $sa }}
+      {{- end }}
       {{- with $app.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
       {{- end }}

diff --git a/charts/victoria-metrics-cluster/templates/vmselect-statefulset.yaml b/charts/victoria-metrics-cluster/templates/vmselect-statefulset.yaml
@@ -33,7 +33,6 @@ spec:
       {{- with $app.priorityClassName }}
       priorityClassName: {{ . }}
       {{- end }}
-      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
       {{- with $app.initContainers }}
       initContainers: {{ toYaml . | nindent 8 }}
       {{- end }}
@@ -103,7 +102,10 @@ spec:
       {{- if $app.podSecurityContext.enabled }}
       securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
       {{- end }}
+      {{- if or (.Values.serviceAccount).name (.Values.serviceAccount).create }}
+      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
       serviceAccountName: {{ (.Values.serviceAccount).name | default $sa }}
+      {{- end }}
       {{- with $app.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
       {{- end }}

diff --git a/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml b/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml
@@ -35,7 +35,6 @@ spec:
       {{- with $app.schedulerName }}
       schedulerName: {{ . }}
       {{- end }}
-      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
       {{- $manager := $app.vmbackupmanager }}
       {{- if or $app.initContainers $manager.restore.onStart.enabled }}
       initContainers:
@@ -218,7 +217,10 @@ spec:
       {{- if $app.podSecurityContext.enabled }}
       securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
       {{- end }}
+      {{- if or (.Values.serviceAccount).name (.Values.serviceAccount).create }}
+      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
       serviceAccountName: {{ (.Values.serviceAccount).name | default $sa }}
+      {{- end }}
       {{- with $app.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
       {{- end }}

diff --git a/charts/victoria-metrics-gateway/CHANGELOG.md b/charts/victoria-metrics-gateway/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- Fix Deployment/StatefulSets when `serviceAccount.name` is empty and `serviceAccount.create: false`. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/1683).
 
 ## 0.5.4
 

diff --git a/charts/victoria-metrics-gateway/templates/deployment.yaml b/charts/victoria-metrics-gateway/templates/deployment.yaml
@@ -46,7 +46,9 @@ spec:
       {{- $annotations := merge (dict "checksum/config" (include (print .Template.BasePath "/configmap.yaml") . | sha256sum)) .Values.podAnnotations }}
       annotations: {{ toYaml $annotations | nindent 8 }}
     spec:
+      {{- if or (.Values.serviceAccount).name (.Values.serviceAccount).create }}
       serviceAccountName: {{ (.Values.serviceAccount).name | default $fullname }}
+      {{- end }}
       {{- if .Values.podSecurityContext.enabled }}
       securityContext: {{ include "vm.securityContext" (dict "securityContext" .Values.podSecurityContext "helm" .) | nindent 8 }}
       {{- end }}

diff --git a/charts/victoria-metrics-operator/CHANGELOG.md b/charts/victoria-metrics-operator/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- Fix Deployment/StatefulSets when `serviceAccount.name` is empty and `serviceAccount.create: false`. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/1683).
 
 ## 0.37.0
 

diff --git a/charts/victoria-metrics-operator/templates/deployment.yaml b/charts/victoria-metrics-operator/templates/deployment.yaml
@@ -28,7 +28,9 @@ spec:
       {{- if .Values.podSecurityContext.enabled }}
       securityContext: {{ include "vm.securityContext" (dict "securityContext" .Values.podSecurityContext "helm" .) | nindent 8 }}
       {{- end }}
+      {{- if or (.Values.serviceAccount).name (.Values.serviceAccount).create }}
       serviceAccountName: {{ (.Values.serviceAccount).name | default $fullname }}
+      {{- end }}
       {{- with (.Values.imagePullSecrets | default .Values.global.imagePullSecrets) }}
       imagePullSecrets: {{ toYaml . | nindent 8 }}
       {{- end }}

diff --git a/charts/victoria-metrics-single/CHANGELOG.md b/charts/victoria-metrics-single/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- Fix Deployment/StatefulSets when `serviceAccount.name` is empty and `serviceAccount.create: false`. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/1683).
 
 ## 0.12.4
 

diff --git a/charts/victoria-metrics-single/templates/server-deployment.yaml b/charts/victoria-metrics-single/templates/server-deployment.yaml
@@ -37,7 +37,6 @@ spec:
       {{- with $app.schedulerName }}
       schedulerName: {{ . }}
       {{- end }}
-      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
       {{- $manager := $app.vmbackupmanager }}
       {{- if or $app.initContainers $manager.restore.onStart.enabled }}
       initContainers:
@@ -241,7 +240,10 @@ spec:
       {{- if $app.podSecurityContext.enabled }}
       securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ .Values.serviceAccount.name | default $fullname }}
+      {{- if or (.Values.serviceAccount).name (.Values.serviceAccount).create }}
+      serviceAccountName: {{ (.Values.serviceAccount).name | default $fullname }}
+      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
+      {{- end }}
       {{- with $app.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
       {{- end }}

diff --git a/charts/victoria-metrics-single/templates/server-statefulset.yaml b/charts/victoria-metrics-single/templates/server-statefulset.yaml
@@ -35,7 +35,6 @@ spec:
       {{- with $app.schedulerName }}
       schedulerName: {{ . }}
       {{- end }}
-      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
       {{- $manager := $app.vmbackupmanager }}
       {{- if or $app.initContainers $manager.restore.onStart.enabled }}
       initContainers:
@@ -245,7 +244,10 @@ spec:
       {{- if $app.podSecurityContext.enabled }}
       securityContext: {{ include "vm.securityContext" (dict "securityContext" $app.podSecurityContext "helm" .) | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ .Values.serviceAccount.name | default $fullname }}
+      {{- if or (.Values.serviceAccount).name (.Values.serviceAccount).create }}
+      serviceAccountName: {{ (.Values.serviceAccount).name | default $fullname }}
+      automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
+      {{- end }}
       {{- with $app.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
       {{- end }}