From 007070166a546675c52ae7c4e1137c3bbbe567f9 Mon Sep 17 00:00:00 2001
From: Eric <ericpaulsen@coder.com>
Date: Fri, 14 Apr 2023 15:56:53 +0000
Subject: [PATCH 1/4] feat(helm): add labels for coder pod

---
 helm/templates/coder.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helm/templates/coder.yaml b/helm/templates/coder.yaml
index 6e5874f753acf..06a97f4f409a3 100644
--- a/helm/templates/coder.yaml
+++ b/helm/templates/coder.yaml
@@ -27,6 +27,7 @@ spec:
     metadata:
       labels:
         {{- include "coder.labels" . | nindent 8 }}
+        {{- toYaml .Values.coder.labels | nindent 8 }}
       annotations:
         {{- toYaml .Values.coder.podAnnotations | nindent 8  }}
     spec:

From 71dc55cf174e4d77292528ccc78658d3225cdeb4 Mon Sep 17 00:00:00 2001
From: Eric <ericpaulsen@coder.com>
Date: Fri, 14 Apr 2023 16:35:24 +0000
Subject: [PATCH 2/4] feedback & syntax fix

---
 helm/templates/coder.yaml | 4 +++-
 helm/values.yaml          | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/helm/templates/coder.yaml b/helm/templates/coder.yaml
index 06a97f4f409a3..d4c39b49add53 100644
--- a/helm/templates/coder.yaml
+++ b/helm/templates/coder.yaml
@@ -27,7 +27,9 @@ spec:
     metadata:
       labels:
         {{- include "coder.labels" . | nindent 8 }}
-        {{- toYaml .Values.coder.labels | nindent 8 }}
+        {{- with .Values.coder.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         {{- toYaml .Values.coder.podAnnotations | nindent 8  }}
     spec:
diff --git a/helm/values.yaml b/helm/values.yaml
index 1d40168e0e7e2..d4db330bd30a6 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -38,6 +38,10 @@ coder:
   # https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
   labels: {}
 
+  # coder.podLabels -- The Coder pod labels. See:
+  # https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+  podlabels: {}
+
   # coder.podAnnotations -- The Coder pod annotations. See:
   # https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
   podAnnotations: {}

From 4ba185dbcb6142400a42daec8cb5c3b8a10e4d48 Mon Sep 17 00:00:00 2001
From: Eric <ericpaulsen@coder.com>
Date: Fri, 14 Apr 2023 17:18:02 +0000
Subject: [PATCH 3/4] ordering

---
 helm/values.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/helm/values.yaml b/helm/values.yaml
index d4db330bd30a6..e55fb0b1fc7eb 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -38,14 +38,14 @@ coder:
   # https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
   labels: {}
 
-  # coder.podLabels -- The Coder pod labels. See:
-  # https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
-  podlabels: {}
-
   # coder.podAnnotations -- The Coder pod annotations. See:
   # https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
   podAnnotations: {}
 
+  # coder.podLabels -- The Coder pod labels. See:
+  # https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+  podlabels: {}
+
   # coder.serviceAccount -- Configuration for the automatically created service
   # account. Creation of the service account cannot be disabled.
   serviceAccount:

From b9b06b260a0ad8efa2bf4b5bf91633365f16d40f Mon Sep 17 00:00:00 2001
From: Eric <ericpaulsen@coder.com>
Date: Fri, 14 Apr 2023 17:22:26 +0000
Subject: [PATCH 4/4] fix: notation

---
 helm/templates/coder.yaml | 2 +-
 helm/values.yaml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/helm/templates/coder.yaml b/helm/templates/coder.yaml
index d4c39b49add53..c7edc9a9c13f5 100644
--- a/helm/templates/coder.yaml
+++ b/helm/templates/coder.yaml
@@ -27,7 +27,7 @@ spec:
     metadata:
       labels:
         {{- include "coder.labels" . | nindent 8 }}
-        {{- with .Values.coder.labels }}
+        {{- with .Values.coder.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
       annotations:
diff --git a/helm/values.yaml b/helm/values.yaml
index e55fb0b1fc7eb..7fce83add8ffd 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -44,7 +44,7 @@ coder:
 
   # coder.podLabels -- The Coder pod labels. See:
   # https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
-  podlabels: {}
+  podLabels: {}
 
   # coder.serviceAccount -- Configuration for the automatically created service
   # account. Creation of the service account cannot be disabled.