From cb51deccb23ad2f293c485ca0a06041bd8ec4870 Mon Sep 17 00:00:00 2001 From: danielm-codefresh Date: Thu, 20 Apr 2023 17:11:43 +0300 Subject: [PATCH] Remove overwrite of configs.cm."application.instanceLabelKey" --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index fd2ab0a9..757f3986 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.6.0-cap-CR-17237 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 5.28.1-1-cap-CR-17237 +version: 5.29.1-1-cap-CR-17237 kubeVersion: ">=1.22.0-0" home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png @@ -24,4 +24,4 @@ dependencies: annotations: artifacthub.io/changes: | - kind: fixed - description: Change default value for global.tolerations, from object to array. + description: Use default value for configs.cm.application.instanceLabelKey, instead of overwriting it. diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index afcadc77..47f375c1 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -163,7 +163,7 @@ configs: # -- The name of tracking label used by Argo CD for resource pruning # @default -- Defaults to app.kubernetes.io/instance - application.instanceLabelKey: argocd.argoproj.io/instance + application.instanceLabelKey: "" # -- Enable logs RBAC enforcement ## Ref: https://argo-cd.readthedocs.io/en/latest/operator-manual/upgrading/2.3-2.4/#enable-logs-rbac-enforcement