From 02463f30097fa5ee96ebd5f20c8e4f7b036413f2 Mon Sep 17 00:00:00 2001 From: Marco Kilchhofer Date: Mon, 31 Oct 2022 00:48:09 +0100 Subject: [PATCH] fix(argo-cd): Don't install CRDs for disabled components (#1596) Signed-off-by: Marco Kilchhofer --- charts/argo-cd/Chart.yaml | 5 ++--- charts/argo-cd/templates/crds/crd-applicationset.yaml | 2 +- charts/argo-cd/templates/crds/crd-extension.yaml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 42369875..8b6dd1ed 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.5.0 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.12.0 +version: 5.12.1 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: @@ -23,5 +23,4 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Added]: New TLS server configuration via server.certificateSecret" - - "[Deprecated]: TLS configuration via configs.secret.argocdServerTlsConfig" + - "[Fixed]: Don't install CRDs for disabled components" diff --git a/charts/argo-cd/templates/crds/crd-applicationset.yaml b/charts/argo-cd/templates/crds/crd-applicationset.yaml index f95a76ca..48dd57c5 100644 --- a/charts/argo-cd/templates/crds/crd-applicationset.yaml +++ b/charts/argo-cd/templates/crds/crd-applicationset.yaml @@ -1,4 +1,4 @@ -{{- if .Values.crds.install }} +{{- if and .Values.crds.install .Values.applicationSet.enabled }} apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: diff --git a/charts/argo-cd/templates/crds/crd-extension.yaml b/charts/argo-cd/templates/crds/crd-extension.yaml index 4105cbe7..802f0e8c 100644 --- a/charts/argo-cd/templates/crds/crd-extension.yaml +++ b/charts/argo-cd/templates/crds/crd-extension.yaml @@ -1,4 +1,4 @@ -{{- if .Values.crds.install }} +{{- if and .Values.crds.install .Values.server.extensions.enabled }} apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: