use of automount service account on v1.22 and newer (#75)

haproxy-ingress · Sep 1, 2023 · d13a42b · d13a42b
1 parent 16eb840
commit d13a42b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/haproxy-ingress/templates/_podtemplate.yaml b/haproxy-ingress/templates/_podtemplate.yaml
@@ -18,7 +18,9 @@ spec:
     {{- toYaml .Values.controller.podAffinity | nindent 4 }}
 {{- end }}
   serviceAccountName: {{ include "haproxy-ingress.serviceAccountName" . }}
+{{- if semverCompare ">= 1.22-0" .Capabilities.KubeVersion.Version }}
   automountServiceAccountToken: {{ .Values.controller.automountServiceAccountToken }}
+{{- end }}
 {{- if or .Values.controller.haproxy.enabled .Values.controller.initContainers }}
   initContainers:
 {{- if .Values.controller.haproxy.enabled }}

diff --git a/haproxy-ingress/templates/serviceaccount.yaml b/haproxy-ingress/templates/serviceaccount.yaml
@@ -1,7 +1,9 @@
 {{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
+{{- if semverCompare ">= 1.22-0" .Capabilities.KubeVersion.Version }}
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
+{{- end }}
 metadata:
   labels:
     {{- include "haproxy-ingress.labels" . | nindent 4 }}