Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $auth := mustMergeOverwrite (mustDeepCopy .Values) .Values.auth -}}
{{- $projectedServiceAccountToken := semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version }}
{{- if $auth.serviceAccount.create -}}
apiVersion: v1
kind: ServiceAccount
Expand All @@ -19,4 +20,7 @@ metadata:
azure.workload.identity/client-id: "{{ $auth.azure.clientID }}"
{{- end }}
{{- end -}}
{{- if $projectedServiceAccountToken }}
automountServiceAccountToken: false
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- $proxy := mustMergeOverwrite (mustDeepCopy .Values) .Values.proxy -}}
{{- $projectedServiceAccountToken := semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version }}
{{- if $proxy.serviceAccount.create -}}
apiVersion: v1
kind: ServiceAccount
Expand All @@ -13,4 +14,7 @@ metadata:
{{- if $proxy.annotations.serviceAccount }}
annotations: {{- toYaml $proxy.annotations.serviceAccount | nindent 4 }}
{{- end -}}
{{- if $projectedServiceAccountToken }}
automountServiceAccountToken: false
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,25 @@ tests:
- equal:
path: metadata.labels.baz
value: overridden

- it: does not set automountServiceAccountToken if cluster version is <1.20
set:
clusterName: helm-lint
capabilities:
majorVersion: 1
minorVersion: 18
asserts:
- notEqual:
path: automountServiceAccountToken
value: false

- it: sets automountServiceAccountToken to false if cluster version is >=1.20
set:
clusterName: helm-lint
capabilities:
majorVersion: 1
minorVersion: 20
asserts:
- equal:
path: automountServiceAccountToken
value: false
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,25 @@ tests:
- equal:
path: metadata.labels.baz
value: overridden

- it: does not set automountServiceAccountToken if cluster version is <1.20
set:
clusterName: helm-lint
capabilities:
majorVersion: 1
minorVersion: 18
asserts:
- notEqual:
path: automountServiceAccountToken
value: false

- it: sets automountServiceAccountToken to false if cluster version is >=1.20
set:
clusterName: helm-lint
capabilities:
majorVersion: 1
minorVersion: 20
asserts:
- equal:
path: automountServiceAccountToken
value: false