From 120f7c116d963f861a1fca1599f1d90cd971276a Mon Sep 17 00:00:00 2001 From: "M. Rehan" Date: Mon, 6 Jun 2022 17:49:56 +0500 Subject: [PATCH 1/2] Do not setup nodeport services with hostnetwork for ix-chart --- charts/ix-chart/{2201.0.0 => 2206.0.0}/.helmignore | 0 charts/ix-chart/{2201.0.0 => 2206.0.0}/Chart.lock | 0 charts/ix-chart/{2201.0.0 => 2206.0.0}/Chart.yaml | 2 +- charts/ix-chart/{2201.0.0 => 2206.0.0}/README.md | 0 .../ix-chart/{2201.0.0 => 2206.0.0}/app-readme.md | 0 .../charts/common-2112.0.0.tgz | Bin .../ix-chart/2206.0.0}/questions.yaml | 1 + .../{2201.0.0 => 2206.0.0}/templates/NOTES.txt | 0 .../templates/_containers.tpl | 0 .../{2201.0.0 => 2206.0.0}/templates/_helpers.tpl | 0 .../templates/_networking.tpl | 0 .../{2201.0.0 => 2206.0.0}/templates/_volumes.tpl | 0 .../{2201.0.0 => 2206.0.0}/templates/_workload.tpl | 0 .../templates/external-interfaces.yaml | 0 .../ix-chart/2206.0.0}/templates/service.yaml | 4 ++-- .../templates/tests/deployment-check.yaml | 0 .../{2201.0.0 => 2206.0.0}/templates/workload.yaml | 0 .../{2201.0.0 => 2206.0.0}/test_values.yaml | 0 test/ix-chart/{2201.0.0 => 2206.0.0}/.helmignore | 0 test/ix-chart/{2201.0.0 => 2206.0.0}/Chart.lock | 0 test/ix-chart/{2201.0.0 => 2206.0.0}/Chart.yaml | 2 +- test/ix-chart/{2201.0.0 => 2206.0.0}/README.md | 0 test/ix-chart/{2201.0.0 => 2206.0.0}/app-readme.md | 0 .../charts/common-2112.0.0.tgz | Bin .../ix-chart/2206.0.0}/questions.yaml | 1 + .../{2201.0.0 => 2206.0.0}/templates/NOTES.txt | 0 .../templates/_containers.tpl | 0 .../{2201.0.0 => 2206.0.0}/templates/_helpers.tpl | 0 .../templates/_networking.tpl | 0 .../{2201.0.0 => 2206.0.0}/templates/_volumes.tpl | 0 .../{2201.0.0 => 2206.0.0}/templates/_workload.tpl | 0 .../templates/external-interfaces.yaml | 0 .../ix-chart/2206.0.0}/templates/service.yaml | 4 ++-- .../templates/tests/deployment-check.yaml | 0 .../{2201.0.0 => 2206.0.0}/templates/workload.yaml | 0 .../{2201.0.0 => 2206.0.0}/test_values.yaml | 0 36 files changed, 8 insertions(+), 6 deletions(-) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/.helmignore (100%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/Chart.lock (100%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/Chart.yaml (98%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/README.md (100%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/app-readme.md (100%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/charts/common-2112.0.0.tgz (100%) rename {test/ix-chart/2201.0.0 => charts/ix-chart/2206.0.0}/questions.yaml (99%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/templates/NOTES.txt (100%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/templates/_containers.tpl (100%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/templates/_helpers.tpl (100%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/templates/_networking.tpl (100%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/templates/_volumes.tpl (100%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/templates/_workload.tpl (100%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/templates/external-interfaces.yaml (100%) rename {test/ix-chart/2201.0.0 => charts/ix-chart/2206.0.0}/templates/service.yaml (83%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/templates/tests/deployment-check.yaml (100%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/templates/workload.yaml (100%) rename charts/ix-chart/{2201.0.0 => 2206.0.0}/test_values.yaml (100%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/.helmignore (100%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/Chart.lock (100%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/Chart.yaml (98%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/README.md (100%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/app-readme.md (100%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/charts/common-2112.0.0.tgz (100%) rename {charts/ix-chart/2201.0.0 => test/ix-chart/2206.0.0}/questions.yaml (99%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/templates/NOTES.txt (100%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/templates/_containers.tpl (100%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/templates/_helpers.tpl (100%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/templates/_networking.tpl (100%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/templates/_volumes.tpl (100%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/templates/_workload.tpl (100%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/templates/external-interfaces.yaml (100%) rename {charts/ix-chart/2201.0.0 => test/ix-chart/2206.0.0}/templates/service.yaml (83%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/templates/tests/deployment-check.yaml (100%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/templates/workload.yaml (100%) rename test/ix-chart/{2201.0.0 => 2206.0.0}/test_values.yaml (100%) diff --git a/charts/ix-chart/2201.0.0/.helmignore b/charts/ix-chart/2206.0.0/.helmignore similarity index 100% rename from charts/ix-chart/2201.0.0/.helmignore rename to charts/ix-chart/2206.0.0/.helmignore diff --git a/charts/ix-chart/2201.0.0/Chart.lock b/charts/ix-chart/2206.0.0/Chart.lock similarity index 100% rename from charts/ix-chart/2201.0.0/Chart.lock rename to charts/ix-chart/2206.0.0/Chart.lock diff --git a/charts/ix-chart/2201.0.0/Chart.yaml b/charts/ix-chart/2206.0.0/Chart.yaml similarity index 98% rename from charts/ix-chart/2201.0.0/Chart.yaml rename to charts/ix-chart/2206.0.0/Chart.yaml index c8e7b3f5db..fbe6908d66 100644 --- a/charts/ix-chart/2201.0.0/Chart.yaml +++ b/charts/ix-chart/2206.0.0/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2201.0.0 +version: 2206.0.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/ix-chart/2201.0.0/README.md b/charts/ix-chart/2206.0.0/README.md similarity index 100% rename from charts/ix-chart/2201.0.0/README.md rename to charts/ix-chart/2206.0.0/README.md diff --git a/charts/ix-chart/2201.0.0/app-readme.md b/charts/ix-chart/2206.0.0/app-readme.md similarity index 100% rename from charts/ix-chart/2201.0.0/app-readme.md rename to charts/ix-chart/2206.0.0/app-readme.md diff --git a/charts/ix-chart/2201.0.0/charts/common-2112.0.0.tgz b/charts/ix-chart/2206.0.0/charts/common-2112.0.0.tgz similarity index 100% rename from charts/ix-chart/2201.0.0/charts/common-2112.0.0.tgz rename to charts/ix-chart/2206.0.0/charts/common-2112.0.0.tgz diff --git a/test/ix-chart/2201.0.0/questions.yaml b/charts/ix-chart/2206.0.0/questions.yaml similarity index 99% rename from test/ix-chart/2201.0.0/questions.yaml rename to charts/ix-chart/2206.0.0/questions.yaml index 8f0e9f9c04..4b32d792ca 100644 --- a/test/ix-chart/2201.0.0/questions.yaml +++ b/charts/ix-chart/2206.0.0/questions.yaml @@ -352,6 +352,7 @@ questions: description: "Specify ports of node and workload to forward traffic from node port to workload port" schema: type: list + show_if: [["hostNetwork", "=", false]] items: - variable: portForwarding label: "Port Forwarding Configuration" diff --git a/charts/ix-chart/2201.0.0/templates/NOTES.txt b/charts/ix-chart/2206.0.0/templates/NOTES.txt similarity index 100% rename from charts/ix-chart/2201.0.0/templates/NOTES.txt rename to charts/ix-chart/2206.0.0/templates/NOTES.txt diff --git a/charts/ix-chart/2201.0.0/templates/_containers.tpl b/charts/ix-chart/2206.0.0/templates/_containers.tpl similarity index 100% rename from charts/ix-chart/2201.0.0/templates/_containers.tpl rename to charts/ix-chart/2206.0.0/templates/_containers.tpl diff --git a/charts/ix-chart/2201.0.0/templates/_helpers.tpl b/charts/ix-chart/2206.0.0/templates/_helpers.tpl similarity index 100% rename from charts/ix-chart/2201.0.0/templates/_helpers.tpl rename to charts/ix-chart/2206.0.0/templates/_helpers.tpl diff --git a/charts/ix-chart/2201.0.0/templates/_networking.tpl b/charts/ix-chart/2206.0.0/templates/_networking.tpl similarity index 100% rename from charts/ix-chart/2201.0.0/templates/_networking.tpl rename to charts/ix-chart/2206.0.0/templates/_networking.tpl diff --git a/charts/ix-chart/2201.0.0/templates/_volumes.tpl b/charts/ix-chart/2206.0.0/templates/_volumes.tpl similarity index 100% rename from charts/ix-chart/2201.0.0/templates/_volumes.tpl rename to charts/ix-chart/2206.0.0/templates/_volumes.tpl diff --git a/charts/ix-chart/2201.0.0/templates/_workload.tpl b/charts/ix-chart/2206.0.0/templates/_workload.tpl similarity index 100% rename from charts/ix-chart/2201.0.0/templates/_workload.tpl rename to charts/ix-chart/2206.0.0/templates/_workload.tpl diff --git a/charts/ix-chart/2201.0.0/templates/external-interfaces.yaml b/charts/ix-chart/2206.0.0/templates/external-interfaces.yaml similarity index 100% rename from charts/ix-chart/2201.0.0/templates/external-interfaces.yaml rename to charts/ix-chart/2206.0.0/templates/external-interfaces.yaml diff --git a/test/ix-chart/2201.0.0/templates/service.yaml b/charts/ix-chart/2206.0.0/templates/service.yaml similarity index 83% rename from test/ix-chart/2201.0.0/templates/service.yaml rename to charts/ix-chart/2206.0.0/templates/service.yaml index b2e472f256..4b0237d016 100644 --- a/test/ix-chart/2201.0.0/templates/service.yaml +++ b/charts/ix-chart/2206.0.0/templates/service.yaml @@ -1,4 +1,4 @@ -{{- if .Values.portForwardingList }} +{{- if and (.Values.portForwardingList) (eq (include "hostNetworkingConfiguration" .) "false") }} apiVersion: v1 kind: Service metadata: @@ -17,4 +17,4 @@ spec: {{- end }} selector: {{- include "ix-chart.selectorLabels" . | nindent 4 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/ix-chart/2201.0.0/templates/tests/deployment-check.yaml b/charts/ix-chart/2206.0.0/templates/tests/deployment-check.yaml similarity index 100% rename from charts/ix-chart/2201.0.0/templates/tests/deployment-check.yaml rename to charts/ix-chart/2206.0.0/templates/tests/deployment-check.yaml diff --git a/charts/ix-chart/2201.0.0/templates/workload.yaml b/charts/ix-chart/2206.0.0/templates/workload.yaml similarity index 100% rename from charts/ix-chart/2201.0.0/templates/workload.yaml rename to charts/ix-chart/2206.0.0/templates/workload.yaml diff --git a/charts/ix-chart/2201.0.0/test_values.yaml b/charts/ix-chart/2206.0.0/test_values.yaml similarity index 100% rename from charts/ix-chart/2201.0.0/test_values.yaml rename to charts/ix-chart/2206.0.0/test_values.yaml diff --git a/test/ix-chart/2201.0.0/.helmignore b/test/ix-chart/2206.0.0/.helmignore similarity index 100% rename from test/ix-chart/2201.0.0/.helmignore rename to test/ix-chart/2206.0.0/.helmignore diff --git a/test/ix-chart/2201.0.0/Chart.lock b/test/ix-chart/2206.0.0/Chart.lock similarity index 100% rename from test/ix-chart/2201.0.0/Chart.lock rename to test/ix-chart/2206.0.0/Chart.lock diff --git a/test/ix-chart/2201.0.0/Chart.yaml b/test/ix-chart/2206.0.0/Chart.yaml similarity index 98% rename from test/ix-chart/2201.0.0/Chart.yaml rename to test/ix-chart/2206.0.0/Chart.yaml index c8e7b3f5db..fbe6908d66 100644 --- a/test/ix-chart/2201.0.0/Chart.yaml +++ b/test/ix-chart/2206.0.0/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2201.0.0 +version: 2206.0.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/test/ix-chart/2201.0.0/README.md b/test/ix-chart/2206.0.0/README.md similarity index 100% rename from test/ix-chart/2201.0.0/README.md rename to test/ix-chart/2206.0.0/README.md diff --git a/test/ix-chart/2201.0.0/app-readme.md b/test/ix-chart/2206.0.0/app-readme.md similarity index 100% rename from test/ix-chart/2201.0.0/app-readme.md rename to test/ix-chart/2206.0.0/app-readme.md diff --git a/test/ix-chart/2201.0.0/charts/common-2112.0.0.tgz b/test/ix-chart/2206.0.0/charts/common-2112.0.0.tgz similarity index 100% rename from test/ix-chart/2201.0.0/charts/common-2112.0.0.tgz rename to test/ix-chart/2206.0.0/charts/common-2112.0.0.tgz diff --git a/charts/ix-chart/2201.0.0/questions.yaml b/test/ix-chart/2206.0.0/questions.yaml similarity index 99% rename from charts/ix-chart/2201.0.0/questions.yaml rename to test/ix-chart/2206.0.0/questions.yaml index 8f0e9f9c04..4b32d792ca 100644 --- a/charts/ix-chart/2201.0.0/questions.yaml +++ b/test/ix-chart/2206.0.0/questions.yaml @@ -352,6 +352,7 @@ questions: description: "Specify ports of node and workload to forward traffic from node port to workload port" schema: type: list + show_if: [["hostNetwork", "=", false]] items: - variable: portForwarding label: "Port Forwarding Configuration" diff --git a/test/ix-chart/2201.0.0/templates/NOTES.txt b/test/ix-chart/2206.0.0/templates/NOTES.txt similarity index 100% rename from test/ix-chart/2201.0.0/templates/NOTES.txt rename to test/ix-chart/2206.0.0/templates/NOTES.txt diff --git a/test/ix-chart/2201.0.0/templates/_containers.tpl b/test/ix-chart/2206.0.0/templates/_containers.tpl similarity index 100% rename from test/ix-chart/2201.0.0/templates/_containers.tpl rename to test/ix-chart/2206.0.0/templates/_containers.tpl diff --git a/test/ix-chart/2201.0.0/templates/_helpers.tpl b/test/ix-chart/2206.0.0/templates/_helpers.tpl similarity index 100% rename from test/ix-chart/2201.0.0/templates/_helpers.tpl rename to test/ix-chart/2206.0.0/templates/_helpers.tpl diff --git a/test/ix-chart/2201.0.0/templates/_networking.tpl b/test/ix-chart/2206.0.0/templates/_networking.tpl similarity index 100% rename from test/ix-chart/2201.0.0/templates/_networking.tpl rename to test/ix-chart/2206.0.0/templates/_networking.tpl diff --git a/test/ix-chart/2201.0.0/templates/_volumes.tpl b/test/ix-chart/2206.0.0/templates/_volumes.tpl similarity index 100% rename from test/ix-chart/2201.0.0/templates/_volumes.tpl rename to test/ix-chart/2206.0.0/templates/_volumes.tpl diff --git a/test/ix-chart/2201.0.0/templates/_workload.tpl b/test/ix-chart/2206.0.0/templates/_workload.tpl similarity index 100% rename from test/ix-chart/2201.0.0/templates/_workload.tpl rename to test/ix-chart/2206.0.0/templates/_workload.tpl diff --git a/test/ix-chart/2201.0.0/templates/external-interfaces.yaml b/test/ix-chart/2206.0.0/templates/external-interfaces.yaml similarity index 100% rename from test/ix-chart/2201.0.0/templates/external-interfaces.yaml rename to test/ix-chart/2206.0.0/templates/external-interfaces.yaml diff --git a/charts/ix-chart/2201.0.0/templates/service.yaml b/test/ix-chart/2206.0.0/templates/service.yaml similarity index 83% rename from charts/ix-chart/2201.0.0/templates/service.yaml rename to test/ix-chart/2206.0.0/templates/service.yaml index b2e472f256..4b0237d016 100644 --- a/charts/ix-chart/2201.0.0/templates/service.yaml +++ b/test/ix-chart/2206.0.0/templates/service.yaml @@ -1,4 +1,4 @@ -{{- if .Values.portForwardingList }} +{{- if and (.Values.portForwardingList) (eq (include "hostNetworkingConfiguration" .) "false") }} apiVersion: v1 kind: Service metadata: @@ -17,4 +17,4 @@ spec: {{- end }} selector: {{- include "ix-chart.selectorLabels" . | nindent 4 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/test/ix-chart/2201.0.0/templates/tests/deployment-check.yaml b/test/ix-chart/2206.0.0/templates/tests/deployment-check.yaml similarity index 100% rename from test/ix-chart/2201.0.0/templates/tests/deployment-check.yaml rename to test/ix-chart/2206.0.0/templates/tests/deployment-check.yaml diff --git a/test/ix-chart/2201.0.0/templates/workload.yaml b/test/ix-chart/2206.0.0/templates/workload.yaml similarity index 100% rename from test/ix-chart/2201.0.0/templates/workload.yaml rename to test/ix-chart/2206.0.0/templates/workload.yaml diff --git a/test/ix-chart/2201.0.0/test_values.yaml b/test/ix-chart/2206.0.0/test_values.yaml similarity index 100% rename from test/ix-chart/2201.0.0/test_values.yaml rename to test/ix-chart/2206.0.0/test_values.yaml From 5898e3f73594759c8e79422111def448cfb9c935 Mon Sep 17 00:00:00 2001 From: "M. Rehan" Date: Tue, 7 Jun 2022 21:59:52 +0500 Subject: [PATCH 2/2] Do not setup nodeport services with hostnetwork for minio --- charts/minio/{1.6.16 => 1.6.17}/.helmignore | 0 charts/minio/{1.6.16 => 1.6.17}/CHANGELOG.md | 0 charts/minio/{1.6.16 => 1.6.17}/Chart.yaml | 2 +- charts/minio/{1.6.16 => 1.6.17}/README.md | 0 charts/minio/{1.6.16 => 1.6.17}/app-readme.md | 0 .../{1.6.16 => 1.6.17}/charts/common-2112.0.0.tgz | Bin charts/minio/{1.6.16 => 1.6.17}/ix_values.yaml | 0 charts/minio/{1.6.16 => 1.6.17}/migrations/migrate | 0 .../migrations/migrate_from_1.0.0 | 0 charts/minio/{1.6.16 => 1.6.17}/questions.yaml | 0 charts/minio/{1.6.16 => 1.6.17}/requirements.lock | 0 charts/minio/{1.6.16 => 1.6.17}/templates/NOTES.txt | 0 charts/minio/{1.6.16 => 1.6.17}/templates/_cert.tpl | 0 .../minio/1.6.17}/templates/_helpers.tpl | 4 ++-- .../{1.6.16 => 1.6.17}/templates/configmap.yaml | 0 .../minio/1.6.17}/templates/deployment.yaml | 4 ++-- .../templates/pre-install-job.yaml | 0 .../minio/{1.6.16 => 1.6.17}/templates/secrets.yaml | 0 .../minio/1.6.17}/templates/service.yaml | 6 ++++-- .../templates/serviceaccount.yaml | 0 .../templates/tests/deployment-check.yaml | 0 charts/minio/{1.6.16 => 1.6.17}/test_values.yaml | 0 test/minio/{1.6.16 => 1.6.17}/.helmignore | 0 test/minio/{1.6.16 => 1.6.17}/CHANGELOG.md | 0 test/minio/{1.6.16 => 1.6.17}/Chart.yaml | 2 +- test/minio/{1.6.16 => 1.6.17}/README.md | 0 test/minio/{1.6.16 => 1.6.17}/app-readme.md | 0 .../{1.6.16 => 1.6.17}/charts/common-2112.0.0.tgz | Bin test/minio/{1.6.16 => 1.6.17}/ix_values.yaml | 0 test/minio/{1.6.16 => 1.6.17}/migrations/migrate | 0 .../migrations/migrate_from_1.0.0 | 0 test/minio/{1.6.16 => 1.6.17}/questions.yaml | 0 test/minio/{1.6.16 => 1.6.17}/requirements.lock | 0 test/minio/{1.6.16 => 1.6.17}/templates/NOTES.txt | 0 test/minio/{1.6.16 => 1.6.17}/templates/_cert.tpl | 0 .../minio/1.6.17}/templates/_helpers.tpl | 4 ++-- .../{1.6.16 => 1.6.17}/templates/configmap.yaml | 0 .../minio/1.6.17}/templates/deployment.yaml | 4 ++-- .../templates/pre-install-job.yaml | 0 .../minio/{1.6.16 => 1.6.17}/templates/secrets.yaml | 0 .../minio/1.6.17}/templates/service.yaml | 6 ++++-- .../templates/serviceaccount.yaml | 0 .../templates/tests/deployment-check.yaml | 0 test/minio/{1.6.16 => 1.6.17}/test_values.yaml | 0 44 files changed, 18 insertions(+), 14 deletions(-) rename charts/minio/{1.6.16 => 1.6.17}/.helmignore (100%) rename charts/minio/{1.6.16 => 1.6.17}/CHANGELOG.md (100%) rename charts/minio/{1.6.16 => 1.6.17}/Chart.yaml (96%) rename charts/minio/{1.6.16 => 1.6.17}/README.md (100%) rename charts/minio/{1.6.16 => 1.6.17}/app-readme.md (100%) rename charts/minio/{1.6.16 => 1.6.17}/charts/common-2112.0.0.tgz (100%) rename charts/minio/{1.6.16 => 1.6.17}/ix_values.yaml (100%) rename charts/minio/{1.6.16 => 1.6.17}/migrations/migrate (100%) rename charts/minio/{1.6.16 => 1.6.17}/migrations/migrate_from_1.0.0 (100%) rename charts/minio/{1.6.16 => 1.6.17}/questions.yaml (100%) rename charts/minio/{1.6.16 => 1.6.17}/requirements.lock (100%) rename charts/minio/{1.6.16 => 1.6.17}/templates/NOTES.txt (100%) rename charts/minio/{1.6.16 => 1.6.17}/templates/_cert.tpl (100%) rename {test/minio/1.6.16 => charts/minio/1.6.17}/templates/_helpers.tpl (85%) rename charts/minio/{1.6.16 => 1.6.17}/templates/configmap.yaml (100%) rename {test/minio/1.6.16 => charts/minio/1.6.17}/templates/deployment.yaml (96%) rename charts/minio/{1.6.16 => 1.6.17}/templates/pre-install-job.yaml (100%) rename charts/minio/{1.6.16 => 1.6.17}/templates/secrets.yaml (100%) rename {test/minio/1.6.16 => charts/minio/1.6.17}/templates/service.yaml (71%) rename charts/minio/{1.6.16 => 1.6.17}/templates/serviceaccount.yaml (100%) rename charts/minio/{1.6.16 => 1.6.17}/templates/tests/deployment-check.yaml (100%) rename charts/minio/{1.6.16 => 1.6.17}/test_values.yaml (100%) rename test/minio/{1.6.16 => 1.6.17}/.helmignore (100%) rename test/minio/{1.6.16 => 1.6.17}/CHANGELOG.md (100%) rename test/minio/{1.6.16 => 1.6.17}/Chart.yaml (96%) rename test/minio/{1.6.16 => 1.6.17}/README.md (100%) rename test/minio/{1.6.16 => 1.6.17}/app-readme.md (100%) rename test/minio/{1.6.16 => 1.6.17}/charts/common-2112.0.0.tgz (100%) rename test/minio/{1.6.16 => 1.6.17}/ix_values.yaml (100%) rename test/minio/{1.6.16 => 1.6.17}/migrations/migrate (100%) rename test/minio/{1.6.16 => 1.6.17}/migrations/migrate_from_1.0.0 (100%) rename test/minio/{1.6.16 => 1.6.17}/questions.yaml (100%) rename test/minio/{1.6.16 => 1.6.17}/requirements.lock (100%) rename test/minio/{1.6.16 => 1.6.17}/templates/NOTES.txt (100%) rename test/minio/{1.6.16 => 1.6.17}/templates/_cert.tpl (100%) rename {charts/minio/1.6.16 => test/minio/1.6.17}/templates/_helpers.tpl (85%) rename test/minio/{1.6.16 => 1.6.17}/templates/configmap.yaml (100%) rename {charts/minio/1.6.16 => test/minio/1.6.17}/templates/deployment.yaml (96%) rename test/minio/{1.6.16 => 1.6.17}/templates/pre-install-job.yaml (100%) rename test/minio/{1.6.16 => 1.6.17}/templates/secrets.yaml (100%) rename {charts/minio/1.6.16 => test/minio/1.6.17}/templates/service.yaml (71%) rename test/minio/{1.6.16 => 1.6.17}/templates/serviceaccount.yaml (100%) rename test/minio/{1.6.16 => 1.6.17}/templates/tests/deployment-check.yaml (100%) rename test/minio/{1.6.16 => 1.6.17}/test_values.yaml (100%) diff --git a/charts/minio/1.6.16/.helmignore b/charts/minio/1.6.17/.helmignore similarity index 100% rename from charts/minio/1.6.16/.helmignore rename to charts/minio/1.6.17/.helmignore diff --git a/charts/minio/1.6.16/CHANGELOG.md b/charts/minio/1.6.17/CHANGELOG.md similarity index 100% rename from charts/minio/1.6.16/CHANGELOG.md rename to charts/minio/1.6.17/CHANGELOG.md diff --git a/charts/minio/1.6.16/Chart.yaml b/charts/minio/1.6.17/Chart.yaml similarity index 96% rename from charts/minio/1.6.16/Chart.yaml rename to charts/minio/1.6.17/Chart.yaml index 489e1aba36..004e214109 100644 --- a/charts/minio/1.6.16/Chart.yaml +++ b/charts/minio/1.6.17/Chart.yaml @@ -16,4 +16,4 @@ sources: - https://github.com/minio/minio - https://github.com/minio/charts upstream_version: 8.0.5 -version: 1.6.16 +version: 1.6.17 diff --git a/charts/minio/1.6.16/README.md b/charts/minio/1.6.17/README.md similarity index 100% rename from charts/minio/1.6.16/README.md rename to charts/minio/1.6.17/README.md diff --git a/charts/minio/1.6.16/app-readme.md b/charts/minio/1.6.17/app-readme.md similarity index 100% rename from charts/minio/1.6.16/app-readme.md rename to charts/minio/1.6.17/app-readme.md diff --git a/charts/minio/1.6.16/charts/common-2112.0.0.tgz b/charts/minio/1.6.17/charts/common-2112.0.0.tgz similarity index 100% rename from charts/minio/1.6.16/charts/common-2112.0.0.tgz rename to charts/minio/1.6.17/charts/common-2112.0.0.tgz diff --git a/charts/minio/1.6.16/ix_values.yaml b/charts/minio/1.6.17/ix_values.yaml similarity index 100% rename from charts/minio/1.6.16/ix_values.yaml rename to charts/minio/1.6.17/ix_values.yaml diff --git a/charts/minio/1.6.16/migrations/migrate b/charts/minio/1.6.17/migrations/migrate similarity index 100% rename from charts/minio/1.6.16/migrations/migrate rename to charts/minio/1.6.17/migrations/migrate diff --git a/charts/minio/1.6.16/migrations/migrate_from_1.0.0 b/charts/minio/1.6.17/migrations/migrate_from_1.0.0 similarity index 100% rename from charts/minio/1.6.16/migrations/migrate_from_1.0.0 rename to charts/minio/1.6.17/migrations/migrate_from_1.0.0 diff --git a/charts/minio/1.6.16/questions.yaml b/charts/minio/1.6.17/questions.yaml similarity index 100% rename from charts/minio/1.6.16/questions.yaml rename to charts/minio/1.6.17/questions.yaml diff --git a/charts/minio/1.6.16/requirements.lock b/charts/minio/1.6.17/requirements.lock similarity index 100% rename from charts/minio/1.6.16/requirements.lock rename to charts/minio/1.6.17/requirements.lock diff --git a/charts/minio/1.6.16/templates/NOTES.txt b/charts/minio/1.6.17/templates/NOTES.txt similarity index 100% rename from charts/minio/1.6.16/templates/NOTES.txt rename to charts/minio/1.6.17/templates/NOTES.txt diff --git a/charts/minio/1.6.16/templates/_cert.tpl b/charts/minio/1.6.17/templates/_cert.tpl similarity index 100% rename from charts/minio/1.6.16/templates/_cert.tpl rename to charts/minio/1.6.17/templates/_cert.tpl diff --git a/test/minio/1.6.16/templates/_helpers.tpl b/charts/minio/1.6.17/templates/_helpers.tpl similarity index 85% rename from test/minio/1.6.16/templates/_helpers.tpl rename to charts/minio/1.6.17/templates/_helpers.tpl index 55b50755aa..8fdf17e791 100644 --- a/test/minio/1.6.16/templates/_helpers.tpl +++ b/charts/minio/1.6.17/templates/_helpers.tpl @@ -56,11 +56,11 @@ Retrieve scheme/protocol for minio Retrieve command for minio application */}} {{- define "minio.commandArgs" -}} -{{- $arg := "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':9001'" -}} +{{- $arg := (printf "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':%d'" (.Values.service.consolePort | int)) -}} {{- if .Values.distributedMode -}} {{- cat $arg (join " " (concat (.Values.distributedIps | default list) (.Values.extraArgs | default list))) -}} {{- else -}} -{{- cat $arg ((concat (list "/export") (.Values.extraArgs | default list)) | join " ") -}} +{{- cat $arg ((concat (list (printf "--address ':%d'" (.Values.service.nodePort | int))) (list "/export") (.Values.extraArgs | default list)) | join " ") -}} {{- end -}} {{- end -}} diff --git a/charts/minio/1.6.16/templates/configmap.yaml b/charts/minio/1.6.17/templates/configmap.yaml similarity index 100% rename from charts/minio/1.6.16/templates/configmap.yaml rename to charts/minio/1.6.17/templates/configmap.yaml diff --git a/test/minio/1.6.16/templates/deployment.yaml b/charts/minio/1.6.17/templates/deployment.yaml similarity index 96% rename from test/minio/1.6.16/templates/deployment.yaml rename to charts/minio/1.6.17/templates/deployment.yaml index fa6f2ead47..66da2d202c 100644 --- a/test/minio/1.6.16/templates/deployment.yaml +++ b/charts/minio/1.6.17/templates/deployment.yaml @@ -46,9 +46,9 @@ spec: - {{ include "minio.commandArgs" . }} ports: - name: api - containerPort: 9000 + containerPort: {{ .Values.service.nodePort | int }} - name: console - containerPort: 9001 + containerPort: {{ .Values.service.consolePort | int }} env: {{ $secretName := (include "minio.secretName" .) }} {{ $envList := (default list .Values.environmentVariables) }} diff --git a/charts/minio/1.6.16/templates/pre-install-job.yaml b/charts/minio/1.6.17/templates/pre-install-job.yaml similarity index 100% rename from charts/minio/1.6.16/templates/pre-install-job.yaml rename to charts/minio/1.6.17/templates/pre-install-job.yaml diff --git a/charts/minio/1.6.16/templates/secrets.yaml b/charts/minio/1.6.17/templates/secrets.yaml similarity index 100% rename from charts/minio/1.6.16/templates/secrets.yaml rename to charts/minio/1.6.17/templates/secrets.yaml diff --git a/test/minio/1.6.16/templates/service.yaml b/charts/minio/1.6.17/templates/service.yaml similarity index 71% rename from test/minio/1.6.16/templates/service.yaml rename to charts/minio/1.6.17/templates/service.yaml index fd2e6ba676..cbb4afc3dc 100644 --- a/test/minio/1.6.16/templates/service.yaml +++ b/charts/minio/1.6.17/templates/service.yaml @@ -1,11 +1,13 @@ +{{ if eq (include "minio.hostNetworking" .) "false" }} {{ $svc := .Values.service }} {{ $selectors := list }} {{ $selectors = mustAppend $selectors (dict "key" "app" "value" (include "common.names.name" .) ) }} {{ $selectors = mustAppend $selectors (dict "key" "release" "value" .Release.Name ) }} {{ $ports := list }} -{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }} -{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" 9001) }} +{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" (.Values.service.nodePort | int)) }} +{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" (.Values.service.consolePort | int)) }} {{ $params := . }} {{ $_ := set $params "commonService" (dict "type" "NodePort" "ports" $ports ) }} {{ $_1 := set .Values "extraSelectorLabels" $selectors }} {{ include "common.classes.service" $params }} +{{ end }} diff --git a/charts/minio/1.6.16/templates/serviceaccount.yaml b/charts/minio/1.6.17/templates/serviceaccount.yaml similarity index 100% rename from charts/minio/1.6.16/templates/serviceaccount.yaml rename to charts/minio/1.6.17/templates/serviceaccount.yaml diff --git a/charts/minio/1.6.16/templates/tests/deployment-check.yaml b/charts/minio/1.6.17/templates/tests/deployment-check.yaml similarity index 100% rename from charts/minio/1.6.16/templates/tests/deployment-check.yaml rename to charts/minio/1.6.17/templates/tests/deployment-check.yaml diff --git a/charts/minio/1.6.16/test_values.yaml b/charts/minio/1.6.17/test_values.yaml similarity index 100% rename from charts/minio/1.6.16/test_values.yaml rename to charts/minio/1.6.17/test_values.yaml diff --git a/test/minio/1.6.16/.helmignore b/test/minio/1.6.17/.helmignore similarity index 100% rename from test/minio/1.6.16/.helmignore rename to test/minio/1.6.17/.helmignore diff --git a/test/minio/1.6.16/CHANGELOG.md b/test/minio/1.6.17/CHANGELOG.md similarity index 100% rename from test/minio/1.6.16/CHANGELOG.md rename to test/minio/1.6.17/CHANGELOG.md diff --git a/test/minio/1.6.16/Chart.yaml b/test/minio/1.6.17/Chart.yaml similarity index 96% rename from test/minio/1.6.16/Chart.yaml rename to test/minio/1.6.17/Chart.yaml index 489e1aba36..004e214109 100644 --- a/test/minio/1.6.16/Chart.yaml +++ b/test/minio/1.6.17/Chart.yaml @@ -16,4 +16,4 @@ sources: - https://github.com/minio/minio - https://github.com/minio/charts upstream_version: 8.0.5 -version: 1.6.16 +version: 1.6.17 diff --git a/test/minio/1.6.16/README.md b/test/minio/1.6.17/README.md similarity index 100% rename from test/minio/1.6.16/README.md rename to test/minio/1.6.17/README.md diff --git a/test/minio/1.6.16/app-readme.md b/test/minio/1.6.17/app-readme.md similarity index 100% rename from test/minio/1.6.16/app-readme.md rename to test/minio/1.6.17/app-readme.md diff --git a/test/minio/1.6.16/charts/common-2112.0.0.tgz b/test/minio/1.6.17/charts/common-2112.0.0.tgz similarity index 100% rename from test/minio/1.6.16/charts/common-2112.0.0.tgz rename to test/minio/1.6.17/charts/common-2112.0.0.tgz diff --git a/test/minio/1.6.16/ix_values.yaml b/test/minio/1.6.17/ix_values.yaml similarity index 100% rename from test/minio/1.6.16/ix_values.yaml rename to test/minio/1.6.17/ix_values.yaml diff --git a/test/minio/1.6.16/migrations/migrate b/test/minio/1.6.17/migrations/migrate similarity index 100% rename from test/minio/1.6.16/migrations/migrate rename to test/minio/1.6.17/migrations/migrate diff --git a/test/minio/1.6.16/migrations/migrate_from_1.0.0 b/test/minio/1.6.17/migrations/migrate_from_1.0.0 similarity index 100% rename from test/minio/1.6.16/migrations/migrate_from_1.0.0 rename to test/minio/1.6.17/migrations/migrate_from_1.0.0 diff --git a/test/minio/1.6.16/questions.yaml b/test/minio/1.6.17/questions.yaml similarity index 100% rename from test/minio/1.6.16/questions.yaml rename to test/minio/1.6.17/questions.yaml diff --git a/test/minio/1.6.16/requirements.lock b/test/minio/1.6.17/requirements.lock similarity index 100% rename from test/minio/1.6.16/requirements.lock rename to test/minio/1.6.17/requirements.lock diff --git a/test/minio/1.6.16/templates/NOTES.txt b/test/minio/1.6.17/templates/NOTES.txt similarity index 100% rename from test/minio/1.6.16/templates/NOTES.txt rename to test/minio/1.6.17/templates/NOTES.txt diff --git a/test/minio/1.6.16/templates/_cert.tpl b/test/minio/1.6.17/templates/_cert.tpl similarity index 100% rename from test/minio/1.6.16/templates/_cert.tpl rename to test/minio/1.6.17/templates/_cert.tpl diff --git a/charts/minio/1.6.16/templates/_helpers.tpl b/test/minio/1.6.17/templates/_helpers.tpl similarity index 85% rename from charts/minio/1.6.16/templates/_helpers.tpl rename to test/minio/1.6.17/templates/_helpers.tpl index 55b50755aa..8fdf17e791 100644 --- a/charts/minio/1.6.16/templates/_helpers.tpl +++ b/test/minio/1.6.17/templates/_helpers.tpl @@ -56,11 +56,11 @@ Retrieve scheme/protocol for minio Retrieve command for minio application */}} {{- define "minio.commandArgs" -}} -{{- $arg := "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':9001'" -}} +{{- $arg := (printf "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':%d'" (.Values.service.consolePort | int)) -}} {{- if .Values.distributedMode -}} {{- cat $arg (join " " (concat (.Values.distributedIps | default list) (.Values.extraArgs | default list))) -}} {{- else -}} -{{- cat $arg ((concat (list "/export") (.Values.extraArgs | default list)) | join " ") -}} +{{- cat $arg ((concat (list (printf "--address ':%d'" (.Values.service.nodePort | int))) (list "/export") (.Values.extraArgs | default list)) | join " ") -}} {{- end -}} {{- end -}} diff --git a/test/minio/1.6.16/templates/configmap.yaml b/test/minio/1.6.17/templates/configmap.yaml similarity index 100% rename from test/minio/1.6.16/templates/configmap.yaml rename to test/minio/1.6.17/templates/configmap.yaml diff --git a/charts/minio/1.6.16/templates/deployment.yaml b/test/minio/1.6.17/templates/deployment.yaml similarity index 96% rename from charts/minio/1.6.16/templates/deployment.yaml rename to test/minio/1.6.17/templates/deployment.yaml index fa6f2ead47..66da2d202c 100644 --- a/charts/minio/1.6.16/templates/deployment.yaml +++ b/test/minio/1.6.17/templates/deployment.yaml @@ -46,9 +46,9 @@ spec: - {{ include "minio.commandArgs" . }} ports: - name: api - containerPort: 9000 + containerPort: {{ .Values.service.nodePort | int }} - name: console - containerPort: 9001 + containerPort: {{ .Values.service.consolePort | int }} env: {{ $secretName := (include "minio.secretName" .) }} {{ $envList := (default list .Values.environmentVariables) }} diff --git a/test/minio/1.6.16/templates/pre-install-job.yaml b/test/minio/1.6.17/templates/pre-install-job.yaml similarity index 100% rename from test/minio/1.6.16/templates/pre-install-job.yaml rename to test/minio/1.6.17/templates/pre-install-job.yaml diff --git a/test/minio/1.6.16/templates/secrets.yaml b/test/minio/1.6.17/templates/secrets.yaml similarity index 100% rename from test/minio/1.6.16/templates/secrets.yaml rename to test/minio/1.6.17/templates/secrets.yaml diff --git a/charts/minio/1.6.16/templates/service.yaml b/test/minio/1.6.17/templates/service.yaml similarity index 71% rename from charts/minio/1.6.16/templates/service.yaml rename to test/minio/1.6.17/templates/service.yaml index fd2e6ba676..cbb4afc3dc 100644 --- a/charts/minio/1.6.16/templates/service.yaml +++ b/test/minio/1.6.17/templates/service.yaml @@ -1,11 +1,13 @@ +{{ if eq (include "minio.hostNetworking" .) "false" }} {{ $svc := .Values.service }} {{ $selectors := list }} {{ $selectors = mustAppend $selectors (dict "key" "app" "value" (include "common.names.name" .) ) }} {{ $selectors = mustAppend $selectors (dict "key" "release" "value" .Release.Name ) }} {{ $ports := list }} -{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }} -{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" 9001) }} +{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" (.Values.service.nodePort | int)) }} +{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" (.Values.service.consolePort | int)) }} {{ $params := . }} {{ $_ := set $params "commonService" (dict "type" "NodePort" "ports" $ports ) }} {{ $_1 := set .Values "extraSelectorLabels" $selectors }} {{ include "common.classes.service" $params }} +{{ end }} diff --git a/test/minio/1.6.16/templates/serviceaccount.yaml b/test/minio/1.6.17/templates/serviceaccount.yaml similarity index 100% rename from test/minio/1.6.16/templates/serviceaccount.yaml rename to test/minio/1.6.17/templates/serviceaccount.yaml diff --git a/test/minio/1.6.16/templates/tests/deployment-check.yaml b/test/minio/1.6.17/templates/tests/deployment-check.yaml similarity index 100% rename from test/minio/1.6.16/templates/tests/deployment-check.yaml rename to test/minio/1.6.17/templates/tests/deployment-check.yaml diff --git a/test/minio/1.6.16/test_values.yaml b/test/minio/1.6.17/test_values.yaml similarity index 100% rename from test/minio/1.6.16/test_values.yaml rename to test/minio/1.6.17/test_values.yaml