From f1847418b41f46a9a0aa78dc622a822d6366a9e4 Mon Sep 17 00:00:00 2001
From: Miguel Ruiz <miruiz@vmware.com>
Date: Tue, 31 Jan 2023 11:21:50 +0100
Subject: [PATCH] [bitnami/contour] Don't regenerate self-signed certs on
 upgrade (#14615)

Signed-off-by: Miguel Ruiz <miruiz@vmware.com>
---
 bitnami/contour/Chart.yaml                               | 2 +-
 .../contour/templates/default-backend/tls-secrets.yaml   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bitnami/contour/Chart.yaml b/bitnami/contour/Chart.yaml
index e7e3f43970..9854cf734f 100644
--- a/bitnami/contour/Chart.yaml
+++ b/bitnami/contour/Chart.yaml
@@ -25,4 +25,4 @@ sources:
   - https://github.com/envoyproxy/envoy
   - https://github.com/bitnami/containers/tree/main/bitnami/contour
   - https://projectcontour.io
-version: 10.2.0
+version: 10.2.1
diff --git a/bitnami/contour/templates/default-backend/tls-secrets.yaml b/bitnami/contour/templates/default-backend/tls-secrets.yaml
index 29e4b7f927..5448bb6643 100644
--- a/bitnami/contour/templates/default-backend/tls-secrets.yaml
+++ b/bitnami/contour/templates/default-backend/tls-secrets.yaml
@@ -21,12 +21,13 @@ data:
 {{- end }}
 {{- end }}
 {{- if and .Values.ingress.tls .Values.ingress.selfSigned }}
+{{- $secretName := printf "%s-tls" .Values.ingress.hostname }}
 {{- $ca := genCA "odoo-ca" 365 }}
 {{- $cert := genSignedCert .Values.ingress.hostname nil (list .Values.ingress.hostname) 365 $ca }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ printf "%s-tls" .Values.ingress.hostname }}
+  name: {{ $secretName }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
@@ -37,8 +38,8 @@ metadata:
   {{- end }}
 type: kubernetes.io/tls
 data:
-  tls.crt: {{ $cert.Cert | b64enc | quote }}
-  tls.key: {{ $cert.Key | b64enc | quote }}
-  ca.crt: {{ $ca.Cert | b64enc | quote }}
+  tls.crt: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "tls.crt" "defaultValue" $cert.Cert "context" $) }}
+  tls.key: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "tls.key" "defaultValue" $cert.Key "context" $) }}
+  ca.crt: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "ca.crt" "defaultValue" $ca.Cert "context" $) }}
 {{- end }}
 {{- end }}