feat(chart): support additional labels (#1339)

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com> Signed-off-by: Kent Rancourt <kent.rancourt@gmail.com> Co-authored-by: Kent Rancourt <kent.rancourt@gmail.com>
akuity · Jan 18, 2024 · 8b6f58a · 8b6f58a
1 parent 5013409
commit 8b6f58a
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 5 deletions.
diff --git a/charts/kargo/README.md b/charts/kargo/README.md
@@ -43,6 +43,12 @@ the Kargo controller is running.
 | `kubeconfigSecrets.argocd`   | Kubernetes `Secret` name containing kubeconfig for a remote Kubernetes cluster hosting Argo CD resources. Used by Kargo controller(s) only.                   | `undefined` |
 | `kubeconfigSecrets.rollouts` | Kubernetes `Secret` name containing kubeconfig for a remote Kubernetes cluster that can execute Argo Rollouts AnalysisRuns. Used by Kargo controller(s) only. | `undefined` |
 
+### Labels
+
+| Name               | Description                                | Value |
+| ------------------ | ------------------------------------------ | ----- |
+| `additionalLabels` | Additional labels to add to all resources. | `{}`  |
+
 ### API
 
 | Name                                        | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | Value                |

diff --git a/charts/kargo/templates/_helpers.tpl b/charts/kargo/templates/_helpers.tpl
@@ -32,6 +32,9 @@ helm.sh/chart: {{ include "kargo.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.additionalLabels }}
+{{ toYaml .Values.additionalLabels }}
+{{- end }}
 {{- end -}}
 
 {{/*

diff --git a/charts/kargo/templates/api/deployment.yaml b/charts/kargo/templates/api/deployment.yaml
@@ -18,7 +18,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "kargo.selectorLabels" . | nindent 8 }}
+        {{- include "kargo.labels" . | nindent 8 }}
         {{- include "kargo.api.labels" . | nindent 8 }}
       annotations:
         configmap/checksum: {{ include (print $.Template.BasePath "/api/configmap.yaml") . | sha256sum }}

diff --git a/charts/kargo/templates/controller/deployment.yaml b/charts/kargo/templates/controller/deployment.yaml
@@ -18,7 +18,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "kargo.selectorLabels" . | nindent 8 }}
+        {{- include "kargo.labels" . | nindent 8 }}
         {{- include "kargo.controller.labels" . | nindent 8 }}
       annotations:
         configmap/checksum: {{ include (print $.Template.BasePath "/controller/configmap.yaml") . | sha256sum }}

diff --git a/charts/kargo/templates/dex-server/deployment.yaml b/charts/kargo/templates/dex-server/deployment.yaml
@@ -16,7 +16,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "kargo.selectorLabels" . | nindent 8 }}
+        {{- include "kargo.labels" . | nindent 8 }}
         {{- include "kargo.dexServer.labels" . | nindent 8 }}
       annotations:
         secret/checksum: {{ include (print $.Template.BasePath "/dex-server/secret.yaml") . | sha256sum }}

diff --git a/charts/kargo/templates/garbage-collector/cron-job.yaml b/charts/kargo/templates/garbage-collector/cron-job.yaml
@@ -13,7 +13,7 @@ spec:
   jobTemplate:
     metadata:
       labels:
-        {{- include "kargo.selectorLabels" . | nindent 8 }}
+        {{- include "kargo.labels" . | nindent 8 }}
         {{- include "kargo.garbageCollector.labels" . | nindent 8 }}
       annotations:
         configmap/checksum: {{ include (print $.Template.BasePath "/garbage-collector/configmap.yaml") . | sha256sum }}

diff --git a/charts/kargo/templates/webhooks-server/deployment.yaml b/charts/kargo/templates/webhooks-server/deployment.yaml
@@ -18,7 +18,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "kargo.selectorLabels" . | nindent 8 }}
+        {{- include "kargo.labels" . | nindent 8 }}
         {{- include "kargo.webhooksServer.labels" . | nindent 8 }}
       annotations:
         configmap/checksum: {{ include (print $.Template.BasePath "/webhooks-server/configmap.yaml") . | sha256sum }}

diff --git a/charts/kargo/values.yaml b/charts/kargo/values.yaml
@@ -47,6 +47,11 @@ kubeconfigSecrets: {}
   ## @param kubeconfigSecrets.rollouts [nullable] Kubernetes `Secret` name containing kubeconfig for a remote Kubernetes cluster that can execute Argo Rollouts AnalysisRuns. Used by Kargo controller(s) only.
   # rollouts: ""
 
+## @section Labels
+## @param additionalLabels Additional labels to add to all resources.
+additionalLabels: {}
+  # my-label: my-value
+
 ## @section API
 api:
   ## @param api.enabled Whether the API server is enabled.