From 19d218ce72af37a7991313fc9ff71fc8aa109988 Mon Sep 17 00:00:00 2001
From: Volker Theile <vtheile@suse.com>
Date: Thu, 26 Oct 2023 15:41:45 +0200
Subject: [PATCH] Several improvements to the chart
- Append the https:// protocol to the displayed URLs. Since the chart always installs the TLS certificates, we can restrict the output URLs to HTTPS.
- Add more chart validation tests.
Signed-off-by: Volker Theile <vtheile@suse.com>
---
charts/s3gw/templates/NOTES.txt | 4 ++--
charts/s3gw/templates/chart-validation.yaml | 12 ++++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/charts/s3gw/templates/NOTES.txt b/charts/s3gw/templates/NOTES.txt
index 57a4bd8..4f661ed 100644
--- a/charts/s3gw/templates/NOTES.txt
+++ b/charts/s3gw/templates/NOTES.txt
@@ -2,11 +2,11 @@ Thank you for installing {{ .Chart.Name }} {{ printf "v%s" .Chart.Version }}
The S3 endpoint is available at:
-{{ printf "%s.%s" (include "s3gw.serviceName" .) .Values.publicDomain | indent 4 }}
+{{ printf "https://%s.%s" (include "s3gw.serviceName" .) .Values.publicDomain | indent 4 }}
{{ if .Values.ui.enabled}}
and the web interface is available at:
-{{ printf "%s.%s" (include "s3gw.uiServiceName" .) .Values.ui.publicDomain | indent 4 }}
+{{ printf "https://%s.%s" (include "s3gw.uiServiceName" .) .Values.ui.publicDomain | indent 4 }}
{{- end }}
{{ if and (not .Values.useExistingSecret) (empty .Values.accessKey) }}
An access key has been generated: {{ include "s3gw.defaultAccessKey" . | quote }}
diff --git a/charts/s3gw/templates/chart-validation.yaml b/charts/s3gw/templates/chart-validation.yaml
index a220019..90cb28c 100644
--- a/charts/s3gw/templates/chart-validation.yaml
+++ b/charts/s3gw/templates/chart-validation.yaml
@@ -17,3 +17,15 @@
{{- end }}
{{- end }}
{{- end }}
+
+{{- if (and .Values.ingress.enabled (not .Values.useCertManager)) }}
+{{- if (or (empty .Values.tls.publicDomain.crt) (empty .Values.tls.publicDomain.key)) }}
+{{- fail "Please provide valid values for `.Values.tls.publicDomain`" }}
+{{- end }}
+{{- if (or (empty .Values.tls.privateDomain.crt) (empty .Values.tls.privateDomain.key)) }}
+{{- fail "Please provide valid values for `.Values.tls.privateDomain`" }}
+{{- end }}
+{{- if (and .Values.ui.enabled (or (empty .Values.tls.ui.publicDomain.crt) (empty .Values.tls.ui.publicDomain.key))) }}
+{{- fail "Please provide valid values for `.Values.tls.ui.publicDomain`" }}
+{{- end }}
+{{- end }}