From 6dde2dbd438f6ceb2e9be3f1611bed9b6c78d61f Mon Sep 17 00:00:00 2001 From: Eric Paulsen Date: Tue, 18 Oct 2022 20:37:12 -0500 Subject: [PATCH 1/3] helm: add sa annotations --- helm/templates/coder.yaml | 3 +++ helm/values.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/helm/templates/coder.yaml b/helm/templates/coder.yaml index 02badc277d81f..74d36030df3f8 100644 --- a/helm/templates/coder.yaml +++ b/helm/templates/coder.yaml @@ -4,6 +4,9 @@ apiVersion: v1 kind: ServiceAccount metadata: name: coder + annotations: {{ toYaml .Values.coder.serviceAccount.annotations | nindent 4 }} + labels: + {{- include "coder.labels" . | nindent 4 -}} --- apiVersion: apps/v1 diff --git a/helm/values.yaml b/helm/values.yaml index 392a53c187492..7a45d51597933 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -33,6 +33,9 @@ coder: # It is recommended to keep this on if you are using Kubernetes templates # within Coder. workspacePerms: true + # coder.serviceAccount.annotations -- The Coder service account annotations. + annotations: + iam.gke.io/gke-metadata-server-enabled: "true" # coder.env -- The environment variables to set for Coder. These can be used # to configure all aspects of `coder server`. Please see `coder server --help` From 4756e598a490dcb7a5533d71ddb0f10d8cc6f577 Mon Sep 17 00:00:00 2001 From: Eric Paulsen Date: Tue, 18 Oct 2022 22:41:49 -0500 Subject: [PATCH 2/3] rm: test annotation --- helm/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/helm/values.yaml b/helm/values.yaml index 7a45d51597933..0e2a27894868e 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -34,8 +34,7 @@ coder: # within Coder. workspacePerms: true # coder.serviceAccount.annotations -- The Coder service account annotations. - annotations: - iam.gke.io/gke-metadata-server-enabled: "true" + annotations: {} # coder.env -- The environment variables to set for Coder. These can be used # to configure all aspects of `coder server`. Please see `coder server --help` From 0110db0317a3908287c56e18fa64aa9c7d4b6884 Mon Sep 17 00:00:00 2001 From: Eric Paulsen Date: Wed, 19 Oct 2022 08:41:16 -0500 Subject: [PATCH 3/3] fix: labels bracket Co-authored-by: Dean Sheather --- helm/templates/coder.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/templates/coder.yaml b/helm/templates/coder.yaml index 74d36030df3f8..9cb272b04319a 100644 --- a/helm/templates/coder.yaml +++ b/helm/templates/coder.yaml @@ -6,7 +6,7 @@ metadata: name: coder annotations: {{ toYaml .Values.coder.serviceAccount.annotations | nindent 4 }} labels: - {{- include "coder.labels" . | nindent 4 -}} + {{- include "coder.labels" . | nindent 4 }} --- apiVersion: apps/v1