From 83c088ab4c0e31cea97fddd331a382fe428804de Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Fri, 7 May 2021 23:16:22 +0500 Subject: [PATCH 1/2] Update ix-chart version --- test/ix-chart/{2102.1.0 => 2105.0.0}/.helmignore | 0 test/ix-chart/{2102.1.0 => 2105.0.0}/Chart.lock | 0 test/ix-chart/{2102.1.0 => 2105.0.0}/Chart.yaml | 2 +- test/ix-chart/{2102.1.0 => 2105.0.0}/README.md | 0 test/ix-chart/{2102.1.0 => 2105.0.0}/app-readme.md | 0 .../charts/common-2104.0.0.tgz | Bin .../{2102.1.0 => 2105.0.0}/default_values.yaml | 0 test/ix-chart/{2102.1.0 => 2105.0.0}/questions.yaml | 0 .../{2102.1.0 => 2105.0.0}/templates/NOTES.txt | 0 .../templates/_containers.tpl | 0 .../{2102.1.0 => 2105.0.0}/templates/_helpers.tpl | 0 .../templates/_networking.tpl | 0 .../{2102.1.0 => 2105.0.0}/templates/_volumes.tpl | 0 .../{2102.1.0 => 2105.0.0}/templates/_workload.tpl | 0 .../templates/external-interfaces.yaml | 0 .../{2102.1.0 => 2105.0.0}/templates/service.yaml | 0 .../templates/tests/deployment-check.yaml | 0 .../{2102.1.0 => 2105.0.0}/templates/workload.yaml | 0 .../{2102.1.0 => 2105.0.0}/test_values.yaml | 0 test/ix-chart/{2102.1.0 => 2105.0.0}/values.yaml | 0 20 files changed, 1 insertion(+), 1 deletion(-) rename test/ix-chart/{2102.1.0 => 2105.0.0}/.helmignore (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/Chart.lock (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/Chart.yaml (98%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/README.md (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/app-readme.md (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/charts/common-2104.0.0.tgz (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/default_values.yaml (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/questions.yaml (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/templates/NOTES.txt (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/templates/_containers.tpl (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/templates/_helpers.tpl (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/templates/_networking.tpl (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/templates/_volumes.tpl (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/templates/_workload.tpl (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/templates/external-interfaces.yaml (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/templates/service.yaml (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/templates/tests/deployment-check.yaml (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/templates/workload.yaml (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/test_values.yaml (100%) rename test/ix-chart/{2102.1.0 => 2105.0.0}/values.yaml (100%) diff --git a/test/ix-chart/2102.1.0/.helmignore b/test/ix-chart/2105.0.0/.helmignore similarity index 100% rename from test/ix-chart/2102.1.0/.helmignore rename to test/ix-chart/2105.0.0/.helmignore diff --git a/test/ix-chart/2102.1.0/Chart.lock b/test/ix-chart/2105.0.0/Chart.lock similarity index 100% rename from test/ix-chart/2102.1.0/Chart.lock rename to test/ix-chart/2105.0.0/Chart.lock diff --git a/test/ix-chart/2102.1.0/Chart.yaml b/test/ix-chart/2105.0.0/Chart.yaml similarity index 98% rename from test/ix-chart/2102.1.0/Chart.yaml rename to test/ix-chart/2105.0.0/Chart.yaml index f252d1d1a4..d5979788eb 100644 --- a/test/ix-chart/2102.1.0/Chart.yaml +++ b/test/ix-chart/2105.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: 2102.1.0 +version: 2105.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/2102.1.0/README.md b/test/ix-chart/2105.0.0/README.md similarity index 100% rename from test/ix-chart/2102.1.0/README.md rename to test/ix-chart/2105.0.0/README.md diff --git a/test/ix-chart/2102.1.0/app-readme.md b/test/ix-chart/2105.0.0/app-readme.md similarity index 100% rename from test/ix-chart/2102.1.0/app-readme.md rename to test/ix-chart/2105.0.0/app-readme.md diff --git a/test/ix-chart/2102.1.0/charts/common-2104.0.0.tgz b/test/ix-chart/2105.0.0/charts/common-2104.0.0.tgz similarity index 100% rename from test/ix-chart/2102.1.0/charts/common-2104.0.0.tgz rename to test/ix-chart/2105.0.0/charts/common-2104.0.0.tgz diff --git a/test/ix-chart/2102.1.0/default_values.yaml b/test/ix-chart/2105.0.0/default_values.yaml similarity index 100% rename from test/ix-chart/2102.1.0/default_values.yaml rename to test/ix-chart/2105.0.0/default_values.yaml diff --git a/test/ix-chart/2102.1.0/questions.yaml b/test/ix-chart/2105.0.0/questions.yaml similarity index 100% rename from test/ix-chart/2102.1.0/questions.yaml rename to test/ix-chart/2105.0.0/questions.yaml diff --git a/test/ix-chart/2102.1.0/templates/NOTES.txt b/test/ix-chart/2105.0.0/templates/NOTES.txt similarity index 100% rename from test/ix-chart/2102.1.0/templates/NOTES.txt rename to test/ix-chart/2105.0.0/templates/NOTES.txt diff --git a/test/ix-chart/2102.1.0/templates/_containers.tpl b/test/ix-chart/2105.0.0/templates/_containers.tpl similarity index 100% rename from test/ix-chart/2102.1.0/templates/_containers.tpl rename to test/ix-chart/2105.0.0/templates/_containers.tpl diff --git a/test/ix-chart/2102.1.0/templates/_helpers.tpl b/test/ix-chart/2105.0.0/templates/_helpers.tpl similarity index 100% rename from test/ix-chart/2102.1.0/templates/_helpers.tpl rename to test/ix-chart/2105.0.0/templates/_helpers.tpl diff --git a/test/ix-chart/2102.1.0/templates/_networking.tpl b/test/ix-chart/2105.0.0/templates/_networking.tpl similarity index 100% rename from test/ix-chart/2102.1.0/templates/_networking.tpl rename to test/ix-chart/2105.0.0/templates/_networking.tpl diff --git a/test/ix-chart/2102.1.0/templates/_volumes.tpl b/test/ix-chart/2105.0.0/templates/_volumes.tpl similarity index 100% rename from test/ix-chart/2102.1.0/templates/_volumes.tpl rename to test/ix-chart/2105.0.0/templates/_volumes.tpl diff --git a/test/ix-chart/2102.1.0/templates/_workload.tpl b/test/ix-chart/2105.0.0/templates/_workload.tpl similarity index 100% rename from test/ix-chart/2102.1.0/templates/_workload.tpl rename to test/ix-chart/2105.0.0/templates/_workload.tpl diff --git a/test/ix-chart/2102.1.0/templates/external-interfaces.yaml b/test/ix-chart/2105.0.0/templates/external-interfaces.yaml similarity index 100% rename from test/ix-chart/2102.1.0/templates/external-interfaces.yaml rename to test/ix-chart/2105.0.0/templates/external-interfaces.yaml diff --git a/test/ix-chart/2102.1.0/templates/service.yaml b/test/ix-chart/2105.0.0/templates/service.yaml similarity index 100% rename from test/ix-chart/2102.1.0/templates/service.yaml rename to test/ix-chart/2105.0.0/templates/service.yaml diff --git a/test/ix-chart/2102.1.0/templates/tests/deployment-check.yaml b/test/ix-chart/2105.0.0/templates/tests/deployment-check.yaml similarity index 100% rename from test/ix-chart/2102.1.0/templates/tests/deployment-check.yaml rename to test/ix-chart/2105.0.0/templates/tests/deployment-check.yaml diff --git a/test/ix-chart/2102.1.0/templates/workload.yaml b/test/ix-chart/2105.0.0/templates/workload.yaml similarity index 100% rename from test/ix-chart/2102.1.0/templates/workload.yaml rename to test/ix-chart/2105.0.0/templates/workload.yaml diff --git a/test/ix-chart/2102.1.0/test_values.yaml b/test/ix-chart/2105.0.0/test_values.yaml similarity index 100% rename from test/ix-chart/2102.1.0/test_values.yaml rename to test/ix-chart/2105.0.0/test_values.yaml diff --git a/test/ix-chart/2102.1.0/values.yaml b/test/ix-chart/2105.0.0/values.yaml similarity index 100% rename from test/ix-chart/2102.1.0/values.yaml rename to test/ix-chart/2105.0.0/values.yaml From 76b77b7583a8324d66827e136d16043d0c8d9bdb Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Fri, 7 May 2021 23:27:38 +0500 Subject: [PATCH 2/2] Hide advanced configuration options from ix-chart --- test/ix-chart/2105.0.0/questions.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/test/ix-chart/2105.0.0/questions.yaml b/test/ix-chart/2105.0.0/questions.yaml index 93027242a9..d2e34c3a9d 100644 --- a/test/ix-chart/2105.0.0/questions.yaml +++ b/test/ix-chart/2105.0.0/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Set the environment that will be visible to the container" - name: "Networking" description: "Configure networking for container" + - name: "Port Forwarding" + description: "Configure ports to forward to workload" - name: "Storage" description: "Persist and share data that is separate from the lifecycle of the container" - name: "Health Check" @@ -28,6 +30,7 @@ questions: group: "Workload Details" schema: type: string + hidden: true default: "Deployment" required: true enum: @@ -43,6 +46,7 @@ questions: label: "Cron Schedule" group: "Workload Details" schema: + hidden: true type: cron show_if: [["workloadType", "=", "CronJob"]] default: @@ -104,6 +108,7 @@ questions: label: "Restart Policy" group: "Restart Policy" schema: + hidden: true type: string default: "OnFailure" show_if: [["workloadType", "!=", "Deployment"]] @@ -252,7 +257,7 @@ questions: - value: "Default" description: "Use Default DNS Policy" - value: "None" - description: "Ignore DNS settings from the Kuberentes cluster" + description: "Ignore DNS settings from the Kubernetes cluster" - variable: dnsConfig label: "DNS Configuration" group: "Networking" @@ -295,6 +300,7 @@ questions: schema: show_if: [["updateStrategy", "=", "Recreate"]] type: list + hidden: true items: - variable: hostPortConfiguration label: "Host Port Configuration" @@ -314,7 +320,7 @@ questions: - variable: portForwardingList label: "Specify Node ports to forward to workload" - group: "Networking" + group: "Port Forwarding" description: "Specify ports of node and workload to forward traffic from node port to workload port" schema: type: list @@ -410,6 +416,7 @@ questions: description: "Configure Liveness Probe" group: "Health Check" schema: + hidden: true type: dict default: null "null": true