From 2da0702009c9d17b6031e6c05114ece27ce930dd Mon Sep 17 00:00:00 2001 From: Eric Paulsen Date: Thu, 6 Apr 2023 03:03:21 -0400 Subject: [PATCH] fix(helm): missing templating for deployment labels (#6869) Co-authored-by: Dean Sheather --- helm/templates/coder.yaml | 4 +++- helm/values.yaml | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/helm/templates/coder.yaml b/helm/templates/coder.yaml index 2896071952..6e5874f753 100644 --- a/helm/templates/coder.yaml +++ b/helm/templates/coder.yaml @@ -7,7 +7,6 @@ metadata: annotations: {{ toYaml .Values.coder.serviceAccount.annotations | nindent 4 }} labels: {{- include "coder.labels" . | nindent 4 }} - --- apiVersion: apps/v1 kind: Deployment @@ -15,6 +14,9 @@ metadata: name: coder labels: {{- include "coder.labels" . | nindent 4 }} + {{- with .Values.coder.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: {{ toYaml .Values.coder.annotations | nindent 4}} spec: replicas: {{ .Values.coder.replicaCount }} diff --git a/helm/values.yaml b/helm/values.yaml index f19b228e45..1d40168e0e 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -34,14 +34,14 @@ coder: # https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ annotations: {} - # coder.podAnnotations -- The Coder pod annotations. See: - # https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - podAnnotations: {} - # coder.labels -- The Deployment labels. See: # https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ labels: {} + # coder.podAnnotations -- The Coder pod annotations. See: + # https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + podAnnotations: {} + # coder.serviceAccount -- Configuration for the automatically created service # account. Creation of the service account cannot be disabled. serviceAccount: