From f8a249c2d419a4efedfce8377d05718cf91d012f Mon Sep 17 00:00:00 2001 From: "M. Rehan" Date: Thu, 11 Aug 2022 16:56:52 +0500 Subject: [PATCH] Add run As user in ix chart --- .../{2207.2.0 => 2208.0.0}/.helmignore | 0 .../{2207.2.0 => 2208.0.0}/Chart.lock | 0 .../{2207.2.0 => 2208.0.0}/Chart.yaml | 2 +- .../ix-chart/{2207.2.0 => 2208.0.0}/README.md | 0 .../{2207.2.0 => 2208.0.0}/app-readme.md | 0 .../charts/common-2207.0.0.tgz | Bin .../ix-chart/2208.0.0}/questions.yaml | 21 ++++++++++++++++++ .../templates/NOTES.txt | 0 .../templates/_containers.tpl | 0 .../templates/_helpers.tpl | 0 .../templates/_networking.tpl | 0 .../templates/_volumes.tpl | 0 .../2208.0.0}/templates/_workload.tpl | 4 ++++ .../templates/external-interfaces.yaml | 0 .../templates/service.yaml | 0 .../templates/tests/deployment-check.yaml | 0 .../templates/workload.yaml | 0 .../{2207.2.0 => 2208.0.0}/test_values.yaml | 0 .../{2207.2.0 => 2208.0.0}/.helmignore | 0 .../{2207.2.0 => 2208.0.0}/Chart.lock | 0 .../{2207.2.0 => 2208.0.0}/Chart.yaml | 2 +- .../ix-chart/{2207.2.0 => 2208.0.0}/README.md | 0 .../{2207.2.0 => 2208.0.0}/app-readme.md | 0 .../charts/common-2207.0.0.tgz | Bin .../ix-chart/2208.0.0}/questions.yaml | 21 ++++++++++++++++++ .../templates/NOTES.txt | 0 .../templates/_containers.tpl | 0 .../templates/_helpers.tpl | 0 .../templates/_networking.tpl | 0 .../templates/_volumes.tpl | 0 .../2208.0.0}/templates/_workload.tpl | 4 ++++ .../templates/external-interfaces.yaml | 0 .../templates/service.yaml | 0 .../templates/tests/deployment-check.yaml | 0 .../templates/workload.yaml | 0 .../{2207.2.0 => 2208.0.0}/test_values.yaml | 0 36 files changed, 52 insertions(+), 2 deletions(-) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/.helmignore (100%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/Chart.lock (100%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/Chart.yaml (98%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/README.md (100%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/app-readme.md (100%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/charts/common-2207.0.0.tgz (100%) rename {test/ix-chart/2207.2.0 => charts/ix-chart/2208.0.0}/questions.yaml (96%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/templates/NOTES.txt (100%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/templates/_containers.tpl (100%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/templates/_helpers.tpl (100%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/templates/_networking.tpl (100%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/templates/_volumes.tpl (100%) rename {test/ix-chart/2207.2.0 => charts/ix-chart/2208.0.0}/templates/_workload.tpl (95%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/templates/external-interfaces.yaml (100%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/templates/service.yaml (100%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/templates/tests/deployment-check.yaml (100%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/templates/workload.yaml (100%) rename charts/ix-chart/{2207.2.0 => 2208.0.0}/test_values.yaml (100%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/.helmignore (100%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/Chart.lock (100%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/Chart.yaml (98%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/README.md (100%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/app-readme.md (100%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/charts/common-2207.0.0.tgz (100%) rename {charts/ix-chart/2207.2.0 => test/ix-chart/2208.0.0}/questions.yaml (96%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/templates/NOTES.txt (100%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/templates/_containers.tpl (100%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/templates/_helpers.tpl (100%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/templates/_networking.tpl (100%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/templates/_volumes.tpl (100%) rename {charts/ix-chart/2207.2.0 => test/ix-chart/2208.0.0}/templates/_workload.tpl (95%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/templates/external-interfaces.yaml (100%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/templates/service.yaml (100%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/templates/tests/deployment-check.yaml (100%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/templates/workload.yaml (100%) rename test/ix-chart/{2207.2.0 => 2208.0.0}/test_values.yaml (100%) diff --git a/charts/ix-chart/2207.2.0/.helmignore b/charts/ix-chart/2208.0.0/.helmignore similarity index 100% rename from charts/ix-chart/2207.2.0/.helmignore rename to charts/ix-chart/2208.0.0/.helmignore diff --git a/charts/ix-chart/2207.2.0/Chart.lock b/charts/ix-chart/2208.0.0/Chart.lock similarity index 100% rename from charts/ix-chart/2207.2.0/Chart.lock rename to charts/ix-chart/2208.0.0/Chart.lock diff --git a/charts/ix-chart/2207.2.0/Chart.yaml b/charts/ix-chart/2208.0.0/Chart.yaml similarity index 98% rename from charts/ix-chart/2207.2.0/Chart.yaml rename to charts/ix-chart/2208.0.0/Chart.yaml index 55ac2c186e..deed6e6e49 100644 --- a/charts/ix-chart/2207.2.0/Chart.yaml +++ b/charts/ix-chart/2208.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: 2207.2.0 +version: 2208.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/2207.2.0/README.md b/charts/ix-chart/2208.0.0/README.md similarity index 100% rename from charts/ix-chart/2207.2.0/README.md rename to charts/ix-chart/2208.0.0/README.md diff --git a/charts/ix-chart/2207.2.0/app-readme.md b/charts/ix-chart/2208.0.0/app-readme.md similarity index 100% rename from charts/ix-chart/2207.2.0/app-readme.md rename to charts/ix-chart/2208.0.0/app-readme.md diff --git a/charts/ix-chart/2207.2.0/charts/common-2207.0.0.tgz b/charts/ix-chart/2208.0.0/charts/common-2207.0.0.tgz similarity index 100% rename from charts/ix-chart/2207.2.0/charts/common-2207.0.0.tgz rename to charts/ix-chart/2208.0.0/charts/common-2207.0.0.tgz diff --git a/test/ix-chart/2207.2.0/questions.yaml b/charts/ix-chart/2208.0.0/questions.yaml similarity index 96% rename from test/ix-chart/2207.2.0/questions.yaml rename to charts/ix-chart/2208.0.0/questions.yaml index 823ae9c2f2..d341f529ee 100644 --- a/test/ix-chart/2207.2.0/questions.yaml +++ b/charts/ix-chart/2208.0.0/questions.yaml @@ -600,6 +600,27 @@ questions: label: "Add Capability" schema: type: string + - variable: enableRunAsUser + label: "Configure Container User and Group ID" + description: "Configure security context runAsUser and runAsGroup variables" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: runAsUser + label: "Run Container As User" + description: "Configure user id for container." + schema: + type: int + default: 568 + - variable: runAsGroup + label: "Run Container As Group" + description: "Configure group id for container." + schema: + type: int + default: 568 + - variable: enableResourceLimits label: "Enable Pod resource limits" diff --git a/charts/ix-chart/2207.2.0/templates/NOTES.txt b/charts/ix-chart/2208.0.0/templates/NOTES.txt similarity index 100% rename from charts/ix-chart/2207.2.0/templates/NOTES.txt rename to charts/ix-chart/2208.0.0/templates/NOTES.txt diff --git a/charts/ix-chart/2207.2.0/templates/_containers.tpl b/charts/ix-chart/2208.0.0/templates/_containers.tpl similarity index 100% rename from charts/ix-chart/2207.2.0/templates/_containers.tpl rename to charts/ix-chart/2208.0.0/templates/_containers.tpl diff --git a/charts/ix-chart/2207.2.0/templates/_helpers.tpl b/charts/ix-chart/2208.0.0/templates/_helpers.tpl similarity index 100% rename from charts/ix-chart/2207.2.0/templates/_helpers.tpl rename to charts/ix-chart/2208.0.0/templates/_helpers.tpl diff --git a/charts/ix-chart/2207.2.0/templates/_networking.tpl b/charts/ix-chart/2208.0.0/templates/_networking.tpl similarity index 100% rename from charts/ix-chart/2207.2.0/templates/_networking.tpl rename to charts/ix-chart/2208.0.0/templates/_networking.tpl diff --git a/charts/ix-chart/2207.2.0/templates/_volumes.tpl b/charts/ix-chart/2208.0.0/templates/_volumes.tpl similarity index 100% rename from charts/ix-chart/2207.2.0/templates/_volumes.tpl rename to charts/ix-chart/2208.0.0/templates/_volumes.tpl diff --git a/test/ix-chart/2207.2.0/templates/_workload.tpl b/charts/ix-chart/2208.0.0/templates/_workload.tpl similarity index 95% rename from test/ix-chart/2207.2.0/templates/_workload.tpl rename to charts/ix-chart/2208.0.0/templates/_workload.tpl index dc41b08957..a561b81159 100644 --- a/test/ix-chart/2207.2.0/templates/_workload.tpl +++ b/charts/ix-chart/2208.0.0/templates/_workload.tpl @@ -60,6 +60,10 @@ containers: stdin: {{ .Values.stdin }} securityContext: privileged: {{ .Values.securityContext.privileged }} + {{ if .Values.securityContext.enableRunAsUser }} + runAsUser: {{ .Values.securityContext.runAsUser }} + runAsGroup: {{ .Values.securityContext.runAsGroup }} + {{ end }} {{ if .Values.securityContext.capabilities }} capabilities: add: {{ toYaml .Values.securityContext.capabilities | nindent 8 }} diff --git a/charts/ix-chart/2207.2.0/templates/external-interfaces.yaml b/charts/ix-chart/2208.0.0/templates/external-interfaces.yaml similarity index 100% rename from charts/ix-chart/2207.2.0/templates/external-interfaces.yaml rename to charts/ix-chart/2208.0.0/templates/external-interfaces.yaml diff --git a/charts/ix-chart/2207.2.0/templates/service.yaml b/charts/ix-chart/2208.0.0/templates/service.yaml similarity index 100% rename from charts/ix-chart/2207.2.0/templates/service.yaml rename to charts/ix-chart/2208.0.0/templates/service.yaml diff --git a/charts/ix-chart/2207.2.0/templates/tests/deployment-check.yaml b/charts/ix-chart/2208.0.0/templates/tests/deployment-check.yaml similarity index 100% rename from charts/ix-chart/2207.2.0/templates/tests/deployment-check.yaml rename to charts/ix-chart/2208.0.0/templates/tests/deployment-check.yaml diff --git a/charts/ix-chart/2207.2.0/templates/workload.yaml b/charts/ix-chart/2208.0.0/templates/workload.yaml similarity index 100% rename from charts/ix-chart/2207.2.0/templates/workload.yaml rename to charts/ix-chart/2208.0.0/templates/workload.yaml diff --git a/charts/ix-chart/2207.2.0/test_values.yaml b/charts/ix-chart/2208.0.0/test_values.yaml similarity index 100% rename from charts/ix-chart/2207.2.0/test_values.yaml rename to charts/ix-chart/2208.0.0/test_values.yaml diff --git a/test/ix-chart/2207.2.0/.helmignore b/test/ix-chart/2208.0.0/.helmignore similarity index 100% rename from test/ix-chart/2207.2.0/.helmignore rename to test/ix-chart/2208.0.0/.helmignore diff --git a/test/ix-chart/2207.2.0/Chart.lock b/test/ix-chart/2208.0.0/Chart.lock similarity index 100% rename from test/ix-chart/2207.2.0/Chart.lock rename to test/ix-chart/2208.0.0/Chart.lock diff --git a/test/ix-chart/2207.2.0/Chart.yaml b/test/ix-chart/2208.0.0/Chart.yaml similarity index 98% rename from test/ix-chart/2207.2.0/Chart.yaml rename to test/ix-chart/2208.0.0/Chart.yaml index 55ac2c186e..deed6e6e49 100644 --- a/test/ix-chart/2207.2.0/Chart.yaml +++ b/test/ix-chart/2208.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: 2207.2.0 +version: 2208.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/2207.2.0/README.md b/test/ix-chart/2208.0.0/README.md similarity index 100% rename from test/ix-chart/2207.2.0/README.md rename to test/ix-chart/2208.0.0/README.md diff --git a/test/ix-chart/2207.2.0/app-readme.md b/test/ix-chart/2208.0.0/app-readme.md similarity index 100% rename from test/ix-chart/2207.2.0/app-readme.md rename to test/ix-chart/2208.0.0/app-readme.md diff --git a/test/ix-chart/2207.2.0/charts/common-2207.0.0.tgz b/test/ix-chart/2208.0.0/charts/common-2207.0.0.tgz similarity index 100% rename from test/ix-chart/2207.2.0/charts/common-2207.0.0.tgz rename to test/ix-chart/2208.0.0/charts/common-2207.0.0.tgz diff --git a/charts/ix-chart/2207.2.0/questions.yaml b/test/ix-chart/2208.0.0/questions.yaml similarity index 96% rename from charts/ix-chart/2207.2.0/questions.yaml rename to test/ix-chart/2208.0.0/questions.yaml index 823ae9c2f2..d341f529ee 100644 --- a/charts/ix-chart/2207.2.0/questions.yaml +++ b/test/ix-chart/2208.0.0/questions.yaml @@ -600,6 +600,27 @@ questions: label: "Add Capability" schema: type: string + - variable: enableRunAsUser + label: "Configure Container User and Group ID" + description: "Configure security context runAsUser and runAsGroup variables" + schema: + type: boolean + default: false + show_subquestions_if: true + subquestions: + - variable: runAsUser + label: "Run Container As User" + description: "Configure user id for container." + schema: + type: int + default: 568 + - variable: runAsGroup + label: "Run Container As Group" + description: "Configure group id for container." + schema: + type: int + default: 568 + - variable: enableResourceLimits label: "Enable Pod resource limits" diff --git a/test/ix-chart/2207.2.0/templates/NOTES.txt b/test/ix-chart/2208.0.0/templates/NOTES.txt similarity index 100% rename from test/ix-chart/2207.2.0/templates/NOTES.txt rename to test/ix-chart/2208.0.0/templates/NOTES.txt diff --git a/test/ix-chart/2207.2.0/templates/_containers.tpl b/test/ix-chart/2208.0.0/templates/_containers.tpl similarity index 100% rename from test/ix-chart/2207.2.0/templates/_containers.tpl rename to test/ix-chart/2208.0.0/templates/_containers.tpl diff --git a/test/ix-chart/2207.2.0/templates/_helpers.tpl b/test/ix-chart/2208.0.0/templates/_helpers.tpl similarity index 100% rename from test/ix-chart/2207.2.0/templates/_helpers.tpl rename to test/ix-chart/2208.0.0/templates/_helpers.tpl diff --git a/test/ix-chart/2207.2.0/templates/_networking.tpl b/test/ix-chart/2208.0.0/templates/_networking.tpl similarity index 100% rename from test/ix-chart/2207.2.0/templates/_networking.tpl rename to test/ix-chart/2208.0.0/templates/_networking.tpl diff --git a/test/ix-chart/2207.2.0/templates/_volumes.tpl b/test/ix-chart/2208.0.0/templates/_volumes.tpl similarity index 100% rename from test/ix-chart/2207.2.0/templates/_volumes.tpl rename to test/ix-chart/2208.0.0/templates/_volumes.tpl diff --git a/charts/ix-chart/2207.2.0/templates/_workload.tpl b/test/ix-chart/2208.0.0/templates/_workload.tpl similarity index 95% rename from charts/ix-chart/2207.2.0/templates/_workload.tpl rename to test/ix-chart/2208.0.0/templates/_workload.tpl index dc41b08957..a561b81159 100644 --- a/charts/ix-chart/2207.2.0/templates/_workload.tpl +++ b/test/ix-chart/2208.0.0/templates/_workload.tpl @@ -60,6 +60,10 @@ containers: stdin: {{ .Values.stdin }} securityContext: privileged: {{ .Values.securityContext.privileged }} + {{ if .Values.securityContext.enableRunAsUser }} + runAsUser: {{ .Values.securityContext.runAsUser }} + runAsGroup: {{ .Values.securityContext.runAsGroup }} + {{ end }} {{ if .Values.securityContext.capabilities }} capabilities: add: {{ toYaml .Values.securityContext.capabilities | nindent 8 }} diff --git a/test/ix-chart/2207.2.0/templates/external-interfaces.yaml b/test/ix-chart/2208.0.0/templates/external-interfaces.yaml similarity index 100% rename from test/ix-chart/2207.2.0/templates/external-interfaces.yaml rename to test/ix-chart/2208.0.0/templates/external-interfaces.yaml diff --git a/test/ix-chart/2207.2.0/templates/service.yaml b/test/ix-chart/2208.0.0/templates/service.yaml similarity index 100% rename from test/ix-chart/2207.2.0/templates/service.yaml rename to test/ix-chart/2208.0.0/templates/service.yaml diff --git a/test/ix-chart/2207.2.0/templates/tests/deployment-check.yaml b/test/ix-chart/2208.0.0/templates/tests/deployment-check.yaml similarity index 100% rename from test/ix-chart/2207.2.0/templates/tests/deployment-check.yaml rename to test/ix-chart/2208.0.0/templates/tests/deployment-check.yaml diff --git a/test/ix-chart/2207.2.0/templates/workload.yaml b/test/ix-chart/2208.0.0/templates/workload.yaml similarity index 100% rename from test/ix-chart/2207.2.0/templates/workload.yaml rename to test/ix-chart/2208.0.0/templates/workload.yaml diff --git a/test/ix-chart/2207.2.0/test_values.yaml b/test/ix-chart/2208.0.0/test_values.yaml similarity index 100% rename from test/ix-chart/2207.2.0/test_values.yaml rename to test/ix-chart/2208.0.0/test_values.yaml