From 7a9263ad5dafd9a9f9a3108fe7f94330b3c78140 Mon Sep 17 00:00:00 2001
From: Joshua Stern <joshua.stern@appian.com>
Date: Fri, 26 Feb 2021 18:18:55 -0500
Subject: [PATCH] Allow for specifying automountServiceAccountToken

---
 charts/cluster-autoscaler/Chart.yaml                    | 2 +-
 charts/cluster-autoscaler/README.md                     | 1 +
 charts/cluster-autoscaler/templates/serviceaccount.yaml | 1 +
 charts/cluster-autoscaler/values.yaml                   | 2 ++
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/charts/cluster-autoscaler/Chart.yaml b/charts/cluster-autoscaler/Chart.yaml
index 78c3aca0e2ee..fd8d5e31dd40 100644
--- a/charts/cluster-autoscaler/Chart.yaml
+++ b/charts/cluster-autoscaler/Chart.yaml
@@ -17,4 +17,4 @@ name: cluster-autoscaler
 sources:
   - https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler
 type: application
-version: 9.6.0
+version: 9.7.0
diff --git a/charts/cluster-autoscaler/README.md b/charts/cluster-autoscaler/README.md
index 34d6d517e0b4..e6588d3be85c 100644
--- a/charts/cluster-autoscaler/README.md
+++ b/charts/cluster-autoscaler/README.md
@@ -380,6 +380,7 @@ Though enough for the majority of installations, the default PodSecurityPolicy _
 | rbac.create | bool | `true` | If `true`, create and use RBAC resources. |
 | rbac.pspEnabled | bool | `false` | If `true`, creates and uses RBAC resources required in the cluster with [Pod Security Policies](https://kubernetes.io/docs/concepts/policy/pod-security-policy/) enabled. Must be used with `rbac.create` set to `true`. |
 | rbac.serviceAccount.annotations | object | `{}` | Additional Service Account annotations. |
+| rbac.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for a Service Account. |
 | rbac.serviceAccount.create | bool | `true` | If `true` and `rbac.create` is also true, a Service Account will be created. |
 | rbac.serviceAccount.name | string | `""` | The name of the ServiceAccount to use. If not set and create is `true`, a name is generated using the fullname template. |
 | replicaCount | int | `1` | Desired number of pods |
diff --git a/charts/cluster-autoscaler/templates/serviceaccount.yaml b/charts/cluster-autoscaler/templates/serviceaccount.yaml
index 088b858be4bd..919869b227b7 100644
--- a/charts/cluster-autoscaler/templates/serviceaccount.yaml
+++ b/charts/cluster-autoscaler/templates/serviceaccount.yaml
@@ -8,4 +8,5 @@ metadata:
 {{- if .Values.rbac.serviceAccount.annotations }}
   annotations: {{ toYaml .Values.rbac.serviceAccount.annotations | nindent 4 }}
 {{- end }}
+automountServiceAccountToken: {{ .Values.rbac.serviceAccount.automountServiceAccountToken }}
 {{- end }}
diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml
index bee7bb9bdb65..005e2067d34b 100644
--- a/charts/cluster-autoscaler/values.yaml
+++ b/charts/cluster-autoscaler/values.yaml
@@ -244,6 +244,8 @@ rbac:
     create: true
     # rbac.serviceAccount.name -- The name of the ServiceAccount to use. If not set and create is `true`, a name is generated using the fullname template.
     name: ""
+    # rbac.serviceAccount.automountServiceAccountToken -- Automount API credentials for a Service Account.
+    automountServiceAccountToken: true
 
 # replicaCount -- Desired number of pods
 replicaCount: 1