Concierge controllers add labels to all created resources

deploy/concierge/deployment.yaml

@@ -2,6 +2,7 @@
 #! SPDX-License-Identifier: Apache-2.0
 
 #@ load("@ytt:data", "data")
+#@ load("@ytt:json", "json")
 #@ load("helpers.lib.yaml", "defaultLabel", "labels", "namespace", "defaultResourceName", "defaultResourceNameWithSuffix")
 
 #@ if not data.values.into_namespace:
@@ -40,6 +41,7 @@ data:
       servingCertificateSecret: (@= defaultResourceNameWithSuffix("api-tls-serving-certificate") @)
       credentialIssuerConfig: (@= defaultResourceNameWithSuffix("config") @)
       apiService: (@= defaultResourceNameWithSuffix("api") @)
+    labels: (@= json.encode(labels()).rstrip() @)
     kubeCertAgent:
       namePrefix: (@= defaultResourceNameWithSuffix("kube-cert-agent-") @)
       (@ if data.values.kube_cert_agent_image: @)

deploy/concierge/values.yaml

@@ -14,7 +14,8 @@ into_namespace: #! e.g. my-preexisting-namespace
 
 #! All resources created statically by yaml at install-time and all resources created dynamically
 #! by controllers at runtime will be labelled with `app: $app_name` and also with the labels
-#! specified here. The app can be uninstalled either by:
+#! specified here. The value of `custom_labels` must be a map of string keys to string values.
+#! The app can be uninstalled either by:
 #! 1. Deleting the static install-time yaml resources including the static namespace, which will cascade and also delete
 #!    resources that were dynamically created by controllers at runtime
 #! 2. Or, deleting all resources by label, which does not assume that there was a static install-time yaml namespace.

deploy/supervisor/deployment.yaml

@@ -2,6 +2,7 @@
 #! SPDX-License-Identifier: Apache-2.0
 
 #@ load("@ytt:data", "data")
+#@ load("@ytt:json", "json")
 #@ load("helpers.lib.yaml", "defaultLabel", "labels", "namespace", "defaultResourceName", "defaultResourceNameWithSuffix")
 
 #@ if not data.values.into_namespace:
@@ -31,6 +32,7 @@ data:
   pinniped.yaml: |
     names:
       dynamicConfigMap: (@= defaultResourceNameWithSuffix("dynamic-config") @)
+    labels: (@= json.encode(labels()).rstrip() @)
 ---
 #@ if data.values.image_pull_dockerconfigjson and data.values.image_pull_dockerconfigjson != "":
 apiVersion: v1

deploy/supervisor/values.yaml

@@ -14,7 +14,8 @@ into_namespace: #! e.g. my-preexisting-namespace
 
 #! All resources created statically by yaml at install-time and all resources created dynamically
 #! by controllers at runtime will be labelled with `app: $app_name` and also with the labels
-#! specified here. The app can be uninstalled either by:
+#! specified here. The value of `custom_labels` must be a map of string keys to string values.
+#! The app can be uninstalled either by:
 #! 1. Deleting the static install-time yaml resources including the static namespace, which will cascade and also delete
 #!    resources that were dynamically created by controllers at runtime
 #! 2. Or, deleting all resources by label, which does not assume that there was a static install-time yaml namespace.