From 0c2070ef4a70f09c0abe4d668dcdfd951522c9db Mon Sep 17 00:00:00 2001
From: Billy Walker <39878488+bwlkr@users.noreply.github.com>
Date: Thu, 27 Jan 2022 03:12:50 +0000
Subject: [PATCH] Adding annotations to the controller service account (#8173)

* fix: adding annotations to the controller service account

* fix: adding annotations to the controller service account
---
 charts/ingress-nginx/README.md                                | 1 +
 charts/ingress-nginx/templates/controller-serviceaccount.yaml | 4 ++++
 charts/ingress-nginx/values.yaml                              | 1 +
 3 files changed, 6 insertions(+)

diff --git a/charts/ingress-nginx/README.md b/charts/ingress-nginx/README.md
index 32dfd36e2..15536a79e 100644
--- a/charts/ingress-nginx/README.md
+++ b/charts/ingress-nginx/README.md
@@ -473,6 +473,7 @@ Kubernetes: `>=1.19.0-0`
 | rbac.create | bool | `true` |  |
 | rbac.scope | bool | `false` |  |
 | revisionHistoryLimit | int | `10` | Rollback limit |
+| serviceAccount.annotations | object | `{}` | Annotations for the controller service account |
 | serviceAccount.automountServiceAccountToken | bool | `true` |  |
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.name | string | `""` |  |
diff --git a/charts/ingress-nginx/templates/controller-serviceaccount.yaml b/charts/ingress-nginx/templates/controller-serviceaccount.yaml
index a4d7db5d2..824b2a124 100644
--- a/charts/ingress-nginx/templates/controller-serviceaccount.yaml
+++ b/charts/ingress-nginx/templates/controller-serviceaccount.yaml
@@ -10,5 +10,9 @@ metadata:
     {{- end }}
   name: {{ template "ingress-nginx.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
+  {{- if .Values.serviceAccount.annotations }}
+  annotations:
+  {{ toYaml .Values.serviceAccount.annotations | indent 4 }}
+  {{- end }}
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
 {{- end }}
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index bddd1eb5c..67144b097 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -888,6 +888,7 @@ serviceAccount:
   create: true
   name: ""
   automountServiceAccountToken: true
+  annotations: {}
 
 # -- Optional array of imagePullSecrets containing private registry credentials
 ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/