feat(argo-cd): Add ability to add additional labels to all CRDs (#2051)

feat(argo-cd): Add ability to add additional labels to all CRDs via .Values.crds.additionalLabels

Signed-off-by: jdvgh <133217951+jdvgh@users.noreply.github.com>

charts/argo-cd/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: v2.7.1
 kubeVersion: ">=1.22.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.33.0
+version: 5.33.1
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -27,6 +27,4 @@ annotations:
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
     - kind: added
-      description: Ability to add prometheus.io/scrape annotations to all metrics services
-    - kind: added
-      description: Ability to change metrics service type and clusterIP
+      description: Ability to add additional labels to all CRDs via .Values.crds.additionalLabels

charts/argo-cd/README.md

@@ -379,6 +379,7 @@ NAME: my-release
 | apiVersionOverrides.autoscaling | string | `""` | String to override apiVersion of autoscaling rendered by this helm chart |
 | apiVersionOverrides.certmanager | string | `""` | String to override apiVersion of cert-manager resources rendered by this helm chart |
 | apiVersionOverrides.cloudgoogle | string | `""` | String to override apiVersion of GKE resources rendered by this helm chart |
+| crds.additionalLabels | object | `{}` | Addtional labels to be added to all CRDs |
 | crds.annotations | object | `{}` | Annotations to be added to all CRDs |
 | crds.install | bool | `true` | Install and upgrade CRDs |
 | crds.keep | bool | `true` | Keep CRDs on chart uninstall |

charts/argo-cd/templates/crds/crd-application.yaml

@@ -12,6 +12,9 @@ metadata:
   labels:
     app.kubernetes.io/name: applications.argoproj.io
     app.kubernetes.io/part-of: argocd
+    {{- with .Values.crds.additionalLabels }}
+      {{- toYaml . | nindent 4}}
+    {{- end }}
   name: applications.argoproj.io
 spec:
   group: argoproj.io

charts/argo-cd/templates/crds/crd-applicationset.yaml

@@ -12,6 +12,9 @@ metadata:
   labels:
     app.kubernetes.io/name: applicationsets.argoproj.io
     app.kubernetes.io/part-of: argocd
+    {{- with .Values.crds.additionalLabels }}
+      {{- toYaml . | nindent 4}}
+    {{- end }}
   name: applicationsets.argoproj.io
 spec:
   group: argoproj.io

charts/argo-cd/templates/crds/crd-extension.yaml

@@ -13,6 +13,9 @@ metadata:
   labels:
     app.kubernetes.io/name: argocdextensions.argoproj.io
     app.kubernetes.io/part-of: argocd
+    {{- with .Values.crds.additionalLabels }}
+      {{- toYaml . | nindent 4}}
+    {{- end }} 
   name: argocdextensions.argoproj.io
 spec:
   group: argoproj.io

charts/argo-cd/templates/crds/crd-project.yaml

@@ -12,6 +12,9 @@ metadata:
   labels:
     app.kubernetes.io/name: appprojects.argoproj.io
     app.kubernetes.io/part-of: argocd
+    {{- with .Values.crds.additionalLabels }}
+      {{- toYaml . | nindent 4}}
+    {{- end }} 
   name: appprojects.argoproj.io
 spec:
   group: argoproj.io

charts/argo-cd/values.yaml

@@ -38,6 +38,8 @@ crds:
   keep: true
   # -- Annotations to be added to all CRDs
   annotations: {}
+  # -- Addtional labels to be added to all CRDs
+  additionalLabels: {}
 
 ## Globally shared configuration
 global: