diff --git a/test/minio/1.3.11/questions.yaml b/test/minio/1.3.11/questions.yaml index 631941fbe3..62571b70b4 100644 --- a/test/minio/1.3.11/questions.yaml +++ b/test/minio/1.3.11/questions.yaml @@ -140,6 +140,16 @@ questions: default: 9002 required: true + - variable: minioDomain + label: "Minio Domain Name" + description: "This is only required if TLS is configured for Minio" + group: "Minio Configuration" + schema: + type: string + default: null + null: true + show_if: [["certificate", "!=", null]] + - variable: certificate description: "Minio Certificate" label: "Minio Certificate" diff --git a/test/minio/1.3.11/templates/deployment.yaml b/test/minio/1.3.11/templates/deployment.yaml index de6c16d185..18573a26d9 100644 --- a/test/minio/1.3.11/templates/deployment.yaml +++ b/test/minio/1.3.11/templates/deployment.yaml @@ -42,6 +42,10 @@ spec: env: {{ $secretName := (include "minio.secretName" .) }} {{ $envList := (default list .Values.environmentVariables) }} + {{ if .Values.minioDomain }} + {{ $envList = mustAppend $envList (dict "name" "MINIO_BROWSER_REDIRECT_URL" "value" (printf "https://%s:%d" .Values.minioDomain .Values.service.consolePort)) }} + {{ $envList = mustAppend $envList (dict "name" "MINIO_SERVER_URL" "value" (printf "https://%s:%d" .Values.minioDomain .Values.service.nodePort)) }} + {{ end }} {{ $envList = mustAppend $envList (dict "name" "MINIO_ACCESS_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "accesskey") }} {{ $envList = mustAppend $envList (dict "name" "MINIO_SECRET_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "secretkey") }} {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} diff --git a/test/minio/1.3.11/templates/secrets.yaml b/test/minio/1.3.11/templates/secrets.yaml index 4085fd585b..bb66428cde 100644 --- a/test/minio/1.3.11/templates/secrets.yaml +++ b/test/minio/1.3.11/templates/secrets.yaml @@ -8,6 +8,9 @@ data: accesskey: {{ if .Values.accessKey }}{{ .Values.accessKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 20 | b64enc | quote }}{{ end }} secretkey: {{ if .Values.secretKey }}{{ .Values.secretKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 40 | b64enc | quote }}{{ end }} {{ if eq (include "minio.certAvailable" .) "true" }} + {{ if eq .Values.minioDomain null }} + {{ fail "Minio Domain must be specified when TLS is configured" }} + {{ end }} certPublicKey: {{ (include "minio.cert.publicKey" .) | toString | b64enc | quote }} certPrivateKey: {{ (include "minio.cert.privateKey" .) | toString | b64enc | quote }} {{ end }} diff --git a/test/minio/1.3.11/test_values.yaml b/test/minio/1.3.11/test_values.yaml index 5a520ef343..9e37742e1e 100644 --- a/test/minio/1.3.11/test_values.yaml +++ b/test/minio/1.3.11/test_values.yaml @@ -14,4 +14,5 @@ image: service: consolePort: 32325 nodePort: 32324 +minioDomain: null updateStrategy: RollingUpdate