From 9920ecdb6e2126b41cc6b53c0bf41570e720e389 Mon Sep 17 00:00:00 2001 From: Jan Fuhrer Date: Fri, 26 Aug 2022 00:09:20 +0200 Subject: [PATCH] fix(argo-cd): Removal of duplicate mapping key annotations in crds (#1424) Signed-off-by: Jan Fuhrer --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/templates/crds/crd-applicationset.yaml | 3 +-- charts/argo-cd/templates/crds/crd-extension.yaml | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 3653c15e..d8a0dcd9 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.4.11 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 5.3.2 +version: 5.3.3 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -21,4 +21,4 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Fixed]: Invalid yaml for controller topologySpreadConstraints" + - "[Fixed]: Removal of duplicate mapping key annotations in crds" diff --git a/charts/argo-cd/templates/crds/crd-applicationset.yaml b/charts/argo-cd/templates/crds/crd-applicationset.yaml index b1f8ef0f..2a6c56ec 100644 --- a/charts/argo-cd/templates/crds/crd-applicationset.yaml +++ b/charts/argo-cd/templates/crds/crd-applicationset.yaml @@ -9,11 +9,10 @@ metadata: {{- with .Values.crds.annotations }} {{- toYaml . | nindent 4 }} {{- end }} + controller-gen.kubebuilder.io/version: v0.3.0 labels: app.kubernetes.io/name: applicationsets.argoproj.io app.kubernetes.io/part-of: argocd - annotations: - controller-gen.kubebuilder.io/version: v0.3.0 name: applicationsets.argoproj.io spec: group: argoproj.io diff --git a/charts/argo-cd/templates/crds/crd-extension.yaml b/charts/argo-cd/templates/crds/crd-extension.yaml index 89ac0ced..4105cbe7 100644 --- a/charts/argo-cd/templates/crds/crd-extension.yaml +++ b/charts/argo-cd/templates/crds/crd-extension.yaml @@ -9,11 +9,10 @@ metadata: {{- with .Values.crds.annotations }} {{- toYaml . | nindent 4 }} {{- end }} + controller-gen.kubebuilder.io/version: v0.4.1 labels: app.kubernetes.io/name: argocdextensions.argoproj.io app.kubernetes.io/part-of: argocd - annotations: - controller-gen.kubebuilder.io/version: v0.4.1 name: argocdextensions.argoproj.io spec: group: argoproj.io