From e8653e07e90a35bc7c92c1fdaf0a78a73aa70899 Mon Sep 17 00:00:00 2001 From: atgane Date: Wed, 8 Jan 2025 00:16:41 +0900 Subject: [PATCH 1/4] fix required cluster credential name Signed-off-by: atgane --- charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml index d317eac23..9d51d4437 100644 --- a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml +++ b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml @@ -22,7 +22,7 @@ stringData: {{- if $cluster_value.shard }} shard: {{ $cluster_value.shard | quote }} {{- end }} - name: {{ required "A valid .Values.configs.clusterCredentials.CLUSTERNAME.name entry is required!" $cluster_key }} + name: {{ default $cluster_key $cluster_value.name }} server: {{ required "A valid .Values.configs.clusterCredentials.CLUSTERNAME.server entry is required!" $cluster_value.server }} {{- if $cluster_value.namespaces }} namespaces: {{ $cluster_value.namespaces }} From 2302f6251d65e3cfd5c181b758932fb85d990888 Mon Sep 17 00:00:00 2001 From: atgane Date: Fri, 24 Jan 2025 19:38:21 +0900 Subject: [PATCH 2/4] fix Signed-off-by: atgane --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 2eb5a0cfe..0ca2d08a4 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.13.3 kubeVersion: ">=1.25.0-0" description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 7.7.16 +version: 7.7.17 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: diff --git a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml index 9d51d4437..956bbf547 100644 --- a/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml +++ b/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml @@ -22,7 +22,7 @@ stringData: {{- if $cluster_value.shard }} shard: {{ $cluster_value.shard | quote }} {{- end }} - name: {{ default $cluster_key $cluster_value.name }} + name: {{ $cluster_key }} server: {{ required "A valid .Values.configs.clusterCredentials.CLUSTERNAME.server entry is required!" $cluster_value.server }} {{- if $cluster_value.namespaces }} namespaces: {{ $cluster_value.namespaces }} From 20a7efe6ed3e9b4562370c36d9da6d01917cd967 Mon Sep 17 00:00:00 2001 From: atgane Date: Fri, 24 Jan 2025 22:40:22 +0900 Subject: [PATCH 3/4] update changelog & docs Signed-off-by: atgane --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/README.md | 4 ++++ charts/argo-cd/README.md.gotmpl | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 0ca2d08a4..b5121282c 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -26,5 +26,5 @@ annotations: fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 url: https://argoproj.github.io/argo-helm/pgp_keys.asc artifacthub.io/changes: | - - kind: added - description: Added conditional around argocd-tls-certs-cm.yaml helm creation + - kind: fixed + description: remove required function in $cluster_key from clusterCredentials diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 2b223a6fb..656f51f6d 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -278,6 +278,10 @@ For full list of changes please check ArtifactHub [changelog]. Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version. +### 7.7.17 + +In clusterCredentials, key is used as the name of the cluster that will be registered in argocd. We have simplified the above condition by removing the require function. + ### 7.0.0 We changed the type of `.Values.configs.clusterCredentials` from `list` to `object`. diff --git a/charts/argo-cd/README.md.gotmpl b/charts/argo-cd/README.md.gotmpl index 0520c40f8..d6cdcb86d 100644 --- a/charts/argo-cd/README.md.gotmpl +++ b/charts/argo-cd/README.md.gotmpl @@ -278,6 +278,10 @@ For full list of changes please check ArtifactHub [changelog]. Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version. +### 7.7.17 + +In clusterCredentials, key is used as the name of the cluster that will be registered in argocd. We have simplified the above condition by removing the require function. + ### 7.0.0 We changed the type of `.Values.configs.clusterCredentials` from `list` to `object`. From 21feb8ccab7b474e79448b6db29f70f5bd076ebc Mon Sep 17 00:00:00 2001 From: Marco Maurer Date: Tue, 28 Jan 2025 10:07:37 +0100 Subject: [PATCH 4/4] chore: Drop unnecessary docs inside README.md and README.md.gotmpl Signed-off-by: Marco Maurer --- charts/argo-cd/README.md | 4 ---- charts/argo-cd/README.md.gotmpl | 4 ---- 2 files changed, 8 deletions(-) diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index e14c1856b..3a4a2560a 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -278,10 +278,6 @@ For full list of changes please check ArtifactHub [changelog]. Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version. -### 7.7.17 - -In clusterCredentials, key is used as the name of the cluster that will be registered in argocd. We have simplified the above condition by removing the require function. - ### 7.0.0 We changed the type of `.Values.configs.clusterCredentials` from `list` to `object`. diff --git a/charts/argo-cd/README.md.gotmpl b/charts/argo-cd/README.md.gotmpl index d6cdcb86d..0520c40f8 100644 --- a/charts/argo-cd/README.md.gotmpl +++ b/charts/argo-cd/README.md.gotmpl @@ -278,10 +278,6 @@ For full list of changes please check ArtifactHub [changelog]. Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version. -### 7.7.17 - -In clusterCredentials, key is used as the name of the cluster that will be registered in argocd. We have simplified the above condition by removing the require function. - ### 7.0.0 We changed the type of `.Values.configs.clusterCredentials` from `list` to `object`.