From 2886b848baaaf011f947db9109f0b3f577134498 Mon Sep 17 00:00:00 2001
From: Owen Haynes <1472893+owenhaynes@users.noreply.github.com>
Date: Fri, 6 Nov 2020 21:15:06 +0000
Subject: [PATCH] Fix K8s service account usage (#1672)

* Fix K8s service account usage

* bump chart version

Co-authored-by: Aaron Schlesinger <70865+arschles@users.noreply.github.com>
---
 charts/athens-proxy/Chart.yaml                     | 2 +-
 charts/athens-proxy/templates/deployment.yaml      | 1 +
 charts/athens-proxy/templates/jaeger-deploy.yaml   | 2 +-
 charts/athens-proxy/templates/service-account.yaml | 4 ++++
 charts/athens-proxy/values.yaml                    | 3 +++
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/charts/athens-proxy/Chart.yaml b/charts/athens-proxy/Chart.yaml
index 0bf01121..9eae2584 100644
--- a/charts/athens-proxy/Chart.yaml
+++ b/charts/athens-proxy/Chart.yaml
@@ -1,5 +1,5 @@
 name: athens-proxy
-version: 0.4.13
+version: 0.4.14
 appVersion: 0.9.0
 description: The proxy server for Go modules
 icon: https://raw.githubusercontent.com/gomods/athens/main/docs/static/banner.png
diff --git a/charts/athens-proxy/templates/deployment.yaml b/charts/athens-proxy/templates/deployment.yaml
index f77f4d08..48516fab 100644
--- a/charts/athens-proxy/templates/deployment.yaml
+++ b/charts/athens-proxy/templates/deployment.yaml
@@ -34,6 +34,7 @@ spec:
 {{ toYaml .Values.annotations | indent 8 }}
         {{- end }}
     spec:
+      serviceAccount: {{ template "fullname" . }}
       {{- if .Values.sshGitServers }}
       initContainers:
         - name: copy-key-files
diff --git a/charts/athens-proxy/templates/jaeger-deploy.yaml b/charts/athens-proxy/templates/jaeger-deploy.yaml
index d5057abb..75083cc3 100644
--- a/charts/athens-proxy/templates/jaeger-deploy.yaml
+++ b/charts/athens-proxy/templates/jaeger-deploy.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.jaeger.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "fullname" . }}-jaeger
diff --git a/charts/athens-proxy/templates/service-account.yaml b/charts/athens-proxy/templates/service-account.yaml
index f6261f3c..4b1efe40 100644
--- a/charts/athens-proxy/templates/service-account.yaml
+++ b/charts/athens-proxy/templates/service-account.yaml
@@ -7,3 +7,7 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+  {{- end }}
diff --git a/charts/athens-proxy/values.yaml b/charts/athens-proxy/values.yaml
index 98448b4d..f3507c69 100644
--- a/charts/athens-proxy/values.yaml
+++ b/charts/athens-proxy/values.yaml
@@ -146,6 +146,9 @@ sshGitServers: {}
 
 goGetWorkers: 3
 
+serviceAccount:
+  annotations: {}
+
 nodeSelector: {}
 
 tolerations: []