From a0784fddac5e84d793288b295dbfe0b53cf7727e Mon Sep 17 00:00:00 2001
From: Karl Parry <88431088+karlparry@users.noreply.github.com>
Date: Wed, 30 Nov 2022 21:38:04 +0000
Subject: [PATCH] fix(argo-cd): Rename tls secret to include the -secret suffix
 (#1676)

- "[Fixed]: TLS secret name so Dex correctly generates the checksum for argocd-dex-server-tls."
- "[Fixed]: Standardise the naming convention of the TLS secret manifests."
- "[Added]: Add checksum to Repo-Server for the argocd-repo-server-tls secret."

Signed-off-by: Karl Parry <karl.parry@imbursepayments.com>
---
 charts/argo-cd/Chart.yaml                                   | 6 ++++--
 ...o-server-tls.yaml => argocd-repo-server-tls-secret.yaml} | 0
 ...argocd-server-tls.yaml => argocd-server-tls-secret.yaml} | 0
 charts/argo-cd/templates/argocd-repo-server/deployment.yaml | 3 +++
 charts/argo-cd/templates/dex/deployment.yaml                | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)
 rename charts/argo-cd/templates/argocd-configs/{argocd-repo-server-tls.yaml => argocd-repo-server-tls-secret.yaml} (100%)
 rename charts/argo-cd/templates/argocd-configs/{argocd-server-tls.yaml => argocd-server-tls-secret.yaml} (100%)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 719090f6..8fe4e645 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.5.3
 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.15.0
+version: 5.15.1
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -23,4 +23,6 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Ability to deploy argocd-repo-server-server-tls secret and configure Strict TLS for Repo Server"
+    - "[Fixed]: TLS secret name so Dex correctly generates the checksum for argocd-dex-server-tls."
+    - "[Fixed]: Standardise the naming convention of the TLS secret manifests."
+    - "[Added]: Add checksum to Repo-Server for the argocd-repo-server-tls secret."
diff --git a/charts/argo-cd/templates/argocd-configs/argocd-repo-server-tls.yaml b/charts/argo-cd/templates/argocd-configs/argocd-repo-server-tls-secret.yaml
similarity index 100%
rename from charts/argo-cd/templates/argocd-configs/argocd-repo-server-tls.yaml
rename to charts/argo-cd/templates/argocd-configs/argocd-repo-server-tls-secret.yaml
diff --git a/charts/argo-cd/templates/argocd-configs/argocd-server-tls.yaml b/charts/argo-cd/templates/argocd-configs/argocd-server-tls-secret.yaml
similarity index 100%
rename from charts/argo-cd/templates/argocd-configs/argocd-server-tls.yaml
rename to charts/argo-cd/templates/argocd-configs/argocd-server-tls-secret.yaml
diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index 3437b8d3..0323e2f1 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -16,6 +16,9 @@ spec:
     metadata:
       annotations:
         checksum/cmd-params: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cmd-params-cm.yaml") . | sha256sum }}
+        {{- if .Values.repoServer.certificateSecret.enabled }}
+        checksum/repo-server-tls: {{ include (print $.Template.BasePath "/argocd-configs/argocd-repo-server-tls-secret.yaml") . | sha256sum }}
+        {{- end }}
         {{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.repoServer.podAnnotations) }}
         {{- range $key, $value := . }}
         {{ $key }}: {{ $value | quote }}
diff --git a/charts/argo-cd/templates/dex/deployment.yaml b/charts/argo-cd/templates/dex/deployment.yaml
index bbb16e44..5f271bcf 100755
--- a/charts/argo-cd/templates/dex/deployment.yaml
+++ b/charts/argo-cd/templates/dex/deployment.yaml
@@ -16,7 +16,7 @@ spec:
       annotations:
         checksum/cmd-params: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cmd-params-cm.yaml") . | sha256sum }}
         {{- if .Values.dex.certificateSecret.enabled }}
-        checksum/dex-server-tls: {{ include (print $.Template.BasePath "/argocd-configs/argocd-dex-server-tls.yaml") . | sha256sum }}
+        checksum/dex-server-tls: {{ include (print $.Template.BasePath "/argocd-configs/argocd-dex-server-tls-secret.yaml") . | sha256sum }}
         {{- end }}
         {{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.dex.podAnnotations) }}
         {{- range $key, $value := . }}