From f32c63be2aba0594522d6bd1125e96c51a56ac75 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Tue, 14 Sep 2021 04:00:15 +0000 Subject: [PATCH] Upgraded catalog item(s) This commit upgrades machinaris catalog item(s). --- .../machinaris/{1.0.5 => 1.0.7}/.helmignore | 0 charts/machinaris/{1.0.5 => 1.0.7}/Chart.yaml | 4 ++-- charts/machinaris/{1.0.5 => 1.0.7}/README.md | 0 .../machinaris/{1.0.5 => 1.0.7}/app-readme.md | 0 .../charts/common-2105.0.0.tgz | Bin .../machinaris/1.0.7}/ix_values.yaml | 2 +- .../machinaris/1.0.7}/questions.yaml | 0 .../{1.0.5 => 1.0.7}/requirements.lock | 0 .../1.0.7}/templates/deployment.yaml | 0 .../{1.0.5 => 1.0.7}/templates/service.yaml | 0 .../machinaris/1.0.7}/test_values.yaml | 2 +- test/machinaris/{1.0.6 => 1.0.7}/.helmignore | 0 test/machinaris/{1.0.6 => 1.0.7}/Chart.yaml | 4 ++-- test/machinaris/{1.0.6 => 1.0.7}/README.md | 0 .../machinaris/{1.0.6 => 1.0.7}/app-readme.md | 0 .../charts/common-2105.0.0.tgz | Bin .../machinaris/1.0.7}/ix_values.yaml | 2 +- .../machinaris/1.0.7}/questions.yaml | 21 ++++++++++++++++++ .../{1.0.6 => 1.0.7}/requirements.lock | 0 .../1.0.7}/templates/deployment.yaml | 6 +++++ .../{1.0.6 => 1.0.7}/templates/service.yaml | 0 .../machinaris/1.0.7}/test_values.yaml | 2 +- 22 files changed, 35 insertions(+), 8 deletions(-) rename charts/machinaris/{1.0.5 => 1.0.7}/.helmignore (100%) rename charts/machinaris/{1.0.5 => 1.0.7}/Chart.yaml (92%) rename charts/machinaris/{1.0.5 => 1.0.7}/README.md (100%) rename charts/machinaris/{1.0.5 => 1.0.7}/app-readme.md (100%) rename charts/machinaris/{1.0.5 => 1.0.7}/charts/common-2105.0.0.tgz (100%) rename {test/machinaris/1.0.6 => charts/machinaris/1.0.7}/ix_values.yaml (87%) rename {test/machinaris/1.0.6 => charts/machinaris/1.0.7}/questions.yaml (100%) rename charts/machinaris/{1.0.5 => 1.0.7}/requirements.lock (100%) rename {test/machinaris/1.0.6 => charts/machinaris/1.0.7}/templates/deployment.yaml (100%) rename charts/machinaris/{1.0.5 => 1.0.7}/templates/service.yaml (100%) rename {test/machinaris/1.0.6 => charts/machinaris/1.0.7}/test_values.yaml (95%) rename test/machinaris/{1.0.6 => 1.0.7}/.helmignore (100%) rename test/machinaris/{1.0.6 => 1.0.7}/Chart.yaml (92%) rename test/machinaris/{1.0.6 => 1.0.7}/README.md (100%) rename test/machinaris/{1.0.6 => 1.0.7}/app-readme.md (100%) rename test/machinaris/{1.0.6 => 1.0.7}/charts/common-2105.0.0.tgz (100%) rename {charts/machinaris/1.0.5 => test/machinaris/1.0.7}/ix_values.yaml (87%) rename {charts/machinaris/1.0.5 => test/machinaris/1.0.7}/questions.yaml (88%) rename test/machinaris/{1.0.6 => 1.0.7}/requirements.lock (100%) rename {charts/machinaris/1.0.5 => test/machinaris/1.0.7}/templates/deployment.yaml (91%) rename test/machinaris/{1.0.6 => 1.0.7}/templates/service.yaml (100%) rename {charts/machinaris/1.0.5 => test/machinaris/1.0.7}/test_values.yaml (95%) diff --git a/charts/machinaris/1.0.5/.helmignore b/charts/machinaris/1.0.7/.helmignore similarity index 100% rename from charts/machinaris/1.0.5/.helmignore rename to charts/machinaris/1.0.7/.helmignore diff --git a/charts/machinaris/1.0.5/Chart.yaml b/charts/machinaris/1.0.7/Chart.yaml similarity index 92% rename from charts/machinaris/1.0.5/Chart.yaml rename to charts/machinaris/1.0.7/Chart.yaml index 16fb0e636c..384c99387e 100644 --- a/charts/machinaris/1.0.5/Chart.yaml +++ b/charts/machinaris/1.0.7/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: v0.5.4 +appVersion: v0.5.5 dependencies: - name: common repository: file://../../../library/common/2105.0.0 @@ -14,4 +14,4 @@ keywords: name: machinaris sources: - https://github.com/guydavis/machinaris -version: 1.0.5 +version: 1.0.7 diff --git a/charts/machinaris/1.0.5/README.md b/charts/machinaris/1.0.7/README.md similarity index 100% rename from charts/machinaris/1.0.5/README.md rename to charts/machinaris/1.0.7/README.md diff --git a/charts/machinaris/1.0.5/app-readme.md b/charts/machinaris/1.0.7/app-readme.md similarity index 100% rename from charts/machinaris/1.0.5/app-readme.md rename to charts/machinaris/1.0.7/app-readme.md diff --git a/charts/machinaris/1.0.5/charts/common-2105.0.0.tgz b/charts/machinaris/1.0.7/charts/common-2105.0.0.tgz similarity index 100% rename from charts/machinaris/1.0.5/charts/common-2105.0.0.tgz rename to charts/machinaris/1.0.7/charts/common-2105.0.0.tgz diff --git a/test/machinaris/1.0.6/ix_values.yaml b/charts/machinaris/1.0.7/ix_values.yaml similarity index 87% rename from test/machinaris/1.0.6/ix_values.yaml rename to charts/machinaris/1.0.7/ix_values.yaml index 75de6534ae..9ebeb6933b 100644 --- a/test/machinaris/1.0.6/ix_values.yaml +++ b/charts/machinaris/1.0.7/ix_values.yaml @@ -1,5 +1,5 @@ image: pullPolicy: IfNotPresent repository: ghcr.io/guydavis/machinaris - tag: v0.5.4 + tag: v0.5.5 updateStrategy: Recreate diff --git a/test/machinaris/1.0.6/questions.yaml b/charts/machinaris/1.0.7/questions.yaml similarity index 100% rename from test/machinaris/1.0.6/questions.yaml rename to charts/machinaris/1.0.7/questions.yaml diff --git a/charts/machinaris/1.0.5/requirements.lock b/charts/machinaris/1.0.7/requirements.lock similarity index 100% rename from charts/machinaris/1.0.5/requirements.lock rename to charts/machinaris/1.0.7/requirements.lock diff --git a/test/machinaris/1.0.6/templates/deployment.yaml b/charts/machinaris/1.0.7/templates/deployment.yaml similarity index 100% rename from test/machinaris/1.0.6/templates/deployment.yaml rename to charts/machinaris/1.0.7/templates/deployment.yaml diff --git a/charts/machinaris/1.0.5/templates/service.yaml b/charts/machinaris/1.0.7/templates/service.yaml similarity index 100% rename from charts/machinaris/1.0.5/templates/service.yaml rename to charts/machinaris/1.0.7/templates/service.yaml diff --git a/test/machinaris/1.0.6/test_values.yaml b/charts/machinaris/1.0.7/test_values.yaml similarity index 95% rename from test/machinaris/1.0.6/test_values.yaml rename to charts/machinaris/1.0.7/test_values.yaml index fb483fc6a2..6d72cfef11 100644 --- a/test/machinaris/1.0.6/test_values.yaml +++ b/charts/machinaris/1.0.7/test_values.yaml @@ -8,7 +8,7 @@ appVolumeMounts: image: pullPolicy: IfNotPresent repository: ghcr.io/guydavis/machinaris - tag: v0.5.4 + tag: v0.5.5 machinaris_ui_port: 31003 timezone: America/Edmonton updateStrategy: Recreate diff --git a/test/machinaris/1.0.6/.helmignore b/test/machinaris/1.0.7/.helmignore similarity index 100% rename from test/machinaris/1.0.6/.helmignore rename to test/machinaris/1.0.7/.helmignore diff --git a/test/machinaris/1.0.6/Chart.yaml b/test/machinaris/1.0.7/Chart.yaml similarity index 92% rename from test/machinaris/1.0.6/Chart.yaml rename to test/machinaris/1.0.7/Chart.yaml index 871a3e824b..384c99387e 100644 --- a/test/machinaris/1.0.6/Chart.yaml +++ b/test/machinaris/1.0.7/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: v0.5.4 +appVersion: v0.5.5 dependencies: - name: common repository: file://../../../library/common/2105.0.0 @@ -14,4 +14,4 @@ keywords: name: machinaris sources: - https://github.com/guydavis/machinaris -version: 1.0.6 +version: 1.0.7 diff --git a/test/machinaris/1.0.6/README.md b/test/machinaris/1.0.7/README.md similarity index 100% rename from test/machinaris/1.0.6/README.md rename to test/machinaris/1.0.7/README.md diff --git a/test/machinaris/1.0.6/app-readme.md b/test/machinaris/1.0.7/app-readme.md similarity index 100% rename from test/machinaris/1.0.6/app-readme.md rename to test/machinaris/1.0.7/app-readme.md diff --git a/test/machinaris/1.0.6/charts/common-2105.0.0.tgz b/test/machinaris/1.0.7/charts/common-2105.0.0.tgz similarity index 100% rename from test/machinaris/1.0.6/charts/common-2105.0.0.tgz rename to test/machinaris/1.0.7/charts/common-2105.0.0.tgz diff --git a/charts/machinaris/1.0.5/ix_values.yaml b/test/machinaris/1.0.7/ix_values.yaml similarity index 87% rename from charts/machinaris/1.0.5/ix_values.yaml rename to test/machinaris/1.0.7/ix_values.yaml index 75de6534ae..9ebeb6933b 100644 --- a/charts/machinaris/1.0.5/ix_values.yaml +++ b/test/machinaris/1.0.7/ix_values.yaml @@ -1,5 +1,5 @@ image: pullPolicy: IfNotPresent repository: ghcr.io/guydavis/machinaris - tag: v0.5.4 + tag: v0.5.5 updateStrategy: Recreate diff --git a/charts/machinaris/1.0.5/questions.yaml b/test/machinaris/1.0.7/questions.yaml similarity index 88% rename from charts/machinaris/1.0.5/questions.yaml rename to test/machinaris/1.0.7/questions.yaml index f186d981ff..96b652d13a 100644 --- a/charts/machinaris/1.0.5/questions.yaml +++ b/test/machinaris/1.0.7/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Configure Storage for Machinaris" - name: "Machinaris Environment Variables" description: "Set the environment that will be visible to the container" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -157,3 +159,22 @@ questions: label: "Value" schema: type: string + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + - variable: cpuLimit + label: "CPU limit" + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + - variable: memLimit + label: "Memory limit" + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" diff --git a/test/machinaris/1.0.6/requirements.lock b/test/machinaris/1.0.7/requirements.lock similarity index 100% rename from test/machinaris/1.0.6/requirements.lock rename to test/machinaris/1.0.7/requirements.lock diff --git a/charts/machinaris/1.0.5/templates/deployment.yaml b/test/machinaris/1.0.7/templates/deployment.yaml similarity index 91% rename from charts/machinaris/1.0.5/templates/deployment.yaml rename to test/machinaris/1.0.7/templates/deployment.yaml index 2ae586e7d7..7fa3f48ce1 100644 --- a/charts/machinaris/1.0.5/templates/deployment.yaml +++ b/test/machinaris/1.0.7/templates/deployment.yaml @@ -17,6 +17,12 @@ spec: hostNetwork: true containers: - name: {{ .Chart.Name }} + {{ if .Values.enableResourceLimits }} + resources: + limits: + cpu: {{ .Values.cpuLimit }} + memory: {{ .Values.memLimit }} + {{ end }} tty: true {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} diff --git a/test/machinaris/1.0.6/templates/service.yaml b/test/machinaris/1.0.7/templates/service.yaml similarity index 100% rename from test/machinaris/1.0.6/templates/service.yaml rename to test/machinaris/1.0.7/templates/service.yaml diff --git a/charts/machinaris/1.0.5/test_values.yaml b/test/machinaris/1.0.7/test_values.yaml similarity index 95% rename from charts/machinaris/1.0.5/test_values.yaml rename to test/machinaris/1.0.7/test_values.yaml index fb483fc6a2..6d72cfef11 100644 --- a/charts/machinaris/1.0.5/test_values.yaml +++ b/test/machinaris/1.0.7/test_values.yaml @@ -8,7 +8,7 @@ appVolumeMounts: image: pullPolicy: IfNotPresent repository: ghcr.io/guydavis/machinaris - tag: v0.5.4 + tag: v0.5.5 machinaris_ui_port: 31003 timezone: America/Edmonton updateStrategy: Recreate