fix(helm): missing templating for deployment labels (#6869)

ericpaulsen · deansheather · web-flow · commit 2da0702009c9 · 2023-04-06T17:03:21.000+10:00
Co-authored-by: Dean Sheather &lt;dean@deansheather.com&gt;
diff --git a/helm/templates/coder.yaml b/helm/templates/coder.yaml
@@ -7,14 +7,16 @@ metadata:
   annotations: {{ toYaml .Values.coder.serviceAccount.annotations | nindent 4 }}
   labels:
     {{- include "coder.labels" . | nindent 4 }}
-
 ---
 apiVersion: apps/v1
 kind: Deployment
 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
@@ -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:
