From 120f7c116d963f861a1fca1599f1d90cd971276a Mon Sep 17 00:00:00 2001 From: "M. Rehan" Date: Mon, 6 Jun 2022 17:49:56 +0500 Subject: [PATCH] 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