diff --git a/charts/minio/1.3.10/templates/configmap.yaml b/charts/minio/1.3.10/templates/configmap.yaml deleted file mode 100644 index 0c9aeea644..0000000000 --- a/charts/minio/1.3.10/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{ $scheme := "http" }} -{{ if eq (include "minio.certAvailable" .) "true" }} -{{ $scheme = "https" }} -{{ end }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: minio-config -data: - protocol: {{ $scheme }} diff --git a/charts/minio/1.3.10/.helmignore b/charts/minio/1.3.11/.helmignore similarity index 100% rename from charts/minio/1.3.10/.helmignore rename to charts/minio/1.3.11/.helmignore diff --git a/charts/minio/1.3.10/Chart.yaml b/charts/minio/1.3.11/Chart.yaml similarity index 96% rename from charts/minio/1.3.10/Chart.yaml rename to charts/minio/1.3.11/Chart.yaml index d8a01208d3..fe60094148 100644 --- a/charts/minio/1.3.10/Chart.yaml +++ b/charts/minio/1.3.11/Chart.yaml @@ -16,4 +16,4 @@ sources: - https://github.com/minio/minio - https://github.com/minio/charts upstream_version: 8.0.5 -version: 1.3.10 +version: 1.3.11 diff --git a/charts/minio/1.3.10/README.md b/charts/minio/1.3.11/README.md similarity index 100% rename from charts/minio/1.3.10/README.md rename to charts/minio/1.3.11/README.md diff --git a/charts/minio/1.3.10/app-readme.md b/charts/minio/1.3.11/app-readme.md similarity index 100% rename from charts/minio/1.3.10/app-readme.md rename to charts/minio/1.3.11/app-readme.md diff --git a/charts/minio/1.3.10/charts/common-2105.0.0.tgz b/charts/minio/1.3.11/charts/common-2105.0.0.tgz similarity index 100% rename from charts/minio/1.3.10/charts/common-2105.0.0.tgz rename to charts/minio/1.3.11/charts/common-2105.0.0.tgz diff --git a/charts/minio/1.3.10/default_values.yaml b/charts/minio/1.3.11/default_values.yaml similarity index 100% rename from charts/minio/1.3.10/default_values.yaml rename to charts/minio/1.3.11/default_values.yaml diff --git a/charts/minio/1.3.10/ix_values.yaml b/charts/minio/1.3.11/ix_values.yaml similarity index 100% rename from charts/minio/1.3.10/ix_values.yaml rename to charts/minio/1.3.11/ix_values.yaml diff --git a/charts/minio/1.3.10/migrations/migrate_from_1.0.0 b/charts/minio/1.3.11/migrations/migrate_from_1.0.0 similarity index 100% rename from charts/minio/1.3.10/migrations/migrate_from_1.0.0 rename to charts/minio/1.3.11/migrations/migrate_from_1.0.0 diff --git a/test/minio/1.3.10/questions.yaml b/charts/minio/1.3.11/questions.yaml similarity index 95% rename from test/minio/1.3.10/questions.yaml rename to charts/minio/1.3.11/questions.yaml index 631941fbe3..c426bb7322 100644 --- a/test/minio/1.3.10/questions.yaml +++ b/charts/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/charts/minio/1.3.10/requirements.lock b/charts/minio/1.3.11/requirements.lock similarity index 100% rename from charts/minio/1.3.10/requirements.lock rename to charts/minio/1.3.11/requirements.lock diff --git a/charts/minio/1.3.10/templates/NOTES.txt b/charts/minio/1.3.11/templates/NOTES.txt similarity index 100% rename from charts/minio/1.3.10/templates/NOTES.txt rename to charts/minio/1.3.11/templates/NOTES.txt diff --git a/charts/minio/1.3.10/templates/_cert.tpl b/charts/minio/1.3.11/templates/_cert.tpl similarity index 100% rename from charts/minio/1.3.10/templates/_cert.tpl rename to charts/minio/1.3.11/templates/_cert.tpl diff --git a/test/minio/1.3.10/templates/_helpers.tpl b/charts/minio/1.3.11/templates/_helpers.tpl similarity index 83% rename from test/minio/1.3.10/templates/_helpers.tpl rename to charts/minio/1.3.11/templates/_helpers.tpl index f4d59c96f8..dc65a42ead 100644 --- a/test/minio/1.3.10/templates/_helpers.tpl +++ b/charts/minio/1.3.11/templates/_helpers.tpl @@ -38,3 +38,15 @@ Retrieve private key of minio certificate {{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate) -}} {{ include "common.resources.cert" $values }} {{- end -}} + + +{{/* +Retrieve scheme/protocol for minio +*/}} +{{- define "minio.scheme" -}} +{{- if eq (include "minio.certAvailable" .) "true" -}} +{{- print "https" -}} +{{- else -}} +{{- print "http" -}} +{{- end -}} +{{- end -}} diff --git a/charts/minio/1.3.11/templates/configmap.yaml b/charts/minio/1.3.11/templates/configmap.yaml new file mode 100644 index 0000000000..98a62a3890 --- /dev/null +++ b/charts/minio/1.3.11/templates/configmap.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: minio-config +data: + protocol: {{ include "minio.scheme" . }} diff --git a/charts/minio/1.3.10/templates/deployment.yaml b/charts/minio/1.3.11/templates/deployment.yaml similarity index 82% rename from charts/minio/1.3.10/templates/deployment.yaml rename to charts/minio/1.3.11/templates/deployment.yaml index de6c16d185..d3f1a16a14 100644 --- a/charts/minio/1.3.10/templates/deployment.yaml +++ b/charts/minio/1.3.11/templates/deployment.yaml @@ -42,6 +42,10 @@ spec: env: {{ $secretName := (include "minio.secretName" .) }} {{ $envList := (default list .Values.environmentVariables) }} + {{ if and (eq (include "minio.certAvailable" .) "true") .Values.minioDomain }} + {{ $envList = mustAppend $envList (dict "name" "MINIO_BROWSER_REDIRECT_URL" "value" (printf "%s://%s:%d" (include "minio.scheme" .) .Values.minioDomain (.Values.service.consolePort | int))) }} + {{ $envList = mustAppend $envList (dict "name" "MINIO_SERVER_URL" "value" (printf "%s://%s:%d" (include "minio.scheme" .) .Values.minioDomain (.Values.service.nodePort | int))) }} + {{ 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/charts/minio/1.3.10/templates/secrets.yaml b/charts/minio/1.3.11/templates/secrets.yaml similarity index 100% rename from charts/minio/1.3.10/templates/secrets.yaml rename to charts/minio/1.3.11/templates/secrets.yaml diff --git a/charts/minio/1.3.10/templates/service.yaml b/charts/minio/1.3.11/templates/service.yaml similarity index 100% rename from charts/minio/1.3.10/templates/service.yaml rename to charts/minio/1.3.11/templates/service.yaml diff --git a/charts/minio/1.3.10/templates/serviceaccount.yaml b/charts/minio/1.3.11/templates/serviceaccount.yaml similarity index 100% rename from charts/minio/1.3.10/templates/serviceaccount.yaml rename to charts/minio/1.3.11/templates/serviceaccount.yaml diff --git a/charts/minio/1.3.10/test_values.yaml b/charts/minio/1.3.11/test_values.yaml similarity index 94% rename from charts/minio/1.3.10/test_values.yaml rename to charts/minio/1.3.11/test_values.yaml index 5a520ef343..9e37742e1e 100644 --- a/charts/minio/1.3.10/test_values.yaml +++ b/charts/minio/1.3.11/test_values.yaml @@ -14,4 +14,5 @@ image: service: consolePort: 32325 nodePort: 32324 +minioDomain: null updateStrategy: RollingUpdate diff --git a/charts/minio/1.3.10/values.yaml b/charts/minio/1.3.11/values.yaml similarity index 100% rename from charts/minio/1.3.10/values.yaml rename to charts/minio/1.3.11/values.yaml diff --git a/test/minio/1.3.10/templates/configmap.yaml b/test/minio/1.3.10/templates/configmap.yaml deleted file mode 100644 index 0c9aeea644..0000000000 --- a/test/minio/1.3.10/templates/configmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{ $scheme := "http" }} -{{ if eq (include "minio.certAvailable" .) "true" }} -{{ $scheme = "https" }} -{{ end }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: minio-config -data: - protocol: {{ $scheme }} diff --git a/test/minio/1.3.10/.helmignore b/test/minio/1.3.11/.helmignore similarity index 100% rename from test/minio/1.3.10/.helmignore rename to test/minio/1.3.11/.helmignore diff --git a/test/minio/1.3.10/Chart.yaml b/test/minio/1.3.11/Chart.yaml similarity index 96% rename from test/minio/1.3.10/Chart.yaml rename to test/minio/1.3.11/Chart.yaml index d8a01208d3..fe60094148 100644 --- a/test/minio/1.3.10/Chart.yaml +++ b/test/minio/1.3.11/Chart.yaml @@ -16,4 +16,4 @@ sources: - https://github.com/minio/minio - https://github.com/minio/charts upstream_version: 8.0.5 -version: 1.3.10 +version: 1.3.11 diff --git a/test/minio/1.3.10/README.md b/test/minio/1.3.11/README.md similarity index 100% rename from test/minio/1.3.10/README.md rename to test/minio/1.3.11/README.md diff --git a/test/minio/1.3.10/app-readme.md b/test/minio/1.3.11/app-readme.md similarity index 100% rename from test/minio/1.3.10/app-readme.md rename to test/minio/1.3.11/app-readme.md diff --git a/test/minio/1.3.10/charts/common-2105.0.0.tgz b/test/minio/1.3.11/charts/common-2105.0.0.tgz similarity index 100% rename from test/minio/1.3.10/charts/common-2105.0.0.tgz rename to test/minio/1.3.11/charts/common-2105.0.0.tgz diff --git a/test/minio/1.3.10/default_values.yaml b/test/minio/1.3.11/default_values.yaml similarity index 100% rename from test/minio/1.3.10/default_values.yaml rename to test/minio/1.3.11/default_values.yaml diff --git a/test/minio/1.3.10/ix_values.yaml b/test/minio/1.3.11/ix_values.yaml similarity index 100% rename from test/minio/1.3.10/ix_values.yaml rename to test/minio/1.3.11/ix_values.yaml diff --git a/test/minio/1.3.10/migrations/migrate_from_1.0.0 b/test/minio/1.3.11/migrations/migrate_from_1.0.0 similarity index 100% rename from test/minio/1.3.10/migrations/migrate_from_1.0.0 rename to test/minio/1.3.11/migrations/migrate_from_1.0.0 diff --git a/charts/minio/1.3.10/questions.yaml b/test/minio/1.3.11/questions.yaml similarity index 95% rename from charts/minio/1.3.10/questions.yaml rename to test/minio/1.3.11/questions.yaml index 631941fbe3..c426bb7322 100644 --- a/charts/minio/1.3.10/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.10/requirements.lock b/test/minio/1.3.11/requirements.lock similarity index 100% rename from test/minio/1.3.10/requirements.lock rename to test/minio/1.3.11/requirements.lock diff --git a/test/minio/1.3.10/templates/NOTES.txt b/test/minio/1.3.11/templates/NOTES.txt similarity index 100% rename from test/minio/1.3.10/templates/NOTES.txt rename to test/minio/1.3.11/templates/NOTES.txt diff --git a/test/minio/1.3.10/templates/_cert.tpl b/test/minio/1.3.11/templates/_cert.tpl similarity index 100% rename from test/minio/1.3.10/templates/_cert.tpl rename to test/minio/1.3.11/templates/_cert.tpl diff --git a/charts/minio/1.3.10/templates/_helpers.tpl b/test/minio/1.3.11/templates/_helpers.tpl similarity index 83% rename from charts/minio/1.3.10/templates/_helpers.tpl rename to test/minio/1.3.11/templates/_helpers.tpl index f4d59c96f8..dc65a42ead 100644 --- a/charts/minio/1.3.10/templates/_helpers.tpl +++ b/test/minio/1.3.11/templates/_helpers.tpl @@ -38,3 +38,15 @@ Retrieve private key of minio certificate {{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate) -}} {{ include "common.resources.cert" $values }} {{- end -}} + + +{{/* +Retrieve scheme/protocol for minio +*/}} +{{- define "minio.scheme" -}} +{{- if eq (include "minio.certAvailable" .) "true" -}} +{{- print "https" -}} +{{- else -}} +{{- print "http" -}} +{{- end -}} +{{- end -}} diff --git a/test/minio/1.3.11/templates/configmap.yaml b/test/minio/1.3.11/templates/configmap.yaml new file mode 100644 index 0000000000..98a62a3890 --- /dev/null +++ b/test/minio/1.3.11/templates/configmap.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: minio-config +data: + protocol: {{ include "minio.scheme" . }} diff --git a/test/minio/1.3.10/templates/deployment.yaml b/test/minio/1.3.11/templates/deployment.yaml similarity index 82% rename from test/minio/1.3.10/templates/deployment.yaml rename to test/minio/1.3.11/templates/deployment.yaml index de6c16d185..d3f1a16a14 100644 --- a/test/minio/1.3.10/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 and (eq (include "minio.certAvailable" .) "true") .Values.minioDomain }} + {{ $envList = mustAppend $envList (dict "name" "MINIO_BROWSER_REDIRECT_URL" "value" (printf "%s://%s:%d" (include "minio.scheme" .) .Values.minioDomain (.Values.service.consolePort | int))) }} + {{ $envList = mustAppend $envList (dict "name" "MINIO_SERVER_URL" "value" (printf "%s://%s:%d" (include "minio.scheme" .) .Values.minioDomain (.Values.service.nodePort | int))) }} + {{ 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.10/templates/secrets.yaml b/test/minio/1.3.11/templates/secrets.yaml similarity index 100% rename from test/minio/1.3.10/templates/secrets.yaml rename to test/minio/1.3.11/templates/secrets.yaml diff --git a/test/minio/1.3.10/templates/service.yaml b/test/minio/1.3.11/templates/service.yaml similarity index 100% rename from test/minio/1.3.10/templates/service.yaml rename to test/minio/1.3.11/templates/service.yaml diff --git a/test/minio/1.3.10/templates/serviceaccount.yaml b/test/minio/1.3.11/templates/serviceaccount.yaml similarity index 100% rename from test/minio/1.3.10/templates/serviceaccount.yaml rename to test/minio/1.3.11/templates/serviceaccount.yaml diff --git a/test/minio/1.3.10/test_values.yaml b/test/minio/1.3.11/test_values.yaml similarity index 94% rename from test/minio/1.3.10/test_values.yaml rename to test/minio/1.3.11/test_values.yaml index 5a520ef343..9e37742e1e 100644 --- a/test/minio/1.3.10/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 diff --git a/test/minio/1.3.10/values.yaml b/test/minio/1.3.11/values.yaml similarity index 100% rename from test/minio/1.3.10/values.yaml rename to test/minio/1.3.11/values.yaml