fixup! Merge branch 'main' into fix-labels

deansheather · deansheather · commit c6ceb37b94fa · 2023-04-05T22:02:34.000Z
diff --git a/helm/templates/coder.yaml b/helm/templates/coder.yaml
@@ -14,7 +14,9 @@ metadata:
   name: coder
   labels:
     {{- include "coder.labels" . | nindent 4 }}
-    {{- toYaml .Values.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/tests/testdata/default_values.golden b/helm/tests/testdata/default_values.golden
@@ -79,7 +79,6 @@ metadata:
     app.kubernetes.io/part-of: coder
     app.kubernetes.io/version: "0.1.0"
     app.kubernetes.io/managed-by: Helm
-    eric: paulsen
   annotations: 
     {}
 spec:
diff --git a/helm/tests/testdata/tls.golden b/helm/tests/testdata/tls.golden
@@ -83,7 +83,6 @@ metadata:
     app.kubernetes.io/part-of: coder
     app.kubernetes.io/version: "0.1.0"
     app.kubernetes.io/managed-by: Helm
-    eric: paulsen
   annotations: 
     {}
 spec:
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -13,7 +13,7 @@ coder:
     # if not set. If you're using the chart directly from git, the default
     # app version will not work and you'll need to set this value. The helm
     # chart helpfully fails quickly in this case.
-    tag: "latest"
+    tag: ""
     # coder.image.pullPolicy -- The pull policy to use for the image. See:
     # https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy
     pullPolicy: IfNotPresent
@@ -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:
