feat(helm): add com.coder/component pod annotation to identify component type (#21378)

helm/coder/templates/_coder.tpl

@@ -4,6 +4,17 @@ Service account to merge into the libcoder template
 {{- define "coder.serviceaccount" -}}
 {{- end -}}
 
+{{/*
+Component annotation for pod metadata.
+*/}}
+{{- define "coder.componentAnnotation" -}}
+{{- if .Values.coder.workspaceProxy -}}
+app.kubernetes.io/component: wsproxy
+{{- else -}}
+app.kubernetes.io/component: coderd
+{{- end -}}
+{{- end }}
+
 {{/*
 Deployment to merge into the libcoder template
 */}}

helm/coder/tests/testdata/auto_access_url_1.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/auto_access_url_1_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/auto_access_url_2.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/auto_access_url_2_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/auto_access_url_3.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/auto_access_url_3_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/command.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/command_args.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/command_args_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/command_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/custom_resources.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/custom_resources_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/default_values.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/default_values_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/env_from.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/env_from_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/extra_templates.golden

@@ -131,7 +131,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/extra_templates_coder.golden

@@ -131,7 +131,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/labels_annotations.golden

@@ -127,6 +127,7 @@ spec:
   template:
     metadata:
       annotations:
+        app.kubernetes.io/component: coderd
         com.coder/podAnnotation/baz: qux
         com.coder/podAnnotation/foo: bar
       labels:

helm/coder/tests/testdata/labels_annotations_coder.golden

@@ -127,6 +127,7 @@ spec:
   template:
     metadata:
       annotations:
+        app.kubernetes.io/component: coderd
         com.coder/podAnnotation/baz: qux
         com.coder/podAnnotation/foo: bar
       labels:

helm/coder/tests/testdata/namespace_rbac.golden

@@ -312,7 +312,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/namespace_rbac_coder.golden

@@ -312,7 +312,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/partial_resources.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/partial_resources_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/pod_securitycontext.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/pod_securitycontext_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/priority_class_name.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/priority_class_name_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/prometheus.golden

@@ -121,7 +121,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/prometheus_coder.golden

@@ -121,7 +121,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/provisionerd_psk.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/provisionerd_psk_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/sa.golden

@@ -124,7 +124,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/sa_coder.golden

@@ -124,7 +124,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/sa_disabled.golden

@@ -108,7 +108,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/sa_disabled_coder.golden

@@ -108,7 +108,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/sa_extra_rules.golden

@@ -135,7 +135,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/sa_extra_rules_coder.golden

@@ -135,7 +135,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/securitycontext.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/securitycontext_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/svc_loadbalancer.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/svc_loadbalancer_class.golden

@@ -123,7 +123,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/svc_loadbalancer_class_coder.golden

@@ -123,7 +123,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/svc_loadbalancer_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/svc_nodeport.golden

@@ -121,7 +121,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/svc_nodeport_coder.golden

@@ -121,7 +121,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/tls.golden

@@ -127,7 +127,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/tls_coder.golden

@@ -127,7 +127,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/topology.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/topology_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: coderd
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/workspace_proxy.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: wsproxy
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/tests/testdata/workspace_proxy_coder.golden

@@ -122,7 +122,8 @@ spec:
       app.kubernetes.io/name: coder
   template:
     metadata:
-      annotations: {}
+      annotations:
+        app.kubernetes.io/component: wsproxy
       labels:
         app.kubernetes.io/instance: release-name
         app.kubernetes.io/managed-by: Helm

helm/coder/values.yaml

@@ -76,6 +76,8 @@ coder:
 
   # coder.podAnnotations -- The Coder pod annotations. See:
   # https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+  # Note: The annotation `app.kubernetes.io/component` is automatically added to identify
+  # the component type (coderd, wsproxy, or provisionerd).
   podAnnotations: {}
 
   # coder.podLabels -- The Coder pod labels. See: