From 3dda462fa2f462b2d540e0991afa56ff44ba3f85 Mon Sep 17 00:00:00 2001 From: "M. Rehan" Date: Fri, 1 Jul 2022 18:51:43 +0500 Subject: [PATCH] Add host path validation in ix-charts --- charts/ix-chart/{2206.0.3 => 2207.0.0}/.helmignore | 0 charts/ix-chart/{2206.0.3 => 2207.0.0}/Chart.lock | 0 charts/ix-chart/{2206.0.3 => 2207.0.0}/Chart.yaml | 2 +- charts/ix-chart/{2206.0.3 => 2207.0.0}/README.md | 0 .../ix-chart/{2206.0.3 => 2207.0.0}/app-readme.md | 0 .../charts/common-2206.0.0.tgz | Bin .../ix-chart/{2206.0.3 => 2207.0.0}/questions.yaml | 0 .../{2206.0.3 => 2207.0.0}/templates/NOTES.txt | 0 .../templates/_containers.tpl | 0 .../{2206.0.3 => 2207.0.0}/templates/_helpers.tpl | 0 .../templates/_networking.tpl | 0 .../{2206.0.3 => 2207.0.0}/templates/_volumes.tpl | 4 ++++ .../{2206.0.3 => 2207.0.0}/templates/_workload.tpl | 0 .../templates/external-interfaces.yaml | 0 .../{2206.0.3 => 2207.0.0}/templates/service.yaml | 0 .../templates/tests/deployment-check.yaml | 0 .../{2206.0.3 => 2207.0.0}/templates/workload.yaml | 0 .../{2206.0.3 => 2207.0.0}/test_values.yaml | 0 test/ix-chart/{2206.0.3 => 2207.0.0}/.helmignore | 0 test/ix-chart/{2206.0.3 => 2207.0.0}/Chart.lock | 0 test/ix-chart/{2206.0.3 => 2207.0.0}/Chart.yaml | 2 +- test/ix-chart/{2206.0.3 => 2207.0.0}/README.md | 0 test/ix-chart/{2206.0.3 => 2207.0.0}/app-readme.md | 0 .../charts/common-2206.0.0.tgz | Bin test/ix-chart/{2206.0.3 => 2207.0.0}/questions.yaml | 0 .../{2206.0.3 => 2207.0.0}/templates/NOTES.txt | 0 .../templates/_containers.tpl | 0 .../{2206.0.3 => 2207.0.0}/templates/_helpers.tpl | 0 .../templates/_networking.tpl | 0 .../{2206.0.3 => 2207.0.0}/templates/_volumes.tpl | 4 ++++ .../{2206.0.3 => 2207.0.0}/templates/_workload.tpl | 0 .../templates/external-interfaces.yaml | 0 .../{2206.0.3 => 2207.0.0}/templates/service.yaml | 0 .../templates/tests/deployment-check.yaml | 0 .../{2206.0.3 => 2207.0.0}/templates/workload.yaml | 0 .../{2206.0.3 => 2207.0.0}/test_values.yaml | 0 36 files changed, 10 insertions(+), 2 deletions(-) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/.helmignore (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/Chart.lock (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/Chart.yaml (98%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/README.md (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/app-readme.md (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/charts/common-2206.0.0.tgz (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/questions.yaml (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/templates/NOTES.txt (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/templates/_containers.tpl (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/templates/_helpers.tpl (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/templates/_networking.tpl (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/templates/_volumes.tpl (88%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/templates/_workload.tpl (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/templates/external-interfaces.yaml (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/templates/service.yaml (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/templates/tests/deployment-check.yaml (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/templates/workload.yaml (100%) rename charts/ix-chart/{2206.0.3 => 2207.0.0}/test_values.yaml (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/.helmignore (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/Chart.lock (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/Chart.yaml (98%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/README.md (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/app-readme.md (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/charts/common-2206.0.0.tgz (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/questions.yaml (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/templates/NOTES.txt (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/templates/_containers.tpl (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/templates/_helpers.tpl (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/templates/_networking.tpl (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/templates/_volumes.tpl (88%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/templates/_workload.tpl (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/templates/external-interfaces.yaml (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/templates/service.yaml (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/templates/tests/deployment-check.yaml (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/templates/workload.yaml (100%) rename test/ix-chart/{2206.0.3 => 2207.0.0}/test_values.yaml (100%) diff --git a/charts/ix-chart/2206.0.3/.helmignore b/charts/ix-chart/2207.0.0/.helmignore similarity index 100% rename from charts/ix-chart/2206.0.3/.helmignore rename to charts/ix-chart/2207.0.0/.helmignore diff --git a/charts/ix-chart/2206.0.3/Chart.lock b/charts/ix-chart/2207.0.0/Chart.lock similarity index 100% rename from charts/ix-chart/2206.0.3/Chart.lock rename to charts/ix-chart/2207.0.0/Chart.lock diff --git a/charts/ix-chart/2206.0.3/Chart.yaml b/charts/ix-chart/2207.0.0/Chart.yaml similarity index 98% rename from charts/ix-chart/2206.0.3/Chart.yaml rename to charts/ix-chart/2207.0.0/Chart.yaml index 956e7497bd..ce6fb5c18f 100644 --- a/charts/ix-chart/2206.0.3/Chart.yaml +++ b/charts/ix-chart/2207.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: 2206.0.3 +version: 2207.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/2206.0.3/README.md b/charts/ix-chart/2207.0.0/README.md similarity index 100% rename from charts/ix-chart/2206.0.3/README.md rename to charts/ix-chart/2207.0.0/README.md diff --git a/charts/ix-chart/2206.0.3/app-readme.md b/charts/ix-chart/2207.0.0/app-readme.md similarity index 100% rename from charts/ix-chart/2206.0.3/app-readme.md rename to charts/ix-chart/2207.0.0/app-readme.md diff --git a/charts/ix-chart/2206.0.3/charts/common-2206.0.0.tgz b/charts/ix-chart/2207.0.0/charts/common-2206.0.0.tgz similarity index 100% rename from charts/ix-chart/2206.0.3/charts/common-2206.0.0.tgz rename to charts/ix-chart/2207.0.0/charts/common-2206.0.0.tgz diff --git a/charts/ix-chart/2206.0.3/questions.yaml b/charts/ix-chart/2207.0.0/questions.yaml similarity index 100% rename from charts/ix-chart/2206.0.3/questions.yaml rename to charts/ix-chart/2207.0.0/questions.yaml diff --git a/charts/ix-chart/2206.0.3/templates/NOTES.txt b/charts/ix-chart/2207.0.0/templates/NOTES.txt similarity index 100% rename from charts/ix-chart/2206.0.3/templates/NOTES.txt rename to charts/ix-chart/2207.0.0/templates/NOTES.txt diff --git a/charts/ix-chart/2206.0.3/templates/_containers.tpl b/charts/ix-chart/2207.0.0/templates/_containers.tpl similarity index 100% rename from charts/ix-chart/2206.0.3/templates/_containers.tpl rename to charts/ix-chart/2207.0.0/templates/_containers.tpl diff --git a/charts/ix-chart/2206.0.3/templates/_helpers.tpl b/charts/ix-chart/2207.0.0/templates/_helpers.tpl similarity index 100% rename from charts/ix-chart/2206.0.3/templates/_helpers.tpl rename to charts/ix-chart/2207.0.0/templates/_helpers.tpl diff --git a/charts/ix-chart/2206.0.3/templates/_networking.tpl b/charts/ix-chart/2207.0.0/templates/_networking.tpl similarity index 100% rename from charts/ix-chart/2206.0.3/templates/_networking.tpl rename to charts/ix-chart/2207.0.0/templates/_networking.tpl diff --git a/charts/ix-chart/2206.0.3/templates/_volumes.tpl b/charts/ix-chart/2207.0.0/templates/_volumes.tpl similarity index 88% rename from charts/ix-chart/2206.0.3/templates/_volumes.tpl rename to charts/ix-chart/2207.0.0/templates/_volumes.tpl index 12eb2e1378..6e8aab21d6 100644 --- a/charts/ix-chart/2206.0.3/templates/_volumes.tpl +++ b/charts/ix-chart/2207.0.0/templates/_volumes.tpl @@ -4,17 +4,21 @@ Volumes Configuration {{- define "volumeConfiguration" }} {{- if or .Values.ixVolumes .Values.hostPathVolumes .Values.emptyDirVolumes }} volumes: +{{ $host_p := list }} {{- range $index, $hostPathConfiguration := .Values.hostPathVolumes }} - name: ix-host-path-{{ $.Release.Name }}-{{ $index }} hostPath: path: {{ $hostPathConfiguration.hostPath }} + {{ $host_p = mustAppend $host_p $hostPathConfiguration.hostPath }} {{- end }} {{- range $index, $hostPathConfiguration := .Values.ixVolumes }} {{ $dsName := base $hostPathConfiguration.hostPath }} - name: ix-host-volume-{{ $.Release.Name }}-{{ $dsName }} hostPath: path: {{ $hostPathConfiguration.hostPath }} + {{ $host_p = mustAppend $host_p $hostPathConfiguration.hostPath }} {{- end }} +{{ include "common.storage.hostPathsValidation" $host_p }} {{- range $index, $emptyDirConfiguration := .Values.emptyDirVolumes }} - name: ix-emptydir-volume-{{ $.Release.Name }}-{{ $index }} emptyDir: diff --git a/charts/ix-chart/2206.0.3/templates/_workload.tpl b/charts/ix-chart/2207.0.0/templates/_workload.tpl similarity index 100% rename from charts/ix-chart/2206.0.3/templates/_workload.tpl rename to charts/ix-chart/2207.0.0/templates/_workload.tpl diff --git a/charts/ix-chart/2206.0.3/templates/external-interfaces.yaml b/charts/ix-chart/2207.0.0/templates/external-interfaces.yaml similarity index 100% rename from charts/ix-chart/2206.0.3/templates/external-interfaces.yaml rename to charts/ix-chart/2207.0.0/templates/external-interfaces.yaml diff --git a/charts/ix-chart/2206.0.3/templates/service.yaml b/charts/ix-chart/2207.0.0/templates/service.yaml similarity index 100% rename from charts/ix-chart/2206.0.3/templates/service.yaml rename to charts/ix-chart/2207.0.0/templates/service.yaml diff --git a/charts/ix-chart/2206.0.3/templates/tests/deployment-check.yaml b/charts/ix-chart/2207.0.0/templates/tests/deployment-check.yaml similarity index 100% rename from charts/ix-chart/2206.0.3/templates/tests/deployment-check.yaml rename to charts/ix-chart/2207.0.0/templates/tests/deployment-check.yaml diff --git a/charts/ix-chart/2206.0.3/templates/workload.yaml b/charts/ix-chart/2207.0.0/templates/workload.yaml similarity index 100% rename from charts/ix-chart/2206.0.3/templates/workload.yaml rename to charts/ix-chart/2207.0.0/templates/workload.yaml diff --git a/charts/ix-chart/2206.0.3/test_values.yaml b/charts/ix-chart/2207.0.0/test_values.yaml similarity index 100% rename from charts/ix-chart/2206.0.3/test_values.yaml rename to charts/ix-chart/2207.0.0/test_values.yaml diff --git a/test/ix-chart/2206.0.3/.helmignore b/test/ix-chart/2207.0.0/.helmignore similarity index 100% rename from test/ix-chart/2206.0.3/.helmignore rename to test/ix-chart/2207.0.0/.helmignore diff --git a/test/ix-chart/2206.0.3/Chart.lock b/test/ix-chart/2207.0.0/Chart.lock similarity index 100% rename from test/ix-chart/2206.0.3/Chart.lock rename to test/ix-chart/2207.0.0/Chart.lock diff --git a/test/ix-chart/2206.0.3/Chart.yaml b/test/ix-chart/2207.0.0/Chart.yaml similarity index 98% rename from test/ix-chart/2206.0.3/Chart.yaml rename to test/ix-chart/2207.0.0/Chart.yaml index 956e7497bd..ce6fb5c18f 100644 --- a/test/ix-chart/2206.0.3/Chart.yaml +++ b/test/ix-chart/2207.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: 2206.0.3 +version: 2207.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/2206.0.3/README.md b/test/ix-chart/2207.0.0/README.md similarity index 100% rename from test/ix-chart/2206.0.3/README.md rename to test/ix-chart/2207.0.0/README.md diff --git a/test/ix-chart/2206.0.3/app-readme.md b/test/ix-chart/2207.0.0/app-readme.md similarity index 100% rename from test/ix-chart/2206.0.3/app-readme.md rename to test/ix-chart/2207.0.0/app-readme.md diff --git a/test/ix-chart/2206.0.3/charts/common-2206.0.0.tgz b/test/ix-chart/2207.0.0/charts/common-2206.0.0.tgz similarity index 100% rename from test/ix-chart/2206.0.3/charts/common-2206.0.0.tgz rename to test/ix-chart/2207.0.0/charts/common-2206.0.0.tgz diff --git a/test/ix-chart/2206.0.3/questions.yaml b/test/ix-chart/2207.0.0/questions.yaml similarity index 100% rename from test/ix-chart/2206.0.3/questions.yaml rename to test/ix-chart/2207.0.0/questions.yaml diff --git a/test/ix-chart/2206.0.3/templates/NOTES.txt b/test/ix-chart/2207.0.0/templates/NOTES.txt similarity index 100% rename from test/ix-chart/2206.0.3/templates/NOTES.txt rename to test/ix-chart/2207.0.0/templates/NOTES.txt diff --git a/test/ix-chart/2206.0.3/templates/_containers.tpl b/test/ix-chart/2207.0.0/templates/_containers.tpl similarity index 100% rename from test/ix-chart/2206.0.3/templates/_containers.tpl rename to test/ix-chart/2207.0.0/templates/_containers.tpl diff --git a/test/ix-chart/2206.0.3/templates/_helpers.tpl b/test/ix-chart/2207.0.0/templates/_helpers.tpl similarity index 100% rename from test/ix-chart/2206.0.3/templates/_helpers.tpl rename to test/ix-chart/2207.0.0/templates/_helpers.tpl diff --git a/test/ix-chart/2206.0.3/templates/_networking.tpl b/test/ix-chart/2207.0.0/templates/_networking.tpl similarity index 100% rename from test/ix-chart/2206.0.3/templates/_networking.tpl rename to test/ix-chart/2207.0.0/templates/_networking.tpl diff --git a/test/ix-chart/2206.0.3/templates/_volumes.tpl b/test/ix-chart/2207.0.0/templates/_volumes.tpl similarity index 88% rename from test/ix-chart/2206.0.3/templates/_volumes.tpl rename to test/ix-chart/2207.0.0/templates/_volumes.tpl index 12eb2e1378..6e8aab21d6 100644 --- a/test/ix-chart/2206.0.3/templates/_volumes.tpl +++ b/test/ix-chart/2207.0.0/templates/_volumes.tpl @@ -4,17 +4,21 @@ Volumes Configuration {{- define "volumeConfiguration" }} {{- if or .Values.ixVolumes .Values.hostPathVolumes .Values.emptyDirVolumes }} volumes: +{{ $host_p := list }} {{- range $index, $hostPathConfiguration := .Values.hostPathVolumes }} - name: ix-host-path-{{ $.Release.Name }}-{{ $index }} hostPath: path: {{ $hostPathConfiguration.hostPath }} + {{ $host_p = mustAppend $host_p $hostPathConfiguration.hostPath }} {{- end }} {{- range $index, $hostPathConfiguration := .Values.ixVolumes }} {{ $dsName := base $hostPathConfiguration.hostPath }} - name: ix-host-volume-{{ $.Release.Name }}-{{ $dsName }} hostPath: path: {{ $hostPathConfiguration.hostPath }} + {{ $host_p = mustAppend $host_p $hostPathConfiguration.hostPath }} {{- end }} +{{ include "common.storage.hostPathsValidation" $host_p }} {{- range $index, $emptyDirConfiguration := .Values.emptyDirVolumes }} - name: ix-emptydir-volume-{{ $.Release.Name }}-{{ $index }} emptyDir: diff --git a/test/ix-chart/2206.0.3/templates/_workload.tpl b/test/ix-chart/2207.0.0/templates/_workload.tpl similarity index 100% rename from test/ix-chart/2206.0.3/templates/_workload.tpl rename to test/ix-chart/2207.0.0/templates/_workload.tpl diff --git a/test/ix-chart/2206.0.3/templates/external-interfaces.yaml b/test/ix-chart/2207.0.0/templates/external-interfaces.yaml similarity index 100% rename from test/ix-chart/2206.0.3/templates/external-interfaces.yaml rename to test/ix-chart/2207.0.0/templates/external-interfaces.yaml diff --git a/test/ix-chart/2206.0.3/templates/service.yaml b/test/ix-chart/2207.0.0/templates/service.yaml similarity index 100% rename from test/ix-chart/2206.0.3/templates/service.yaml rename to test/ix-chart/2207.0.0/templates/service.yaml diff --git a/test/ix-chart/2206.0.3/templates/tests/deployment-check.yaml b/test/ix-chart/2207.0.0/templates/tests/deployment-check.yaml similarity index 100% rename from test/ix-chart/2206.0.3/templates/tests/deployment-check.yaml rename to test/ix-chart/2207.0.0/templates/tests/deployment-check.yaml diff --git a/test/ix-chart/2206.0.3/templates/workload.yaml b/test/ix-chart/2207.0.0/templates/workload.yaml similarity index 100% rename from test/ix-chart/2206.0.3/templates/workload.yaml rename to test/ix-chart/2207.0.0/templates/workload.yaml diff --git a/test/ix-chart/2206.0.3/test_values.yaml b/test/ix-chart/2207.0.0/test_values.yaml similarity index 100% rename from test/ix-chart/2206.0.3/test_values.yaml rename to test/ix-chart/2207.0.0/test_values.yaml