Skip to content

Commit a0784fd

Browse files
authored
fix(argo-cd): Rename tls secret to include the -secret suffix (argoproj#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 <[email protected]>
1 parent 9ae4579 commit a0784fd

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

charts/argo-cd/Chart.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: v2.5.3
33
kubeVersion: ">=1.22.0-0"
44
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
55
name: argo-cd
6-
version: 5.15.0
6+
version: 5.15.1
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:
@@ -23,4 +23,6 @@ dependencies:
2323
condition: redis-ha.enabled
2424
annotations:
2525
artifacthub.io/changes: |
26-
- "[Added]: Ability to deploy argocd-repo-server-server-tls secret and configure Strict TLS for Repo Server"
26+
- "[Fixed]: TLS secret name so Dex correctly generates the checksum for argocd-dex-server-tls."
27+
- "[Fixed]: Standardise the naming convention of the TLS secret manifests."
28+
- "[Added]: Add checksum to Repo-Server for the argocd-repo-server-tls secret."

charts/argo-cd/templates/argocd-configs/argocd-repo-server-tls.yaml renamed to charts/argo-cd/templates/argocd-configs/argocd-repo-server-tls-secret.yaml

File renamed without changes.

charts/argo-cd/templates/argocd-configs/argocd-server-tls.yaml renamed to charts/argo-cd/templates/argocd-configs/argocd-server-tls-secret.yaml

File renamed without changes.

charts/argo-cd/templates/argocd-repo-server/deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ spec:
1616
metadata:
1717
annotations:
1818
checksum/cmd-params: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cmd-params-cm.yaml") . | sha256sum }}
19+
{{- if .Values.repoServer.certificateSecret.enabled }}
20+
checksum/repo-server-tls: {{ include (print $.Template.BasePath "/argocd-configs/argocd-repo-server-tls-secret.yaml") . | sha256sum }}
21+
{{- end }}
1922
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.repoServer.podAnnotations) }}
2023
{{- range $key, $value := . }}
2124
{{ $key }}: {{ $value | quote }}

charts/argo-cd/templates/dex/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
annotations:
1717
checksum/cmd-params: {{ include (print $.Template.BasePath "/argocd-configs/argocd-cmd-params-cm.yaml") . | sha256sum }}
1818
{{- if .Values.dex.certificateSecret.enabled }}
19-
checksum/dex-server-tls: {{ include (print $.Template.BasePath "/argocd-configs/argocd-dex-server-tls.yaml") . | sha256sum }}
19+
checksum/dex-server-tls: {{ include (print $.Template.BasePath "/argocd-configs/argocd-dex-server-tls-secret.yaml") . | sha256sum }}
2020
{{- end }}
2121
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.dex.podAnnotations) }}
2222
{{- range $key, $value := . }}

0 commit comments

Comments
 (0)