From 11b35a5f940ef387949528b4a446ba0b091ede16 Mon Sep 17 00:00:00 2001 From: uzair-coder07 Date: Thu, 15 Jan 2026 16:17:11 -0600 Subject: [PATCH] feat(helm): add com.coder/component pod annotation to identify component type (#21378) --- helm/coder/templates/_coder.tpl | 11 +++++++++++ helm/coder/tests/testdata/auto_access_url_1.golden | 3 ++- .../tests/testdata/auto_access_url_1_coder.golden | 3 ++- helm/coder/tests/testdata/auto_access_url_2.golden | 3 ++- .../tests/testdata/auto_access_url_2_coder.golden | 3 ++- helm/coder/tests/testdata/auto_access_url_3.golden | 3 ++- .../tests/testdata/auto_access_url_3_coder.golden | 3 ++- helm/coder/tests/testdata/command.golden | 3 ++- helm/coder/tests/testdata/command_args.golden | 3 ++- helm/coder/tests/testdata/command_args_coder.golden | 3 ++- helm/coder/tests/testdata/command_coder.golden | 3 ++- helm/coder/tests/testdata/custom_resources.golden | 3 ++- .../tests/testdata/custom_resources_coder.golden | 3 ++- helm/coder/tests/testdata/default_values.golden | 3 ++- helm/coder/tests/testdata/default_values_coder.golden | 3 ++- helm/coder/tests/testdata/env_from.golden | 3 ++- helm/coder/tests/testdata/env_from_coder.golden | 3 ++- helm/coder/tests/testdata/extra_templates.golden | 3 ++- .../coder/tests/testdata/extra_templates_coder.golden | 3 ++- helm/coder/tests/testdata/labels_annotations.golden | 1 + .../tests/testdata/labels_annotations_coder.golden | 1 + helm/coder/tests/testdata/namespace_rbac.golden | 3 ++- helm/coder/tests/testdata/namespace_rbac_coder.golden | 3 ++- helm/coder/tests/testdata/partial_resources.golden | 3 ++- .../tests/testdata/partial_resources_coder.golden | 3 ++- helm/coder/tests/testdata/pod_securitycontext.golden | 3 ++- .../tests/testdata/pod_securitycontext_coder.golden | 3 ++- helm/coder/tests/testdata/priority_class_name.golden | 3 ++- .../tests/testdata/priority_class_name_coder.golden | 3 ++- helm/coder/tests/testdata/prometheus.golden | 3 ++- helm/coder/tests/testdata/prometheus_coder.golden | 3 ++- helm/coder/tests/testdata/provisionerd_psk.golden | 3 ++- .../tests/testdata/provisionerd_psk_coder.golden | 3 ++- helm/coder/tests/testdata/sa.golden | 3 ++- helm/coder/tests/testdata/sa_coder.golden | 3 ++- helm/coder/tests/testdata/sa_disabled.golden | 3 ++- helm/coder/tests/testdata/sa_disabled_coder.golden | 3 ++- helm/coder/tests/testdata/sa_extra_rules.golden | 3 ++- helm/coder/tests/testdata/sa_extra_rules_coder.golden | 3 ++- helm/coder/tests/testdata/securitycontext.golden | 3 ++- .../coder/tests/testdata/securitycontext_coder.golden | 3 ++- helm/coder/tests/testdata/svc_loadbalancer.golden | 3 ++- .../tests/testdata/svc_loadbalancer_class.golden | 3 ++- .../testdata/svc_loadbalancer_class_coder.golden | 3 ++- .../tests/testdata/svc_loadbalancer_coder.golden | 3 ++- helm/coder/tests/testdata/svc_nodeport.golden | 3 ++- helm/coder/tests/testdata/svc_nodeport_coder.golden | 3 ++- helm/coder/tests/testdata/tls.golden | 3 ++- helm/coder/tests/testdata/tls_coder.golden | 3 ++- helm/coder/tests/testdata/topology.golden | 3 ++- helm/coder/tests/testdata/topology_coder.golden | 3 ++- helm/coder/tests/testdata/workspace_proxy.golden | 3 ++- .../coder/tests/testdata/workspace_proxy_coder.golden | 3 ++- helm/coder/values.yaml | 2 ++ helm/libcoder/templates/_coder.yaml | 6 +++++- helm/libcoder/templates/_helpers.tpl | 6 ++++++ helm/provisioner/templates/_coder.tpl | 7 +++++++ helm/provisioner/tests/testdata/command.golden | 3 ++- helm/provisioner/tests/testdata/command_args.golden | 3 ++- .../tests/testdata/command_args_coder.golden | 3 ++- helm/provisioner/tests/testdata/command_coder.golden | 3 ++- .../tests/testdata/custom_resources.golden | 3 ++- .../tests/testdata/custom_resources_coder.golden | 3 ++- helm/provisioner/tests/testdata/default_values.golden | 3 ++- .../tests/testdata/default_values_coder.golden | 3 ++- .../provisioner/tests/testdata/extra_templates.golden | 3 ++- .../tests/testdata/extra_templates_coder.golden | 3 ++- .../tests/testdata/labels_annotations.golden | 1 + .../tests/testdata/labels_annotations_coder.golden | 1 + helm/provisioner/tests/testdata/name_override.golden | 3 ++- .../tests/testdata/name_override_coder.golden | 3 ++- .../tests/testdata/name_override_existing_sa.golden | 3 ++- .../testdata/name_override_existing_sa_coder.golden | 3 ++- .../tests/testdata/partial_resources.golden | 3 ++- .../tests/testdata/partial_resources_coder.golden | 3 ++- .../tests/testdata/provisionerd_key.golden | 3 ++- .../tests/testdata/provisionerd_key_coder.golden | 3 ++- .../provisionerd_key_psk_empty_workaround.golden | 3 ++- ...provisionerd_key_psk_empty_workaround_coder.golden | 3 ++- .../tests/testdata/provisionerd_psk.golden | 3 ++- .../tests/testdata/provisionerd_psk_coder.golden | 3 ++- helm/provisioner/tests/testdata/sa.golden | 3 ++- helm/provisioner/tests/testdata/sa_coder.golden | 3 ++- helm/provisioner/tests/testdata/sa_disabled.golden | 3 ++- .../tests/testdata/sa_disabled_coder.golden | 3 ++- helm/provisioner/values.yaml | 2 ++ 86 files changed, 189 insertions(+), 77 deletions(-) diff --git a/helm/coder/templates/_coder.tpl b/helm/coder/templates/_coder.tpl index 2efa530c34..5de2ffbda2 100644 --- a/helm/coder/templates/_coder.tpl +++ b/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 */}} diff --git a/helm/coder/tests/testdata/auto_access_url_1.golden b/helm/coder/tests/testdata/auto_access_url_1.golden index 82b78f878e..fd7f9035ef 100644 --- a/helm/coder/tests/testdata/auto_access_url_1.golden +++ b/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 diff --git a/helm/coder/tests/testdata/auto_access_url_1_coder.golden b/helm/coder/tests/testdata/auto_access_url_1_coder.golden index 849553b8ab..7ba2721e88 100644 --- a/helm/coder/tests/testdata/auto_access_url_1_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/auto_access_url_2.golden b/helm/coder/tests/testdata/auto_access_url_2.golden index 666341a133..be28d0059d 100644 --- a/helm/coder/tests/testdata/auto_access_url_2.golden +++ b/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 diff --git a/helm/coder/tests/testdata/auto_access_url_2_coder.golden b/helm/coder/tests/testdata/auto_access_url_2_coder.golden index 4a2c6074b0..65c28104d8 100644 --- a/helm/coder/tests/testdata/auto_access_url_2_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/auto_access_url_3.golden b/helm/coder/tests/testdata/auto_access_url_3.golden index a0b24ff212..1dbe499421 100644 --- a/helm/coder/tests/testdata/auto_access_url_3.golden +++ b/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 diff --git a/helm/coder/tests/testdata/auto_access_url_3_coder.golden b/helm/coder/tests/testdata/auto_access_url_3_coder.golden index 2e62cb18b6..37fe357684 100644 --- a/helm/coder/tests/testdata/auto_access_url_3_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/command.golden b/helm/coder/tests/testdata/command.golden index a11cb7564e..a812cea6f4 100644 --- a/helm/coder/tests/testdata/command.golden +++ b/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 diff --git a/helm/coder/tests/testdata/command_args.golden b/helm/coder/tests/testdata/command_args.golden index d296c1a8b5..b6666a1c98 100644 --- a/helm/coder/tests/testdata/command_args.golden +++ b/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 diff --git a/helm/coder/tests/testdata/command_args_coder.golden b/helm/coder/tests/testdata/command_args_coder.golden index c606627a02..60d8fc08a5 100644 --- a/helm/coder/tests/testdata/command_args_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/command_coder.golden b/helm/coder/tests/testdata/command_coder.golden index a7027d4eed..c0c5cd5794 100644 --- a/helm/coder/tests/testdata/command_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/custom_resources.golden b/helm/coder/tests/testdata/custom_resources.golden index e9889d36de..bbb145ddc6 100644 --- a/helm/coder/tests/testdata/custom_resources.golden +++ b/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 diff --git a/helm/coder/tests/testdata/custom_resources_coder.golden b/helm/coder/tests/testdata/custom_resources_coder.golden index 3e45a160f1..d575968f5f 100644 --- a/helm/coder/tests/testdata/custom_resources_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/default_values.golden b/helm/coder/tests/testdata/default_values.golden index bbaa590568..31229eab9c 100644 --- a/helm/coder/tests/testdata/default_values.golden +++ b/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 diff --git a/helm/coder/tests/testdata/default_values_coder.golden b/helm/coder/tests/testdata/default_values_coder.golden index d63411508e..862726d3cd 100644 --- a/helm/coder/tests/testdata/default_values_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/env_from.golden b/helm/coder/tests/testdata/env_from.golden index aca0cb45b3..f5ef33ce58 100644 --- a/helm/coder/tests/testdata/env_from.golden +++ b/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 diff --git a/helm/coder/tests/testdata/env_from_coder.golden b/helm/coder/tests/testdata/env_from_coder.golden index b4c0742250..0f1a093743 100644 --- a/helm/coder/tests/testdata/env_from_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/extra_templates.golden b/helm/coder/tests/testdata/extra_templates.golden index 77f06833e3..b2580ca010 100644 --- a/helm/coder/tests/testdata/extra_templates.golden +++ b/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 diff --git a/helm/coder/tests/testdata/extra_templates_coder.golden b/helm/coder/tests/testdata/extra_templates_coder.golden index ec5d34eec8..621aceb88e 100644 --- a/helm/coder/tests/testdata/extra_templates_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/labels_annotations.golden b/helm/coder/tests/testdata/labels_annotations.golden index 0acc2521ba..415f139bf3 100644 --- a/helm/coder/tests/testdata/labels_annotations.golden +++ b/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: diff --git a/helm/coder/tests/testdata/labels_annotations_coder.golden b/helm/coder/tests/testdata/labels_annotations_coder.golden index bef5c25d68..9c2d6bc3c8 100644 --- a/helm/coder/tests/testdata/labels_annotations_coder.golden +++ b/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: diff --git a/helm/coder/tests/testdata/namespace_rbac.golden b/helm/coder/tests/testdata/namespace_rbac.golden index 57a4ba3e2b..eaaa95dfe6 100644 --- a/helm/coder/tests/testdata/namespace_rbac.golden +++ b/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 diff --git a/helm/coder/tests/testdata/namespace_rbac_coder.golden b/helm/coder/tests/testdata/namespace_rbac_coder.golden index 2687504879..b1f0d3d529 100644 --- a/helm/coder/tests/testdata/namespace_rbac_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/partial_resources.golden b/helm/coder/tests/testdata/partial_resources.golden index 2f5fd5f3c7..31d3dd194b 100644 --- a/helm/coder/tests/testdata/partial_resources.golden +++ b/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 diff --git a/helm/coder/tests/testdata/partial_resources_coder.golden b/helm/coder/tests/testdata/partial_resources_coder.golden index 14c47eab84..756524c940 100644 --- a/helm/coder/tests/testdata/partial_resources_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/pod_securitycontext.golden b/helm/coder/tests/testdata/pod_securitycontext.golden index e0b02c62ed..7f14b9c284 100644 --- a/helm/coder/tests/testdata/pod_securitycontext.golden +++ b/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 diff --git a/helm/coder/tests/testdata/pod_securitycontext_coder.golden b/helm/coder/tests/testdata/pod_securitycontext_coder.golden index 9133b08507..95734e9411 100644 --- a/helm/coder/tests/testdata/pod_securitycontext_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/priority_class_name.golden b/helm/coder/tests/testdata/priority_class_name.golden index 0736d9dabb..d90cead54a 100644 --- a/helm/coder/tests/testdata/priority_class_name.golden +++ b/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 diff --git a/helm/coder/tests/testdata/priority_class_name_coder.golden b/helm/coder/tests/testdata/priority_class_name_coder.golden index e06d69dcf3..7292006aa6 100644 --- a/helm/coder/tests/testdata/priority_class_name_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/prometheus.golden b/helm/coder/tests/testdata/prometheus.golden index 2e6b185a6c..67fb063d7a 100644 --- a/helm/coder/tests/testdata/prometheus.golden +++ b/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 diff --git a/helm/coder/tests/testdata/prometheus_coder.golden b/helm/coder/tests/testdata/prometheus_coder.golden index e335d22523..6b4f0766fa 100644 --- a/helm/coder/tests/testdata/prometheus_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/provisionerd_psk.golden b/helm/coder/tests/testdata/provisionerd_psk.golden index 72cfdd976b..0878d98028 100644 --- a/helm/coder/tests/testdata/provisionerd_psk.golden +++ b/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 diff --git a/helm/coder/tests/testdata/provisionerd_psk_coder.golden b/helm/coder/tests/testdata/provisionerd_psk_coder.golden index a34e294f99..a014b8278e 100644 --- a/helm/coder/tests/testdata/provisionerd_psk_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/sa.golden b/helm/coder/tests/testdata/sa.golden index e4d49385fc..436575f1a9 100644 --- a/helm/coder/tests/testdata/sa.golden +++ b/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 diff --git a/helm/coder/tests/testdata/sa_coder.golden b/helm/coder/tests/testdata/sa_coder.golden index 1567368093..574e3c61b0 100644 --- a/helm/coder/tests/testdata/sa_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/sa_disabled.golden b/helm/coder/tests/testdata/sa_disabled.golden index 122c297571..d1b964e48a 100644 --- a/helm/coder/tests/testdata/sa_disabled.golden +++ b/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 diff --git a/helm/coder/tests/testdata/sa_disabled_coder.golden b/helm/coder/tests/testdata/sa_disabled_coder.golden index da091e0027..47c164a24f 100644 --- a/helm/coder/tests/testdata/sa_disabled_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/sa_extra_rules.golden b/helm/coder/tests/testdata/sa_extra_rules.golden index 08e958794e..877487915a 100644 --- a/helm/coder/tests/testdata/sa_extra_rules.golden +++ b/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 diff --git a/helm/coder/tests/testdata/sa_extra_rules_coder.golden b/helm/coder/tests/testdata/sa_extra_rules_coder.golden index e9536af12e..13a9bbf94e 100644 --- a/helm/coder/tests/testdata/sa_extra_rules_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/securitycontext.golden b/helm/coder/tests/testdata/securitycontext.golden index 486447d93a..f75fe8fd47 100644 --- a/helm/coder/tests/testdata/securitycontext.golden +++ b/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 diff --git a/helm/coder/tests/testdata/securitycontext_coder.golden b/helm/coder/tests/testdata/securitycontext_coder.golden index 7d5b409b8e..c65c330c92 100644 --- a/helm/coder/tests/testdata/securitycontext_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/svc_loadbalancer.golden b/helm/coder/tests/testdata/svc_loadbalancer.golden index 71310077bb..76e3810f43 100644 --- a/helm/coder/tests/testdata/svc_loadbalancer.golden +++ b/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 diff --git a/helm/coder/tests/testdata/svc_loadbalancer_class.golden b/helm/coder/tests/testdata/svc_loadbalancer_class.golden index 548c360f1c..f34f326283 100644 --- a/helm/coder/tests/testdata/svc_loadbalancer_class.golden +++ b/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 diff --git a/helm/coder/tests/testdata/svc_loadbalancer_class_coder.golden b/helm/coder/tests/testdata/svc_loadbalancer_class_coder.golden index aad0731549..be5780cdce 100644 --- a/helm/coder/tests/testdata/svc_loadbalancer_class_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/svc_loadbalancer_coder.golden b/helm/coder/tests/testdata/svc_loadbalancer_coder.golden index 667f4f84cd..acbc75a8ea 100644 --- a/helm/coder/tests/testdata/svc_loadbalancer_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/svc_nodeport.golden b/helm/coder/tests/testdata/svc_nodeport.golden index d2f1c5c976..3fed4f9808 100644 --- a/helm/coder/tests/testdata/svc_nodeport.golden +++ b/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 diff --git a/helm/coder/tests/testdata/svc_nodeport_coder.golden b/helm/coder/tests/testdata/svc_nodeport_coder.golden index 5d258cfb10..152df1e0c7 100644 --- a/helm/coder/tests/testdata/svc_nodeport_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/tls.golden b/helm/coder/tests/testdata/tls.golden index 66e1dd6991..8015741a03 100644 --- a/helm/coder/tests/testdata/tls.golden +++ b/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 diff --git a/helm/coder/tests/testdata/tls_coder.golden b/helm/coder/tests/testdata/tls_coder.golden index ddad245300..2d1bd1c285 100644 --- a/helm/coder/tests/testdata/tls_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/topology.golden b/helm/coder/tests/testdata/topology.golden index 2a061efaf2..ff751a702f 100644 --- a/helm/coder/tests/testdata/topology.golden +++ b/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 diff --git a/helm/coder/tests/testdata/topology_coder.golden b/helm/coder/tests/testdata/topology_coder.golden index 0256522c4d..f5614b0259 100644 --- a/helm/coder/tests/testdata/topology_coder.golden +++ b/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 diff --git a/helm/coder/tests/testdata/workspace_proxy.golden b/helm/coder/tests/testdata/workspace_proxy.golden index 3a7386af35..e34ec16ab9 100644 --- a/helm/coder/tests/testdata/workspace_proxy.golden +++ b/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 diff --git a/helm/coder/tests/testdata/workspace_proxy_coder.golden b/helm/coder/tests/testdata/workspace_proxy_coder.golden index 3cafe98554..44703fd553 100644 --- a/helm/coder/tests/testdata/workspace_proxy_coder.golden +++ b/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 diff --git a/helm/coder/values.yaml b/helm/coder/values.yaml index 1c663f6a1c..54b88be12c 100644 --- a/helm/coder/values.yaml +++ b/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: diff --git a/helm/libcoder/templates/_coder.yaml b/helm/libcoder/templates/_coder.yaml index ad7a25cdb1..47f46e2b32 100644 --- a/helm/libcoder/templates/_coder.yaml +++ b/helm/libcoder/templates/_coder.yaml @@ -23,7 +23,11 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} annotations: - {{- toYaml .Values.coder.podAnnotations | nindent 8 }} + {{- include "coder.componentAnnotation" . | nindent 8 }} + {{- with .Values.coder.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: serviceAccountName: {{ .Values.coder.serviceAccount.name | quote }} {{- with .Values.coder.priorityClassName }} diff --git a/helm/libcoder/templates/_helpers.tpl b/helm/libcoder/templates/_helpers.tpl index 7d55331b5d..f6f77290db 100644 --- a/helm/libcoder/templates/_helpers.tpl +++ b/helm/libcoder/templates/_helpers.tpl @@ -240,3 +240,9 @@ Usage: - watch {{- end }} +{{/* +Component annotation for pod metadata. +This should be overridden in each chart to specify the component type. +*/}} +{{- define "coder.componentAnnotation" -}} +{{- end }} diff --git a/helm/provisioner/templates/_coder.tpl b/helm/provisioner/templates/_coder.tpl index 585393a6bf..656616afdb 100644 --- a/helm/provisioner/templates/_coder.tpl +++ b/helm/provisioner/templates/_coder.tpl @@ -4,6 +4,13 @@ Service account to merge into the libcoder template {{- define "coder.serviceaccount" -}} {{- end }} +{{/* +Component annotation for pod metadata. +*/}} +{{- define "coder.componentAnnotation" -}} +app.kubernetes.io/component: provisionerd +{{- end }} + {{/* Deployment to merge into the libcoder template */}} diff --git a/helm/provisioner/tests/testdata/command.golden b/helm/provisioner/tests/testdata/command.golden index 0ab1a80a74..b9071c6e16 100644 --- a/helm/provisioner/tests/testdata/command.golden +++ b/helm/provisioner/tests/testdata/command.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/command_args.golden b/helm/provisioner/tests/testdata/command_args.golden index 519e2b449c..e1543fde2f 100644 --- a/helm/provisioner/tests/testdata/command_args.golden +++ b/helm/provisioner/tests/testdata/command_args.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/command_args_coder.golden b/helm/provisioner/tests/testdata/command_args_coder.golden index 51a5b72058..6e531e8ae0 100644 --- a/helm/provisioner/tests/testdata/command_args_coder.golden +++ b/helm/provisioner/tests/testdata/command_args_coder.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/command_coder.golden b/helm/provisioner/tests/testdata/command_coder.golden index b529ceacea..ec6d54450a 100644 --- a/helm/provisioner/tests/testdata/command_coder.golden +++ b/helm/provisioner/tests/testdata/command_coder.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/custom_resources.golden b/helm/provisioner/tests/testdata/custom_resources.golden index 7076fb548b..e4d5843468 100644 --- a/helm/provisioner/tests/testdata/custom_resources.golden +++ b/helm/provisioner/tests/testdata/custom_resources.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/custom_resources_coder.golden b/helm/provisioner/tests/testdata/custom_resources_coder.golden index 58d54fd2aa..d8988b425d 100644 --- a/helm/provisioner/tests/testdata/custom_resources_coder.golden +++ b/helm/provisioner/tests/testdata/custom_resources_coder.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/default_values.golden b/helm/provisioner/tests/testdata/default_values.golden index d90d2fa158..fd93e2d07a 100644 --- a/helm/provisioner/tests/testdata/default_values.golden +++ b/helm/provisioner/tests/testdata/default_values.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/default_values_coder.golden b/helm/provisioner/tests/testdata/default_values_coder.golden index ed208eccf1..ac454b4659 100644 --- a/helm/provisioner/tests/testdata/default_values_coder.golden +++ b/helm/provisioner/tests/testdata/default_values_coder.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/extra_templates.golden b/helm/provisioner/tests/testdata/extra_templates.golden index 86a7952301..6aea771e52 100644 --- a/helm/provisioner/tests/testdata/extra_templates.golden +++ b/helm/provisioner/tests/testdata/extra_templates.golden @@ -102,7 +102,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/extra_templates_coder.golden b/helm/provisioner/tests/testdata/extra_templates_coder.golden index 4fd17f9969..bc8460c577 100644 --- a/helm/provisioner/tests/testdata/extra_templates_coder.golden +++ b/helm/provisioner/tests/testdata/extra_templates_coder.golden @@ -102,7 +102,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/labels_annotations.golden b/helm/provisioner/tests/testdata/labels_annotations.golden index fae597e2f5..6dee53a872 100644 --- a/helm/provisioner/tests/testdata/labels_annotations.golden +++ b/helm/provisioner/tests/testdata/labels_annotations.golden @@ -98,6 +98,7 @@ spec: template: metadata: annotations: + app.kubernetes.io/component: provisionerd com.coder/podAnnotation/baz: qux com.coder/podAnnotation/foo: bar labels: diff --git a/helm/provisioner/tests/testdata/labels_annotations_coder.golden b/helm/provisioner/tests/testdata/labels_annotations_coder.golden index 292618e6cd..cc44433e2f 100644 --- a/helm/provisioner/tests/testdata/labels_annotations_coder.golden +++ b/helm/provisioner/tests/testdata/labels_annotations_coder.golden @@ -98,6 +98,7 @@ spec: template: metadata: annotations: + app.kubernetes.io/component: provisionerd com.coder/podAnnotation/baz: qux com.coder/podAnnotation/foo: bar labels: diff --git a/helm/provisioner/tests/testdata/name_override.golden b/helm/provisioner/tests/testdata/name_override.golden index 07cee6a958..179658855b 100644 --- a/helm/provisioner/tests/testdata/name_override.golden +++ b/helm/provisioner/tests/testdata/name_override.golden @@ -102,7 +102,8 @@ spec: app.kubernetes.io/name: other-coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/name_override_coder.golden b/helm/provisioner/tests/testdata/name_override_coder.golden index 3fb7159842..78675172e4 100644 --- a/helm/provisioner/tests/testdata/name_override_coder.golden +++ b/helm/provisioner/tests/testdata/name_override_coder.golden @@ -102,7 +102,8 @@ spec: app.kubernetes.io/name: other-coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/name_override_existing_sa.golden b/helm/provisioner/tests/testdata/name_override_existing_sa.golden index f18af50c87..7f0651f92d 100644 --- a/helm/provisioner/tests/testdata/name_override_existing_sa.golden +++ b/helm/provisioner/tests/testdata/name_override_existing_sa.golden @@ -22,7 +22,8 @@ spec: app.kubernetes.io/name: other-coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/name_override_existing_sa_coder.golden b/helm/provisioner/tests/testdata/name_override_existing_sa_coder.golden index 2463c6badb..ade42052e2 100644 --- a/helm/provisioner/tests/testdata/name_override_existing_sa_coder.golden +++ b/helm/provisioner/tests/testdata/name_override_existing_sa_coder.golden @@ -22,7 +22,8 @@ spec: app.kubernetes.io/name: other-coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/partial_resources.golden b/helm/provisioner/tests/testdata/partial_resources.golden index f08bccf550..9738135445 100644 --- a/helm/provisioner/tests/testdata/partial_resources.golden +++ b/helm/provisioner/tests/testdata/partial_resources.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/partial_resources_coder.golden b/helm/provisioner/tests/testdata/partial_resources_coder.golden index 2f9ae4c1d4..22757f8933 100644 --- a/helm/provisioner/tests/testdata/partial_resources_coder.golden +++ b/helm/provisioner/tests/testdata/partial_resources_coder.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/provisionerd_key.golden b/helm/provisioner/tests/testdata/provisionerd_key.golden index b51a124673..e9d350f421 100644 --- a/helm/provisioner/tests/testdata/provisionerd_key.golden +++ b/helm/provisioner/tests/testdata/provisionerd_key.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/provisionerd_key_coder.golden b/helm/provisioner/tests/testdata/provisionerd_key_coder.golden index 1b04c54cb7..4f5a33a6a0 100644 --- a/helm/provisioner/tests/testdata/provisionerd_key_coder.golden +++ b/helm/provisioner/tests/testdata/provisionerd_key_coder.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/provisionerd_key_psk_empty_workaround.golden b/helm/provisioner/tests/testdata/provisionerd_key_psk_empty_workaround.golden index b51a124673..e9d350f421 100644 --- a/helm/provisioner/tests/testdata/provisionerd_key_psk_empty_workaround.golden +++ b/helm/provisioner/tests/testdata/provisionerd_key_psk_empty_workaround.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/provisionerd_key_psk_empty_workaround_coder.golden b/helm/provisioner/tests/testdata/provisionerd_key_psk_empty_workaround_coder.golden index 1b04c54cb7..4f5a33a6a0 100644 --- a/helm/provisioner/tests/testdata/provisionerd_key_psk_empty_workaround_coder.golden +++ b/helm/provisioner/tests/testdata/provisionerd_key_psk_empty_workaround_coder.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/provisionerd_psk.golden b/helm/provisioner/tests/testdata/provisionerd_psk.golden index 8310d91899..7c45f3e233 100644 --- a/helm/provisioner/tests/testdata/provisionerd_psk.golden +++ b/helm/provisioner/tests/testdata/provisionerd_psk.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/provisionerd_psk_coder.golden b/helm/provisioner/tests/testdata/provisionerd_psk_coder.golden index 2652be46c2..21e1a8f2d4 100644 --- a/helm/provisioner/tests/testdata/provisionerd_psk_coder.golden +++ b/helm/provisioner/tests/testdata/provisionerd_psk_coder.golden @@ -93,7 +93,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/sa.golden b/helm/provisioner/tests/testdata/sa.golden index b9f8c40070..2d499dc794 100644 --- a/helm/provisioner/tests/testdata/sa.golden +++ b/helm/provisioner/tests/testdata/sa.golden @@ -94,7 +94,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/sa_coder.golden b/helm/provisioner/tests/testdata/sa_coder.golden index f66d6fab90..dbaae98a21 100644 --- a/helm/provisioner/tests/testdata/sa_coder.golden +++ b/helm/provisioner/tests/testdata/sa_coder.golden @@ -94,7 +94,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/sa_disabled.golden b/helm/provisioner/tests/testdata/sa_disabled.golden index cbb588a89f..5f8c588ffa 100644 --- a/helm/provisioner/tests/testdata/sa_disabled.golden +++ b/helm/provisioner/tests/testdata/sa_disabled.golden @@ -22,7 +22,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/tests/testdata/sa_disabled_coder.golden b/helm/provisioner/tests/testdata/sa_disabled_coder.golden index 57f025a7ec..ed56b089cb 100644 --- a/helm/provisioner/tests/testdata/sa_disabled_coder.golden +++ b/helm/provisioner/tests/testdata/sa_disabled_coder.golden @@ -22,7 +22,8 @@ spec: app.kubernetes.io/name: coder-provisioner template: metadata: - annotations: {} + annotations: + app.kubernetes.io/component: provisionerd labels: app.kubernetes.io/instance: release-name app.kubernetes.io/managed-by: Helm diff --git a/helm/provisioner/values.yaml b/helm/provisioner/values.yaml index ac920cbb71..f8d589e2fc 100644 --- a/helm/provisioner/values.yaml +++ b/helm/provisioner/values.yaml @@ -50,6 +50,8 @@ coder: # coder.podAnnotations -- The Coder pod annotations. See: # https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + # 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: