From 8cc626844db87cd441e02505c7004b5bbc1cf367 Mon Sep 17 00:00:00 2001 From: Brandon J Date: Tue, 27 Sep 2022 13:47:16 -0600 Subject: [PATCH] fix(ssl): Add option to disable ssl on ingress (#14) * fix(ssl): Add option to disable ssl on ingress * fix: remove unused value and default ssl --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-server/ingress.yaml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index b9b084fe..e2368945 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.3.1 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 4.7.4 +version: 4.7.5 home: https://github.com/coreweave/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: diff --git a/charts/argo-cd/templates/argocd-server/ingress.yaml b/charts/argo-cd/templates/argocd-server/ingress.yaml index aee9a085..88eb7a6e 100644 --- a/charts/argo-cd/templates/argocd-server/ingress.yaml +++ b/charts/argo-cd/templates/argocd-server/ingress.yaml @@ -7,8 +7,10 @@ metadata: {{- if .Values.customExternalDnsName }} kubernetes.io/ingress.class: {{ .Values.customIngressControllerClassAnnotation }} {{- end }} + {{- if .Values.server.certificate.enabled }} cert-manager.io/cluster-issuer: letsencrypt-prod traefik.ingress.kubernetes.io/redirect-entry-point: https + {{- end }} ingress.kubernetes.io/force-ssl-redirect: "false" ingress.kubernetes.io/ssl-redirect: "false" name: {{ template "argo-cd.server.fullname" . }} @@ -37,7 +39,9 @@ spec: serviceName: {{ $serviceName }} servicePort: {{ $servicePort }} {{- end }} + {{- if .Values.server.certificate.enabled }} tls: - hosts: - {{ include "coreweave.externalDnsName" . }} - secretName: {{ include "coreweave.certSecretName" . }} \ No newline at end of file + secretName: {{ include "coreweave.certSecretName" . }} + {{- end }} \ No newline at end of file