diff --git a/charts/chia/1.3.29/charts/common-2112.0.0.tgz b/charts/chia/1.3.29/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/chia/1.3.29/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/chia/1.3.29/requirements.lock b/charts/chia/1.3.29/requirements.lock deleted file mode 100644 index f8debca24d..0000000000 --- a/charts/chia/1.3.29/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.722808+05:00" diff --git a/charts/chia/1.3.29/.helmignore b/charts/chia/1.3.30/.helmignore similarity index 100% rename from charts/chia/1.3.29/.helmignore rename to charts/chia/1.3.30/.helmignore diff --git a/charts/chia/1.3.29/Chart.yaml b/charts/chia/1.3.30/Chart.yaml similarity index 80% rename from charts/chia/1.3.29/Chart.yaml rename to charts/chia/1.3.30/Chart.yaml index 0a4e10c687..0a224f74ae 100644 --- a/charts/chia/1.3.29/Chart.yaml +++ b/charts/chia/1.3.30/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v1.3.5 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Global, Versioned, peer-to-peer filesystem. home: https://www.chia.net/ icon: https://www.chia.net/img/chia_logo.svg @@ -15,4 +15,4 @@ name: chia sources: - https://github.com/Chia-Network/chia-blockchain - https://github.com/orgs/chia-network/packages/container/package/chia -version: 1.3.29 +version: 1.3.30 diff --git a/charts/chia/1.3.29/README.md b/charts/chia/1.3.30/README.md similarity index 100% rename from charts/chia/1.3.29/README.md rename to charts/chia/1.3.30/README.md diff --git a/charts/chia/1.3.29/app-readme.md b/charts/chia/1.3.30/app-readme.md similarity index 100% rename from charts/chia/1.3.29/app-readme.md rename to charts/chia/1.3.30/app-readme.md diff --git a/charts/chia/1.3.30/charts/common-2206.0.0.tgz b/charts/chia/1.3.30/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/chia/1.3.30/charts/common-2206.0.0.tgz differ diff --git a/charts/chia/1.3.29/default_values.yaml b/charts/chia/1.3.30/default_values.yaml similarity index 100% rename from charts/chia/1.3.29/default_values.yaml rename to charts/chia/1.3.30/default_values.yaml diff --git a/charts/chia/1.3.29/ix_values.yaml b/charts/chia/1.3.30/ix_values.yaml similarity index 100% rename from charts/chia/1.3.29/ix_values.yaml rename to charts/chia/1.3.30/ix_values.yaml diff --git a/test/chia/1.3.29/questions.yaml b/charts/chia/1.3.30/questions.yaml similarity index 84% rename from test/chia/1.3.29/questions.yaml rename to charts/chia/1.3.30/questions.yaml index 29ca90ccac..1dac7192db 100644 --- a/test/chia/1.3.29/questions.yaml +++ b/charts/chia/1.3.30/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Set the environment that will be visible to the container" - name: "Networking" description: "Configure networking for Chia container" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -180,3 +182,28 @@ questions: max: 65535 default: 8447 required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/charts/chia/1.3.30/requirements.lock b/charts/chia/1.3.30/requirements.lock new file mode 100644 index 0000000000..b3c751eb51 --- /dev/null +++ b/charts/chia/1.3.30/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.06059343+05:00" diff --git a/charts/chia/1.3.29/templates/deployment.yaml b/charts/chia/1.3.30/templates/deployment.yaml similarity index 96% rename from charts/chia/1.3.29/templates/deployment.yaml rename to charts/chia/1.3.30/templates/deployment.yaml index 3fa28edc2a..9891ef394d 100644 --- a/charts/chia/1.3.29/templates/deployment.yaml +++ b/charts/chia/1.3.30/templates/deployment.yaml @@ -21,6 +21,7 @@ spec: containers: - name: {{ .Chart.Name }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} + {{ include "common.resources.limitaion" . | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} - name: extrappvolume-{{ $index }} diff --git a/charts/chia/1.3.29/templates/generate-mnemonic.yaml b/charts/chia/1.3.30/templates/generate-mnemonic.yaml similarity index 100% rename from charts/chia/1.3.29/templates/generate-mnemonic.yaml rename to charts/chia/1.3.30/templates/generate-mnemonic.yaml diff --git a/charts/chia/1.3.29/templates/mnemonic-configmap.yaml b/charts/chia/1.3.30/templates/mnemonic-configmap.yaml similarity index 100% rename from charts/chia/1.3.29/templates/mnemonic-configmap.yaml rename to charts/chia/1.3.30/templates/mnemonic-configmap.yaml diff --git a/charts/chia/1.3.29/templates/networking.tpl b/charts/chia/1.3.30/templates/networking.tpl similarity index 100% rename from charts/chia/1.3.29/templates/networking.tpl rename to charts/chia/1.3.30/templates/networking.tpl diff --git a/charts/chia/1.3.29/templates/service.yaml b/charts/chia/1.3.30/templates/service.yaml similarity index 100% rename from charts/chia/1.3.29/templates/service.yaml rename to charts/chia/1.3.30/templates/service.yaml diff --git a/charts/chia/1.3.29/test_values.yaml b/charts/chia/1.3.30/test_values.yaml similarity index 100% rename from charts/chia/1.3.29/test_values.yaml rename to charts/chia/1.3.30/test_values.yaml diff --git a/charts/chia/1.3.29/values.yaml b/charts/chia/1.3.30/values.yaml similarity index 100% rename from charts/chia/1.3.29/values.yaml rename to charts/chia/1.3.30/values.yaml diff --git a/charts/collabora/1.2.4/charts/common-2112.0.0.tgz b/charts/collabora/1.2.4/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/collabora/1.2.4/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/collabora/1.2.4/.helmignore b/charts/collabora/1.2.5/.helmignore similarity index 100% rename from charts/collabora/1.2.4/.helmignore rename to charts/collabora/1.2.5/.helmignore diff --git a/test/collabora/1.2.4/Chart.yaml b/charts/collabora/1.2.5/Chart.yaml similarity index 84% rename from test/collabora/1.2.4/Chart.yaml rename to charts/collabora/1.2.5/Chart.yaml index f46a527e63..2c4da5ad30 100644 --- a/test/collabora/1.2.4/Chart.yaml +++ b/charts/collabora/1.2.5/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: 21.11.4.1.1 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: "Collabora Online Development Edition \u2013 an awesome, Online Office\ \ suite image suitable for home use." home: https://github.com/CollaboraOnline/online @@ -16,4 +16,4 @@ name: collabora sources: - https://github.com/CollaboraOnline/online.git - https://hub.docker.com/r/collabora/code -version: 1.2.4 +version: 1.2.5 diff --git a/charts/collabora/1.2.4/README.md b/charts/collabora/1.2.5/README.md similarity index 100% rename from charts/collabora/1.2.4/README.md rename to charts/collabora/1.2.5/README.md diff --git a/charts/collabora/1.2.4/app-readme.md b/charts/collabora/1.2.5/app-readme.md similarity index 100% rename from charts/collabora/1.2.4/app-readme.md rename to charts/collabora/1.2.5/app-readme.md diff --git a/charts/collabora/1.2.5/charts/common-2206.0.0.tgz b/charts/collabora/1.2.5/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/collabora/1.2.5/charts/common-2206.0.0.tgz differ diff --git a/charts/collabora/1.2.4/ix_values.yaml b/charts/collabora/1.2.5/ix_values.yaml similarity index 100% rename from charts/collabora/1.2.4/ix_values.yaml rename to charts/collabora/1.2.5/ix_values.yaml diff --git a/charts/collabora/1.2.4/questions.yaml b/charts/collabora/1.2.5/questions.yaml similarity index 80% rename from charts/collabora/1.2.4/questions.yaml rename to charts/collabora/1.2.5/questions.yaml index 91fac3eb7b..7ee8a2f850 100644 --- a/charts/collabora/1.2.4/questions.yaml +++ b/charts/collabora/1.2.5/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Configure Networking for Collabora" - name: "Storage" description: "Configure Storage for Collabora" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -129,3 +131,28 @@ questions: default: 9980 min: 9000 max: 65535 + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/charts/collabora/1.2.5/requirements.lock b/charts/collabora/1.2.5/requirements.lock new file mode 100644 index 0000000000..e55b1a0150 --- /dev/null +++ b/charts/collabora/1.2.5/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.10176596+05:00" diff --git a/charts/collabora/1.2.4/templates/_helpers.tpl b/charts/collabora/1.2.5/templates/_helpers.tpl similarity index 100% rename from charts/collabora/1.2.4/templates/_helpers.tpl rename to charts/collabora/1.2.5/templates/_helpers.tpl diff --git a/charts/collabora/1.2.4/templates/deployment.yaml b/charts/collabora/1.2.5/templates/deployment.yaml similarity index 98% rename from charts/collabora/1.2.4/templates/deployment.yaml rename to charts/collabora/1.2.5/templates/deployment.yaml index d1a02c4948..fd2e76b5d9 100644 --- a/charts/collabora/1.2.4/templates/deployment.yaml +++ b/charts/collabora/1.2.5/templates/deployment.yaml @@ -37,6 +37,7 @@ spec: containerPort: 443 protocol: TCP - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} {{ if .Values.extraAppVolumeMounts }} volumeMounts: diff --git a/charts/collabora/1.2.4/templates/nginx-conf.yaml b/charts/collabora/1.2.5/templates/nginx-conf.yaml similarity index 100% rename from charts/collabora/1.2.4/templates/nginx-conf.yaml rename to charts/collabora/1.2.5/templates/nginx-conf.yaml diff --git a/charts/collabora/1.2.4/templates/nginx-service.yaml b/charts/collabora/1.2.5/templates/nginx-service.yaml similarity index 100% rename from charts/collabora/1.2.4/templates/nginx-service.yaml rename to charts/collabora/1.2.5/templates/nginx-service.yaml diff --git a/charts/collabora/1.2.4/templates/secrets.yaml b/charts/collabora/1.2.5/templates/secrets.yaml similarity index 100% rename from charts/collabora/1.2.4/templates/secrets.yaml rename to charts/collabora/1.2.5/templates/secrets.yaml diff --git a/charts/collabora/1.2.4/templates/tests/deployment-check.yaml b/charts/collabora/1.2.5/templates/tests/deployment-check.yaml similarity index 100% rename from charts/collabora/1.2.4/templates/tests/deployment-check.yaml rename to charts/collabora/1.2.5/templates/tests/deployment-check.yaml diff --git a/charts/collabora/1.2.4/test_values.yaml b/charts/collabora/1.2.5/test_values.yaml similarity index 100% rename from charts/collabora/1.2.4/test_values.yaml rename to charts/collabora/1.2.5/test_values.yaml diff --git a/charts/diskoverdata/1.0.2/Chart.lock b/charts/diskoverdata/1.0.2/Chart.lock deleted file mode 100644 index ad893eeb8e..0000000000 --- a/charts/diskoverdata/1.0.2/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-14T16:04:57.912820777+05:00" diff --git a/charts/diskoverdata/1.0.2/charts/common-2112.0.0.tgz b/charts/diskoverdata/1.0.2/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/diskoverdata/1.0.2/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/diskoverdata/1.0.3/Chart.lock b/charts/diskoverdata/1.0.3/Chart.lock new file mode 100644 index 0000000000..e2e0733aa3 --- /dev/null +++ b/charts/diskoverdata/1.0.3/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.566570138+05:00" diff --git a/test/diskoverdata/1.0.2/Chart.yaml b/charts/diskoverdata/1.0.3/Chart.yaml similarity index 81% rename from test/diskoverdata/1.0.2/Chart.yaml rename to charts/diskoverdata/1.0.3/Chart.yaml index e72713f371..d0cad7c65d 100644 --- a/test/diskoverdata/1.0.2/Chart.yaml +++ b/charts/diskoverdata/1.0.3/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "2.0.1" icon: http://www.diskoverdata.com/wp-content/uploads/2019/09/diskover.png description: Diskover is used to monitor size/volumes of distributed dataset. name: diskoverdata -version: 1.0.2 +version: 1.0.3 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 home: https://github.com/diskoverdata/diskover-community/ keywords: - storage diff --git a/charts/diskoverdata/1.0.2/README.md b/charts/diskoverdata/1.0.3/README.md similarity index 100% rename from charts/diskoverdata/1.0.2/README.md rename to charts/diskoverdata/1.0.3/README.md diff --git a/charts/diskoverdata/1.0.2/app-readme.md b/charts/diskoverdata/1.0.3/app-readme.md similarity index 100% rename from charts/diskoverdata/1.0.2/app-readme.md rename to charts/diskoverdata/1.0.3/app-readme.md diff --git a/charts/diskoverdata/1.0.3/charts/common-2206.0.0.tgz b/charts/diskoverdata/1.0.3/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f144a0660b Binary files /dev/null and b/charts/diskoverdata/1.0.3/charts/common-2206.0.0.tgz differ diff --git a/charts/diskoverdata/1.0.2/ix_values.yaml b/charts/diskoverdata/1.0.3/ix_values.yaml similarity index 100% rename from charts/diskoverdata/1.0.2/ix_values.yaml rename to charts/diskoverdata/1.0.3/ix_values.yaml diff --git a/charts/diskoverdata/1.0.2/questions.yaml b/charts/diskoverdata/1.0.3/questions.yaml similarity index 89% rename from charts/diskoverdata/1.0.2/questions.yaml rename to charts/diskoverdata/1.0.3/questions.yaml index 4e5ff35047..c30285208f 100644 --- a/charts/diskoverdata/1.0.2/questions.yaml +++ b/charts/diskoverdata/1.0.3/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Networking Configuration for Diskover" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -293,3 +295,28 @@ questions: type: path editable: false default: "/usr/share/elasticsearch/data" + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/charts/diskoverdata/1.0.2/templates/_diskover.tpl b/charts/diskoverdata/1.0.3/templates/_diskover.tpl similarity index 100% rename from charts/diskoverdata/1.0.2/templates/_diskover.tpl rename to charts/diskoverdata/1.0.3/templates/_diskover.tpl diff --git a/charts/diskoverdata/1.0.2/templates/deployment.yaml b/charts/diskoverdata/1.0.3/templates/deployment.yaml similarity index 99% rename from charts/diskoverdata/1.0.2/templates/deployment.yaml rename to charts/diskoverdata/1.0.3/templates/deployment.yaml index 1cedd245a3..f1bbd9c14c 100644 --- a/charts/diskoverdata/1.0.2/templates/deployment.yaml +++ b/charts/diskoverdata/1.0.3/templates/deployment.yaml @@ -74,6 +74,7 @@ spec: containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} - name: diskover-initial-scripts diff --git a/charts/diskoverdata/1.0.2/templates/diskover-secrets.yaml b/charts/diskoverdata/1.0.3/templates/diskover-secrets.yaml similarity index 100% rename from charts/diskoverdata/1.0.2/templates/diskover-secrets.yaml rename to charts/diskoverdata/1.0.3/templates/diskover-secrets.yaml diff --git a/charts/diskoverdata/1.0.2/templates/elastic_search_deployment.yaml b/charts/diskoverdata/1.0.3/templates/elastic_search_deployment.yaml similarity index 100% rename from charts/diskoverdata/1.0.2/templates/elastic_search_deployment.yaml rename to charts/diskoverdata/1.0.3/templates/elastic_search_deployment.yaml diff --git a/charts/diskoverdata/1.0.2/templates/elastic_search_service.yaml b/charts/diskoverdata/1.0.3/templates/elastic_search_service.yaml similarity index 100% rename from charts/diskoverdata/1.0.2/templates/elastic_search_service.yaml rename to charts/diskoverdata/1.0.3/templates/elastic_search_service.yaml diff --git a/charts/diskoverdata/1.0.2/templates/elasticsearch-secret.yaml b/charts/diskoverdata/1.0.3/templates/elasticsearch-secret.yaml similarity index 100% rename from charts/diskoverdata/1.0.2/templates/elasticsearch-secret.yaml rename to charts/diskoverdata/1.0.3/templates/elasticsearch-secret.yaml diff --git a/charts/diskoverdata/1.0.2/templates/initial_scripts.yaml b/charts/diskoverdata/1.0.3/templates/initial_scripts.yaml similarity index 100% rename from charts/diskoverdata/1.0.2/templates/initial_scripts.yaml rename to charts/diskoverdata/1.0.3/templates/initial_scripts.yaml diff --git a/charts/diskoverdata/1.0.2/templates/pre-install-job.yaml b/charts/diskoverdata/1.0.3/templates/pre-install-job.yaml similarity index 100% rename from charts/diskoverdata/1.0.2/templates/pre-install-job.yaml rename to charts/diskoverdata/1.0.3/templates/pre-install-job.yaml diff --git a/charts/diskoverdata/1.0.2/templates/service.yaml b/charts/diskoverdata/1.0.3/templates/service.yaml similarity index 100% rename from charts/diskoverdata/1.0.2/templates/service.yaml rename to charts/diskoverdata/1.0.3/templates/service.yaml diff --git a/charts/diskoverdata/1.0.2/templates/tests/deployment-check.yaml b/charts/diskoverdata/1.0.3/templates/tests/deployment-check.yaml similarity index 100% rename from charts/diskoverdata/1.0.2/templates/tests/deployment-check.yaml rename to charts/diskoverdata/1.0.3/templates/tests/deployment-check.yaml diff --git a/charts/diskoverdata/1.0.2/test_values.yaml b/charts/diskoverdata/1.0.3/test_values.yaml similarity index 100% rename from charts/diskoverdata/1.0.2/test_values.yaml rename to charts/diskoverdata/1.0.3/test_values.yaml diff --git a/charts/emby/1.0.8/charts/common-2112.0.0.tgz b/charts/emby/1.0.8/charts/common-2112.0.0.tgz deleted file mode 100644 index 3cb1689233..0000000000 Binary files a/charts/emby/1.0.8/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/emby/1.0.8/requirements.lock b/charts/emby/1.0.8/requirements.lock deleted file mode 100644 index 137d873a09..0000000000 --- a/charts/emby/1.0.8/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.674776+05:00" diff --git a/charts/emby/1.0.8/.helmignore b/charts/emby/1.0.9/.helmignore similarity index 100% rename from charts/emby/1.0.8/.helmignore rename to charts/emby/1.0.9/.helmignore diff --git a/charts/emby/1.0.9/Chart.lock b/charts/emby/1.0.9/Chart.lock new file mode 100644 index 0000000000..b3a4e3c9bb --- /dev/null +++ b/charts/emby/1.0.9/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:50.877815231+05:00" diff --git a/test/emby/1.0.8/Chart.yaml b/charts/emby/1.0.9/Chart.yaml similarity index 75% rename from test/emby/1.0.8/Chart.yaml rename to charts/emby/1.0.9/Chart.yaml index e385ab0844..b60775170e 100644 --- a/test/emby/1.0.8/Chart.yaml +++ b/charts/emby/1.0.9/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: 4.8.0.2 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Emby Server home: https://emby.media/ icon: https://images-na.ssl-images-amazon.com/images/I/41NwssJC1iL.png @@ -13,4 +13,4 @@ keywords: name: emby sources: - https://hub.docker.com/r/emby/embyserver -version: 1.0.8 +version: 1.0.9 diff --git a/charts/emby/1.0.8/README.md b/charts/emby/1.0.9/README.md similarity index 100% rename from charts/emby/1.0.8/README.md rename to charts/emby/1.0.9/README.md diff --git a/charts/emby/1.0.8/app-readme.md b/charts/emby/1.0.9/app-readme.md similarity index 100% rename from charts/emby/1.0.8/app-readme.md rename to charts/emby/1.0.9/app-readme.md diff --git a/charts/emby/1.0.9/charts/common-2206.0.0.tgz b/charts/emby/1.0.9/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/emby/1.0.9/charts/common-2206.0.0.tgz differ diff --git a/charts/emby/1.0.8/ix_values.yaml b/charts/emby/1.0.9/ix_values.yaml similarity index 81% rename from charts/emby/1.0.8/ix_values.yaml rename to charts/emby/1.0.9/ix_values.yaml index 871a1f572d..ab0a010279 100644 --- a/charts/emby/1.0.8/ix_values.yaml +++ b/charts/emby/1.0.9/ix_values.yaml @@ -1,4 +1,4 @@ image: pullPolicy: IfNotPresent repository: emby/embyserver - tag: 4.8.0.2 + tag: 4.7.5.0 diff --git a/charts/emby/1.0.8/questions.yaml b/charts/emby/1.0.9/questions.yaml similarity index 83% rename from charts/emby/1.0.8/questions.yaml rename to charts/emby/1.0.9/questions.yaml index 9ffdc86d63..ef2a764b57 100644 --- a/charts/emby/1.0.8/questions.yaml +++ b/charts/emby/1.0.9/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Configure when pod should be restarted in case of failure" - name: "Resource Reservation" description: "Specify resources to be allocated to workload" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -164,3 +166,28 @@ questions: schema: type: boolean default: false + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/charts/collabora/1.2.4/requirements.lock b/charts/emby/1.0.9/requirements.lock similarity index 67% rename from charts/collabora/1.2.4/requirements.lock rename to charts/emby/1.0.9/requirements.lock index 137d873a09..b4b664582d 100644 --- a/charts/collabora/1.2.4/requirements.lock +++ b/charts/emby/1.0.9/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 generated: "2021-12-06T21:24:36.674776+05:00" diff --git a/charts/emby/1.0.8/templates/NOTES.txt b/charts/emby/1.0.9/templates/NOTES.txt similarity index 100% rename from charts/emby/1.0.8/templates/NOTES.txt rename to charts/emby/1.0.9/templates/NOTES.txt diff --git a/test/emby/1.0.8/templates/deployment.yaml b/charts/emby/1.0.9/templates/deployment.yaml similarity index 97% rename from test/emby/1.0.8/templates/deployment.yaml rename to charts/emby/1.0.9/templates/deployment.yaml index c1e9272b0b..17ba9c54fd 100644 --- a/test/emby/1.0.8/templates/deployment.yaml +++ b/charts/emby/1.0.9/templates/deployment.yaml @@ -10,6 +10,7 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} hostname: {{ template "common.names.fullname" . }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} {{ include "common.containers.gpuConfiguration" .Values | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} diff --git a/charts/emby/1.0.8/templates/service-tcp.yaml b/charts/emby/1.0.9/templates/service-tcp.yaml similarity index 100% rename from charts/emby/1.0.8/templates/service-tcp.yaml rename to charts/emby/1.0.9/templates/service-tcp.yaml diff --git a/charts/emby/1.0.8/templates/service-udp.yaml b/charts/emby/1.0.9/templates/service-udp.yaml similarity index 100% rename from charts/emby/1.0.8/templates/service-udp.yaml rename to charts/emby/1.0.9/templates/service-udp.yaml diff --git a/charts/emby/1.0.8/templates/tests/deployment-check.yaml b/charts/emby/1.0.9/templates/tests/deployment-check.yaml similarity index 100% rename from charts/emby/1.0.8/templates/tests/deployment-check.yaml rename to charts/emby/1.0.9/templates/tests/deployment-check.yaml diff --git a/charts/emby/1.0.8/test_values.yaml b/charts/emby/1.0.9/test_values.yaml similarity index 100% rename from charts/emby/1.0.8/test_values.yaml rename to charts/emby/1.0.9/test_values.yaml diff --git a/charts/emby/upgrade_strategy b/charts/emby/upgrade_strategy_disable similarity index 100% rename from charts/emby/upgrade_strategy rename to charts/emby/upgrade_strategy_disable diff --git a/charts/home-assistant/1.0.11/Chart.lock b/charts/home-assistant/1.0.11/Chart.lock deleted file mode 100644 index 25bdcdbf9a..0000000000 --- a/charts/home-assistant/1.0.11/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-14T16:04:57.688006166+05:00" diff --git a/charts/home-assistant/1.0.11/charts/common-2112.0.0.tgz b/charts/home-assistant/1.0.11/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/home-assistant/1.0.11/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/home-assistant/1.0.12/Chart.lock b/charts/home-assistant/1.0.12/Chart.lock new file mode 100644 index 0000000000..040ffc0865 --- /dev/null +++ b/charts/home-assistant/1.0.12/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.430542161+05:00" diff --git a/test/home-assistant/1.0.11/Chart.yaml b/charts/home-assistant/1.0.12/Chart.yaml similarity index 79% rename from test/home-assistant/1.0.11/Chart.yaml rename to charts/home-assistant/1.0.12/Chart.yaml index f2be1e7445..ebb18165af 100644 --- a/test/home-assistant/1.0.11/Chart.yaml +++ b/charts/home-assistant/1.0.12/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: 2022.6.7 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: home-assistant App for TrueNAS SCALE home: https://github.com/home-assistant/home-assistant icon: https://truecharts.org/_static/img/appicons/home-assistant.png @@ -12,4 +12,4 @@ keywords: name: home-assistant sources: - https://github.com/home-assistant/home-assistant -version: 1.0.11 +version: 1.0.12 diff --git a/charts/home-assistant/1.0.11/README.md b/charts/home-assistant/1.0.12/README.md similarity index 100% rename from charts/home-assistant/1.0.11/README.md rename to charts/home-assistant/1.0.12/README.md diff --git a/charts/home-assistant/1.0.11/app-readme.md b/charts/home-assistant/1.0.12/app-readme.md similarity index 100% rename from charts/home-assistant/1.0.11/app-readme.md rename to charts/home-assistant/1.0.12/app-readme.md diff --git a/charts/home-assistant/1.0.12/charts/common-2206.0.0.tgz b/charts/home-assistant/1.0.12/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/home-assistant/1.0.12/charts/common-2206.0.0.tgz differ diff --git a/charts/home-assistant/1.0.11/ix_values.yaml b/charts/home-assistant/1.0.12/ix_values.yaml similarity index 100% rename from charts/home-assistant/1.0.11/ix_values.yaml rename to charts/home-assistant/1.0.12/ix_values.yaml diff --git a/test/home-assistant/1.0.11/questions.yaml b/charts/home-assistant/1.0.12/questions.yaml similarity index 88% rename from test/home-assistant/1.0.11/questions.yaml rename to charts/home-assistant/1.0.12/questions.yaml index 2afb8ed3fb..feb5225536 100644 --- a/test/home-assistant/1.0.11/questions.yaml +++ b/charts/home-assistant/1.0.12/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Networking Configuration for homeassistant" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -262,4 +264,29 @@ questions: description: "Host path" schema: type: hostpath - required: true \ No newline at end of file + required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/charts/home-assistant/1.0.11/templates/_postgres.tpl b/charts/home-assistant/1.0.12/templates/_postgres.tpl similarity index 100% rename from charts/home-assistant/1.0.11/templates/_postgres.tpl rename to charts/home-assistant/1.0.12/templates/_postgres.tpl diff --git a/charts/home-assistant/1.0.11/templates/backup-postgres-config.yaml b/charts/home-assistant/1.0.12/templates/backup-postgres-config.yaml similarity index 100% rename from charts/home-assistant/1.0.11/templates/backup-postgres-config.yaml rename to charts/home-assistant/1.0.12/templates/backup-postgres-config.yaml diff --git a/charts/home-assistant/1.0.11/templates/backup-postgres-hook.yaml b/charts/home-assistant/1.0.12/templates/backup-postgres-hook.yaml similarity index 100% rename from charts/home-assistant/1.0.11/templates/backup-postgres-hook.yaml rename to charts/home-assistant/1.0.12/templates/backup-postgres-hook.yaml diff --git a/charts/home-assistant/1.0.11/templates/deployment.yaml b/charts/home-assistant/1.0.12/templates/deployment.yaml similarity index 98% rename from charts/home-assistant/1.0.11/templates/deployment.yaml rename to charts/home-assistant/1.0.12/templates/deployment.yaml index 75a2500a40..65ab647567 100644 --- a/charts/home-assistant/1.0.11/templates/deployment.yaml +++ b/charts/home-assistant/1.0.12/templates/deployment.yaml @@ -55,6 +55,7 @@ spec: containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} diff --git a/charts/home-assistant/1.0.11/templates/home-assistance-init-config.yaml b/charts/home-assistant/1.0.12/templates/home-assistance-init-config.yaml similarity index 100% rename from charts/home-assistant/1.0.11/templates/home-assistance-init-config.yaml rename to charts/home-assistant/1.0.12/templates/home-assistance-init-config.yaml diff --git a/charts/home-assistant/1.0.11/templates/postgres-config.yaml b/charts/home-assistant/1.0.12/templates/postgres-config.yaml similarity index 100% rename from charts/home-assistant/1.0.11/templates/postgres-config.yaml rename to charts/home-assistant/1.0.12/templates/postgres-config.yaml diff --git a/charts/home-assistant/1.0.11/templates/postgres-deployment.yaml b/charts/home-assistant/1.0.12/templates/postgres-deployment.yaml similarity index 100% rename from charts/home-assistant/1.0.11/templates/postgres-deployment.yaml rename to charts/home-assistant/1.0.12/templates/postgres-deployment.yaml diff --git a/charts/home-assistant/1.0.11/templates/postgres-secret.yaml b/charts/home-assistant/1.0.12/templates/postgres-secret.yaml similarity index 100% rename from charts/home-assistant/1.0.11/templates/postgres-secret.yaml rename to charts/home-assistant/1.0.12/templates/postgres-secret.yaml diff --git a/charts/home-assistant/1.0.11/templates/postgres-service.yaml b/charts/home-assistant/1.0.12/templates/postgres-service.yaml similarity index 100% rename from charts/home-assistant/1.0.11/templates/postgres-service.yaml rename to charts/home-assistant/1.0.12/templates/postgres-service.yaml diff --git a/charts/home-assistant/1.0.11/templates/pre-install-job.yaml b/charts/home-assistant/1.0.12/templates/pre-install-job.yaml similarity index 100% rename from charts/home-assistant/1.0.11/templates/pre-install-job.yaml rename to charts/home-assistant/1.0.12/templates/pre-install-job.yaml diff --git a/charts/home-assistant/1.0.11/templates/service.yaml b/charts/home-assistant/1.0.12/templates/service.yaml similarity index 100% rename from charts/home-assistant/1.0.11/templates/service.yaml rename to charts/home-assistant/1.0.12/templates/service.yaml diff --git a/charts/home-assistant/1.0.11/templates/tests/deployment-check.yaml b/charts/home-assistant/1.0.12/templates/tests/deployment-check.yaml similarity index 100% rename from charts/home-assistant/1.0.11/templates/tests/deployment-check.yaml rename to charts/home-assistant/1.0.12/templates/tests/deployment-check.yaml diff --git a/charts/home-assistant/1.0.11/test_values.yaml b/charts/home-assistant/1.0.12/test_values.yaml similarity index 100% rename from charts/home-assistant/1.0.11/test_values.yaml rename to charts/home-assistant/1.0.12/test_values.yaml diff --git a/charts/ipfs/1.2.4/charts/common-2112.0.0.tgz b/charts/ipfs/1.2.4/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/ipfs/1.2.4/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/ipfs/1.2.4/requirements.lock b/charts/ipfs/1.2.4/requirements.lock deleted file mode 100644 index 70c48680b4..0000000000 --- a/charts/ipfs/1.2.4/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.550755+05:00" diff --git a/charts/ipfs/1.2.4/.helmignore b/charts/ipfs/1.2.5/.helmignore similarity index 100% rename from charts/ipfs/1.2.4/.helmignore rename to charts/ipfs/1.2.5/.helmignore diff --git a/test/ipfs/1.2.4/Chart.yaml b/charts/ipfs/1.2.5/Chart.yaml similarity index 80% rename from test/ipfs/1.2.4/Chart.yaml rename to charts/ipfs/1.2.5/Chart.yaml index fd453413ce..8f5f19978f 100644 --- a/test/ipfs/1.2.4/Chart.yaml +++ b/charts/ipfs/1.2.5/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v0.13.0 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Global, Versioned, peer-to-peer filesystem. home: https://ipfs.io icon: https://ipfs.io/ipfs/QmVk7srrwahXLNmcDYvyUEJptyoxpndnRa57YJ11L4jV26/ipfs.go.png @@ -15,4 +15,4 @@ sources: - https://github.com/ipfs/go-ipfs - https://hub.docker.com/r/ipfs/go-ipfs upstream_version: 0.8.0-rc1 -version: 1.2.4 +version: 1.2.5 diff --git a/charts/ipfs/1.2.4/README.md b/charts/ipfs/1.2.5/README.md similarity index 100% rename from charts/ipfs/1.2.4/README.md rename to charts/ipfs/1.2.5/README.md diff --git a/charts/ipfs/1.2.4/app-readme.md b/charts/ipfs/1.2.5/app-readme.md similarity index 100% rename from charts/ipfs/1.2.4/app-readme.md rename to charts/ipfs/1.2.5/app-readme.md diff --git a/charts/ipfs/1.2.5/charts/common-2206.0.0.tgz b/charts/ipfs/1.2.5/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/ipfs/1.2.5/charts/common-2206.0.0.tgz differ diff --git a/charts/ipfs/1.2.4/ix_values.yaml b/charts/ipfs/1.2.5/ix_values.yaml similarity index 100% rename from charts/ipfs/1.2.4/ix_values.yaml rename to charts/ipfs/1.2.5/ix_values.yaml diff --git a/charts/ipfs/1.2.4/questions.yaml b/charts/ipfs/1.2.5/questions.yaml similarity index 85% rename from charts/ipfs/1.2.4/questions.yaml rename to charts/ipfs/1.2.5/questions.yaml index 232ff66070..14d68c6f1b 100644 --- a/charts/ipfs/1.2.4/questions.yaml +++ b/charts/ipfs/1.2.5/questions.yaml @@ -9,6 +9,9 @@ groups: description: "Configure Storage for IPFS" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" + portals: web_portal: @@ -191,3 +194,28 @@ questions: schema: type: hostpath required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/charts/ipfs/1.2.5/requirements.lock b/charts/ipfs/1.2.5/requirements.lock new file mode 100644 index 0000000000..df0bbfa57e --- /dev/null +++ b/charts/ipfs/1.2.5/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.187672514+05:00" diff --git a/charts/ipfs/1.2.4/templates/NOTES.txt b/charts/ipfs/1.2.5/templates/NOTES.txt similarity index 100% rename from charts/ipfs/1.2.4/templates/NOTES.txt rename to charts/ipfs/1.2.5/templates/NOTES.txt diff --git a/test/ipfs/1.2.4/templates/deployment.yaml b/charts/ipfs/1.2.5/templates/deployment.yaml similarity index 98% rename from test/ipfs/1.2.4/templates/deployment.yaml rename to charts/ipfs/1.2.5/templates/deployment.yaml index ae9d34b7e1..87f2e70a35 100644 --- a/test/ipfs/1.2.4/templates/deployment.yaml +++ b/charts/ipfs/1.2.5/templates/deployment.yaml @@ -46,6 +46,7 @@ spec: {{ include "common.storage.allContainerVolumeMounts" .Values | nindent 10 }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} {{ include "common.storage.allContainerVolumeMounts" .Values | nindent 10 }} ports: diff --git a/charts/ipfs/1.2.4/templates/service.yaml b/charts/ipfs/1.2.5/templates/service.yaml similarity index 100% rename from charts/ipfs/1.2.4/templates/service.yaml rename to charts/ipfs/1.2.5/templates/service.yaml diff --git a/charts/ipfs/1.2.4/templates/serviceaccount.yaml b/charts/ipfs/1.2.5/templates/serviceaccount.yaml similarity index 100% rename from charts/ipfs/1.2.4/templates/serviceaccount.yaml rename to charts/ipfs/1.2.5/templates/serviceaccount.yaml diff --git a/charts/ipfs/1.2.4/templates/tests/deployment-check.yaml b/charts/ipfs/1.2.5/templates/tests/deployment-check.yaml similarity index 100% rename from charts/ipfs/1.2.4/templates/tests/deployment-check.yaml rename to charts/ipfs/1.2.5/templates/tests/deployment-check.yaml diff --git a/charts/ipfs/1.2.4/test_values.yaml b/charts/ipfs/1.2.5/test_values.yaml similarity index 100% rename from charts/ipfs/1.2.4/test_values.yaml rename to charts/ipfs/1.2.5/test_values.yaml diff --git a/charts/ix-chart/2206.0.2/Chart.lock b/charts/ix-chart/2206.0.2/Chart.lock deleted file mode 100644 index ba76e05c13..0000000000 --- a/charts/ix-chart/2206.0.2/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:40:37.023887+05:00" diff --git a/charts/ix-chart/2206.0.2/charts/common-2112.0.0.tgz b/charts/ix-chart/2206.0.2/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/ix-chart/2206.0.2/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/ix-chart/2206.0.2/.helmignore b/charts/ix-chart/2206.0.3/.helmignore similarity index 100% rename from charts/ix-chart/2206.0.2/.helmignore rename to charts/ix-chart/2206.0.3/.helmignore diff --git a/charts/ix-chart/2206.0.3/Chart.lock b/charts/ix-chart/2206.0.3/Chart.lock new file mode 100644 index 0000000000..2b3f24a8f6 --- /dev/null +++ b/charts/ix-chart/2206.0.3/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:50.913701514+05:00" diff --git a/charts/ix-chart/2206.0.2/Chart.yaml b/charts/ix-chart/2206.0.3/Chart.yaml similarity index 92% rename from charts/ix-chart/2206.0.2/Chart.yaml rename to charts/ix-chart/2206.0.3/Chart.yaml index 3692ef0034..956e7497bd 100644 --- a/charts/ix-chart/2206.0.2/Chart.yaml +++ b/charts/ix-chart/2206.0.3/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.2 +version: 2206.0.3 # 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 @@ -23,5 +23,5 @@ version: 2206.0.2 appVersion: v1 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 diff --git a/charts/ix-chart/2206.0.2/README.md b/charts/ix-chart/2206.0.3/README.md similarity index 100% rename from charts/ix-chart/2206.0.2/README.md rename to charts/ix-chart/2206.0.3/README.md diff --git a/charts/ix-chart/2206.0.2/app-readme.md b/charts/ix-chart/2206.0.3/app-readme.md similarity index 100% rename from charts/ix-chart/2206.0.2/app-readme.md rename to charts/ix-chart/2206.0.3/app-readme.md diff --git a/charts/ix-chart/2206.0.3/charts/common-2206.0.0.tgz b/charts/ix-chart/2206.0.3/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/ix-chart/2206.0.3/charts/common-2206.0.0.tgz differ diff --git a/charts/ix-chart/2206.0.2/questions.yaml b/charts/ix-chart/2206.0.3/questions.yaml similarity index 94% rename from charts/ix-chart/2206.0.2/questions.yaml rename to charts/ix-chart/2206.0.3/questions.yaml index 4b32d792ca..c5b711b8d8 100644 --- a/charts/ix-chart/2206.0.2/questions.yaml +++ b/charts/ix-chart/2206.0.3/questions.yaml @@ -21,6 +21,9 @@ groups: description: "Configure when pod should be restarted in case of failure" - name: "Resource Reservation" description: "Specify resources to be allocated to workload" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" + questions: # Workload type @@ -542,3 +545,28 @@ questions: label: "Add Capability" schema: type: string + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" \ No newline at end of file diff --git a/charts/ix-chart/2206.0.2/templates/NOTES.txt b/charts/ix-chart/2206.0.3/templates/NOTES.txt similarity index 100% rename from charts/ix-chart/2206.0.2/templates/NOTES.txt rename to charts/ix-chart/2206.0.3/templates/NOTES.txt diff --git a/charts/ix-chart/2206.0.2/templates/_containers.tpl b/charts/ix-chart/2206.0.3/templates/_containers.tpl similarity index 100% rename from charts/ix-chart/2206.0.2/templates/_containers.tpl rename to charts/ix-chart/2206.0.3/templates/_containers.tpl diff --git a/charts/ix-chart/2206.0.2/templates/_helpers.tpl b/charts/ix-chart/2206.0.3/templates/_helpers.tpl similarity index 100% rename from charts/ix-chart/2206.0.2/templates/_helpers.tpl rename to charts/ix-chart/2206.0.3/templates/_helpers.tpl diff --git a/charts/ix-chart/2206.0.2/templates/_networking.tpl b/charts/ix-chart/2206.0.3/templates/_networking.tpl similarity index 100% rename from charts/ix-chart/2206.0.2/templates/_networking.tpl rename to charts/ix-chart/2206.0.3/templates/_networking.tpl diff --git a/charts/ix-chart/2206.0.2/templates/_volumes.tpl b/charts/ix-chart/2206.0.3/templates/_volumes.tpl similarity index 100% rename from charts/ix-chart/2206.0.2/templates/_volumes.tpl rename to charts/ix-chart/2206.0.3/templates/_volumes.tpl diff --git a/test/ix-chart/2206.0.2/templates/_workload.tpl b/charts/ix-chart/2206.0.3/templates/_workload.tpl similarity index 98% rename from test/ix-chart/2206.0.2/templates/_workload.tpl rename to charts/ix-chart/2206.0.3/templates/_workload.tpl index 23f869a248..f0026ab02b 100644 --- a/test/ix-chart/2206.0.2/templates/_workload.tpl +++ b/charts/ix-chart/2206.0.3/templates/_workload.tpl @@ -54,6 +54,7 @@ restartPolicy: {{ template "restartPolicy" . }} hostNetwork: {{ template "hostNetworkingConfiguration" . }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 2 }} {{- include "volumeMountsConfiguration" . | indent 2}} tty: {{ .Values.tty }} stdin: {{ .Values.stdin }} diff --git a/charts/ix-chart/2206.0.2/templates/external-interfaces.yaml b/charts/ix-chart/2206.0.3/templates/external-interfaces.yaml similarity index 100% rename from charts/ix-chart/2206.0.2/templates/external-interfaces.yaml rename to charts/ix-chart/2206.0.3/templates/external-interfaces.yaml diff --git a/charts/ix-chart/2206.0.2/templates/service.yaml b/charts/ix-chart/2206.0.3/templates/service.yaml similarity index 100% rename from charts/ix-chart/2206.0.2/templates/service.yaml rename to charts/ix-chart/2206.0.3/templates/service.yaml diff --git a/charts/ix-chart/2206.0.2/templates/tests/deployment-check.yaml b/charts/ix-chart/2206.0.3/templates/tests/deployment-check.yaml similarity index 100% rename from charts/ix-chart/2206.0.2/templates/tests/deployment-check.yaml rename to charts/ix-chart/2206.0.3/templates/tests/deployment-check.yaml diff --git a/charts/ix-chart/2206.0.2/templates/workload.yaml b/charts/ix-chart/2206.0.3/templates/workload.yaml similarity index 100% rename from charts/ix-chart/2206.0.2/templates/workload.yaml rename to charts/ix-chart/2206.0.3/templates/workload.yaml diff --git a/charts/ix-chart/2206.0.2/test_values.yaml b/charts/ix-chart/2206.0.3/test_values.yaml similarity index 100% rename from charts/ix-chart/2206.0.2/test_values.yaml rename to charts/ix-chart/2206.0.3/test_values.yaml diff --git a/charts/machinaris/1.1.7/charts/common-2112.0.0.tgz b/charts/machinaris/1.1.7/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/machinaris/1.1.7/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/machinaris/1.1.7/requirements.lock b/charts/machinaris/1.1.7/requirements.lock deleted file mode 100644 index c555ad2636..0000000000 --- a/charts/machinaris/1.1.7/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T19:55:04.707082+05:00" diff --git a/charts/machinaris/1.1.7/.helmignore b/charts/machinaris/1.1.8/.helmignore similarity index 100% rename from charts/machinaris/1.1.7/.helmignore rename to charts/machinaris/1.1.8/.helmignore diff --git a/charts/machinaris/1.1.7/Chart.yaml b/charts/machinaris/1.1.8/Chart.yaml similarity index 80% rename from charts/machinaris/1.1.7/Chart.yaml rename to charts/machinaris/1.1.8/Chart.yaml index bc0c726f30..e8ff4cbfbc 100644 --- a/charts/machinaris/1.1.7/Chart.yaml +++ b/charts/machinaris/1.1.8/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v0.7.2 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Global, Versioned, peer-to-peer filesystem. home: https://github.com/guydavis/machinaris icon: https://raw.githubusercontent.com/guydavis/machinaris/main/web/static/favicon.ico @@ -14,4 +14,4 @@ keywords: name: machinaris sources: - https://github.com/guydavis/machinaris -version: 1.1.7 +version: 1.1.8 diff --git a/charts/machinaris/1.1.7/README.md b/charts/machinaris/1.1.8/README.md similarity index 100% rename from charts/machinaris/1.1.7/README.md rename to charts/machinaris/1.1.8/README.md diff --git a/charts/machinaris/1.1.7/app-readme.md b/charts/machinaris/1.1.8/app-readme.md similarity index 100% rename from charts/machinaris/1.1.7/app-readme.md rename to charts/machinaris/1.1.8/app-readme.md diff --git a/charts/machinaris/1.1.8/charts/common-2206.0.0.tgz b/charts/machinaris/1.1.8/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f144a0660b Binary files /dev/null and b/charts/machinaris/1.1.8/charts/common-2206.0.0.tgz differ diff --git a/charts/machinaris/1.1.7/ix_values.yaml b/charts/machinaris/1.1.8/ix_values.yaml similarity index 100% rename from charts/machinaris/1.1.7/ix_values.yaml rename to charts/machinaris/1.1.8/ix_values.yaml diff --git a/charts/machinaris/1.1.7/questions.yaml b/charts/machinaris/1.1.8/questions.yaml similarity index 99% rename from charts/machinaris/1.1.7/questions.yaml rename to charts/machinaris/1.1.8/questions.yaml index 2bd5dba87e..d7e2965221 100644 --- a/charts/machinaris/1.1.7/questions.yaml +++ b/charts/machinaris/1.1.8/questions.yaml @@ -221,20 +221,25 @@ questions: group: "Resource Limits" schema: type: boolean + default: false - variable: cpuLimit - label: "CPU limit" + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." group: "Resource Limits" schema: type: string show_if: [["enableResourceLimits", "=", true]] valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" - variable: memLimit - label: "Memory limit" + label: "Memory Limit" group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" schema: type: string show_if: [["enableResourceLimits", "=", true]] valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" # Cactus Configurations - variable: cactusEnabled diff --git a/charts/machinaris/1.1.8/requirements.lock b/charts/machinaris/1.1.8/requirements.lock new file mode 100644 index 0000000000..1ea08df473 --- /dev/null +++ b/charts/machinaris/1.1.8/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.521131693+05:00" diff --git a/charts/machinaris/1.1.7/templates/_helpers.tpl b/charts/machinaris/1.1.8/templates/_helpers.tpl similarity index 100% rename from charts/machinaris/1.1.7/templates/_helpers.tpl rename to charts/machinaris/1.1.8/templates/_helpers.tpl diff --git a/charts/machinaris/1.1.7/templates/coins-deployment.yaml b/charts/machinaris/1.1.8/templates/coins-deployment.yaml similarity index 100% rename from charts/machinaris/1.1.7/templates/coins-deployment.yaml rename to charts/machinaris/1.1.8/templates/coins-deployment.yaml diff --git a/charts/machinaris/1.1.7/templates/deployment.yaml b/charts/machinaris/1.1.8/templates/deployment.yaml similarity index 100% rename from charts/machinaris/1.1.7/templates/deployment.yaml rename to charts/machinaris/1.1.8/templates/deployment.yaml diff --git a/charts/machinaris/1.1.7/templates/service.yaml b/charts/machinaris/1.1.8/templates/service.yaml similarity index 100% rename from charts/machinaris/1.1.7/templates/service.yaml rename to charts/machinaris/1.1.8/templates/service.yaml diff --git a/charts/machinaris/1.1.7/templates/tests/cactus-check.yaml b/charts/machinaris/1.1.8/templates/tests/cactus-check.yaml similarity index 100% rename from charts/machinaris/1.1.7/templates/tests/cactus-check.yaml rename to charts/machinaris/1.1.8/templates/tests/cactus-check.yaml diff --git a/charts/machinaris/1.1.7/templates/tests/machinaris-check.yaml b/charts/machinaris/1.1.8/templates/tests/machinaris-check.yaml similarity index 100% rename from charts/machinaris/1.1.7/templates/tests/machinaris-check.yaml rename to charts/machinaris/1.1.8/templates/tests/machinaris-check.yaml diff --git a/charts/machinaris/1.1.7/test_values.yaml b/charts/machinaris/1.1.8/test_values.yaml similarity index 100% rename from charts/machinaris/1.1.7/test_values.yaml rename to charts/machinaris/1.1.8/test_values.yaml diff --git a/charts/minio/1.6.25/charts/common-2112.0.0.tgz b/charts/minio/1.6.25/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/minio/1.6.25/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/minio/1.6.25/requirements.lock b/charts/minio/1.6.25/requirements.lock deleted file mode 100644 index 7d9c01b810..0000000000 --- a/charts/minio/1.6.25/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.62541+05:00" diff --git a/charts/minio/1.6.25/.helmignore b/charts/minio/1.6.26/.helmignore similarity index 100% rename from charts/minio/1.6.25/.helmignore rename to charts/minio/1.6.26/.helmignore diff --git a/charts/minio/1.6.25/CHANGELOG.md b/charts/minio/1.6.26/CHANGELOG.md similarity index 100% rename from charts/minio/1.6.25/CHANGELOG.md rename to charts/minio/1.6.26/CHANGELOG.md diff --git a/charts/minio/1.6.25/Chart.yaml b/charts/minio/1.6.26/Chart.yaml similarity index 80% rename from charts/minio/1.6.25/Chart.yaml rename to charts/minio/1.6.26/Chart.yaml index 69d4239244..99b9252949 100644 --- a/charts/minio/1.6.25/Chart.yaml +++ b/charts/minio/1.6.26/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: '2022-06-25' dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: High Performance, Kubernetes Native Object Storage home: https://min.io icon: https://min.io/resources/img/logo/MINIO_wordmark.png @@ -16,4 +16,4 @@ sources: - https://github.com/minio/minio - https://github.com/minio/charts upstream_version: 8.0.5 -version: 1.6.25 +version: 1.6.26 diff --git a/charts/minio/1.6.25/README.md b/charts/minio/1.6.26/README.md similarity index 100% rename from charts/minio/1.6.25/README.md rename to charts/minio/1.6.26/README.md diff --git a/charts/minio/1.6.25/app-readme.md b/charts/minio/1.6.26/app-readme.md similarity index 100% rename from charts/minio/1.6.25/app-readme.md rename to charts/minio/1.6.26/app-readme.md diff --git a/charts/minio/1.6.26/charts/common-2206.0.0.tgz b/charts/minio/1.6.26/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/minio/1.6.26/charts/common-2206.0.0.tgz differ diff --git a/charts/minio/1.6.25/ix_values.yaml b/charts/minio/1.6.26/ix_values.yaml similarity index 100% rename from charts/minio/1.6.25/ix_values.yaml rename to charts/minio/1.6.26/ix_values.yaml diff --git a/charts/minio/1.6.25/migrations/migrate b/charts/minio/1.6.26/migrations/migrate similarity index 100% rename from charts/minio/1.6.25/migrations/migrate rename to charts/minio/1.6.26/migrations/migrate diff --git a/charts/minio/1.6.25/migrations/migrate_from_1.0.0 b/charts/minio/1.6.26/migrations/migrate_from_1.0.0 similarity index 100% rename from charts/minio/1.6.25/migrations/migrate_from_1.0.0 rename to charts/minio/1.6.26/migrations/migrate_from_1.0.0 diff --git a/charts/minio/1.6.25/questions.yaml b/charts/minio/1.6.26/questions.yaml similarity index 87% rename from charts/minio/1.6.25/questions.yaml rename to charts/minio/1.6.26/questions.yaml index de5d504673..fbe42d066d 100644 --- a/charts/minio/1.6.25/questions.yaml +++ b/charts/minio/1.6.26/questions.yaml @@ -9,6 +9,8 @@ groups: description: "Configure Storage for Nextcloud" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -250,3 +252,28 @@ questions: schema: type: hostpath required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/charts/minio/1.6.26/requirements.lock b/charts/minio/1.6.26/requirements.lock new file mode 100644 index 0000000000..d6dffce599 --- /dev/null +++ b/charts/minio/1.6.26/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.476831005+05:00" diff --git a/charts/minio/1.6.25/templates/NOTES.txt b/charts/minio/1.6.26/templates/NOTES.txt similarity index 100% rename from charts/minio/1.6.25/templates/NOTES.txt rename to charts/minio/1.6.26/templates/NOTES.txt diff --git a/charts/minio/1.6.25/templates/_cert.tpl b/charts/minio/1.6.26/templates/_cert.tpl similarity index 100% rename from charts/minio/1.6.25/templates/_cert.tpl rename to charts/minio/1.6.26/templates/_cert.tpl diff --git a/charts/minio/1.6.25/templates/_helpers.tpl b/charts/minio/1.6.26/templates/_helpers.tpl similarity index 100% rename from charts/minio/1.6.25/templates/_helpers.tpl rename to charts/minio/1.6.26/templates/_helpers.tpl diff --git a/charts/minio/1.6.25/templates/configmap.yaml b/charts/minio/1.6.26/templates/configmap.yaml similarity index 100% rename from charts/minio/1.6.25/templates/configmap.yaml rename to charts/minio/1.6.26/templates/configmap.yaml diff --git a/charts/minio/1.6.25/templates/deployment.yaml b/charts/minio/1.6.26/templates/deployment.yaml similarity index 98% rename from charts/minio/1.6.25/templates/deployment.yaml rename to charts/minio/1.6.26/templates/deployment.yaml index 28350458b8..042eabe123 100644 --- a/charts/minio/1.6.25/templates/deployment.yaml +++ b/charts/minio/1.6.26/templates/deployment.yaml @@ -34,6 +34,7 @@ spec: hostNetwork: {{ include "minio.hostNetworking" . }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{- include "minio.tlsKeysVolumeMount" . | nindent 12 }} diff --git a/charts/minio/1.6.25/templates/pre-install-job.yaml b/charts/minio/1.6.26/templates/pre-install-job.yaml similarity index 100% rename from charts/minio/1.6.25/templates/pre-install-job.yaml rename to charts/minio/1.6.26/templates/pre-install-job.yaml diff --git a/charts/minio/1.6.25/templates/secrets.yaml b/charts/minio/1.6.26/templates/secrets.yaml similarity index 100% rename from charts/minio/1.6.25/templates/secrets.yaml rename to charts/minio/1.6.26/templates/secrets.yaml diff --git a/charts/minio/1.6.25/templates/service.yaml b/charts/minio/1.6.26/templates/service.yaml similarity index 100% rename from charts/minio/1.6.25/templates/service.yaml rename to charts/minio/1.6.26/templates/service.yaml diff --git a/charts/minio/1.6.25/templates/serviceaccount.yaml b/charts/minio/1.6.26/templates/serviceaccount.yaml similarity index 100% rename from charts/minio/1.6.25/templates/serviceaccount.yaml rename to charts/minio/1.6.26/templates/serviceaccount.yaml diff --git a/charts/minio/1.6.25/templates/tests/deployment-check.yaml b/charts/minio/1.6.26/templates/tests/deployment-check.yaml similarity index 100% rename from charts/minio/1.6.25/templates/tests/deployment-check.yaml rename to charts/minio/1.6.26/templates/tests/deployment-check.yaml diff --git a/charts/minio/1.6.25/test_values.yaml b/charts/minio/1.6.26/test_values.yaml similarity index 100% rename from charts/minio/1.6.25/test_values.yaml rename to charts/minio/1.6.26/test_values.yaml diff --git a/charts/netdata/1.0.7/charts/common-2112.0.0.tgz b/charts/netdata/1.0.7/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/netdata/1.0.7/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/netdata/1.0.7/requirements.lock b/charts/netdata/1.0.7/requirements.lock deleted file mode 100644 index 7d9c01b810..0000000000 --- a/charts/netdata/1.0.7/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.62541+05:00" diff --git a/charts/netdata/1.0.7/.helmignore b/charts/netdata/1.0.8/.helmignore similarity index 100% rename from charts/netdata/1.0.7/.helmignore rename to charts/netdata/1.0.8/.helmignore diff --git a/test/netdata/1.0.7/Chart.yaml b/charts/netdata/1.0.8/Chart.yaml similarity index 80% rename from test/netdata/1.0.7/Chart.yaml rename to charts/netdata/1.0.8/Chart.yaml index 146cc653d7..4f6d65dba8 100644 --- a/test/netdata/1.0.7/Chart.yaml +++ b/charts/netdata/1.0.8/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v1.35.1 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Real-time performance monitoring, done right! home: https://www.netdata.cloud/ icon: https://netdata.github.io/helmchart/logo.png @@ -16,4 +16,4 @@ sources: - https://github.com/netdata/helmchart - https://github.com/netdata/netdata upstream_version: 3.7.12 -version: 1.0.7 +version: 1.0.8 diff --git a/charts/netdata/1.0.7/README.md b/charts/netdata/1.0.8/README.md similarity index 100% rename from charts/netdata/1.0.7/README.md rename to charts/netdata/1.0.8/README.md diff --git a/charts/netdata/1.0.7/app-readme.md b/charts/netdata/1.0.8/app-readme.md similarity index 100% rename from charts/netdata/1.0.7/app-readme.md rename to charts/netdata/1.0.8/app-readme.md diff --git a/charts/netdata/1.0.8/charts/common-2206.0.0.tgz b/charts/netdata/1.0.8/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/netdata/1.0.8/charts/common-2206.0.0.tgz differ diff --git a/charts/netdata/1.0.7/ix_values.yaml b/charts/netdata/1.0.8/ix_values.yaml similarity index 100% rename from charts/netdata/1.0.7/ix_values.yaml rename to charts/netdata/1.0.8/ix_values.yaml diff --git a/test/netdata/1.0.7/questions.yaml b/charts/netdata/1.0.8/questions.yaml similarity index 87% rename from test/netdata/1.0.7/questions.yaml rename to charts/netdata/1.0.8/questions.yaml index 69d76c018f..1e1b727e69 100644 --- a/test/netdata/1.0.7/questions.yaml +++ b/charts/netdata/1.0.8/questions.yaml @@ -9,6 +9,8 @@ groups: description: "Configure Storage for Netdata" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -224,3 +226,28 @@ questions: schema: type: hostpath required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/charts/netdata/1.0.8/requirements.lock b/charts/netdata/1.0.8/requirements.lock new file mode 100644 index 0000000000..2257736493 --- /dev/null +++ b/charts/netdata/1.0.8/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.02504434+05:00" diff --git a/charts/netdata/1.0.7/templates/_helpers.tpl b/charts/netdata/1.0.8/templates/_helpers.tpl similarity index 100% rename from charts/netdata/1.0.7/templates/_helpers.tpl rename to charts/netdata/1.0.8/templates/_helpers.tpl diff --git a/charts/netdata/1.0.7/templates/clusterrole.yaml b/charts/netdata/1.0.8/templates/clusterrole.yaml similarity index 100% rename from charts/netdata/1.0.7/templates/clusterrole.yaml rename to charts/netdata/1.0.8/templates/clusterrole.yaml diff --git a/charts/netdata/1.0.7/templates/clusterrolebinding.yaml b/charts/netdata/1.0.8/templates/clusterrolebinding.yaml similarity index 100% rename from charts/netdata/1.0.7/templates/clusterrolebinding.yaml rename to charts/netdata/1.0.8/templates/clusterrolebinding.yaml diff --git a/test/netdata/1.0.7/templates/deployment.yaml b/charts/netdata/1.0.8/templates/deployment.yaml similarity index 97% rename from test/netdata/1.0.7/templates/deployment.yaml rename to charts/netdata/1.0.8/templates/deployment.yaml index 65dd93746d..aed5f5a367 100644 --- a/test/netdata/1.0.7/templates/deployment.yaml +++ b/charts/netdata/1.0.8/templates/deployment.yaml @@ -28,6 +28,7 @@ spec: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{ include "common.resources.limitaion" . | nindent 10 }} env: {{ $envList := (default list .Values.environmentVariables) }} {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} diff --git a/charts/netdata/1.0.7/templates/pre-install-job.yaml b/charts/netdata/1.0.8/templates/pre-install-job.yaml similarity index 100% rename from charts/netdata/1.0.7/templates/pre-install-job.yaml rename to charts/netdata/1.0.8/templates/pre-install-job.yaml diff --git a/charts/netdata/1.0.7/templates/service.yaml b/charts/netdata/1.0.8/templates/service.yaml similarity index 100% rename from charts/netdata/1.0.7/templates/service.yaml rename to charts/netdata/1.0.8/templates/service.yaml diff --git a/charts/netdata/1.0.7/templates/serviceaccount.yaml b/charts/netdata/1.0.8/templates/serviceaccount.yaml similarity index 100% rename from charts/netdata/1.0.7/templates/serviceaccount.yaml rename to charts/netdata/1.0.8/templates/serviceaccount.yaml diff --git a/charts/netdata/1.0.7/templates/tests/deployment-check.yaml b/charts/netdata/1.0.8/templates/tests/deployment-check.yaml similarity index 100% rename from charts/netdata/1.0.7/templates/tests/deployment-check.yaml rename to charts/netdata/1.0.8/templates/tests/deployment-check.yaml diff --git a/charts/netdata/1.0.7/test_values.yaml b/charts/netdata/1.0.8/test_values.yaml similarity index 100% rename from charts/netdata/1.0.7/test_values.yaml rename to charts/netdata/1.0.8/test_values.yaml diff --git a/charts/nextcloud/1.6.3/Chart.lock b/charts/nextcloud/1.6.3/Chart.lock deleted file mode 100644 index ab8e203f89..0000000000 --- a/charts/nextcloud/1.6.3/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-22T02:45:30.570293724+05:00" diff --git a/charts/nextcloud/1.6.3/charts/common-2112.0.0.tgz b/charts/nextcloud/1.6.3/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/nextcloud/1.6.3/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/nextcloud/1.6.3/.helmignore b/charts/nextcloud/1.6.4/.helmignore similarity index 100% rename from charts/nextcloud/1.6.3/.helmignore rename to charts/nextcloud/1.6.4/.helmignore diff --git a/charts/nextcloud/1.6.4/Chart.lock b/charts/nextcloud/1.6.4/Chart.lock new file mode 100644 index 0000000000..2fff9bc91e --- /dev/null +++ b/charts/nextcloud/1.6.4/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:50.949598386+05:00" diff --git a/charts/nextcloud/1.6.3/Chart.yaml b/charts/nextcloud/1.6.4/Chart.yaml similarity index 84% rename from charts/nextcloud/1.6.3/Chart.yaml rename to charts/nextcloud/1.6.4/Chart.yaml index 73f861705c..f1559daf1a 100644 --- a/charts/nextcloud/1.6.3/Chart.yaml +++ b/charts/nextcloud/1.6.4/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: 24.0.2 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: A file sharing server that puts the control and security of your own data back into your hands. home: https://nextcloud.com/ @@ -19,4 +19,4 @@ sources: - https://github.com/nextcloud/docker - https://github.com/nextcloud/helm upstream_version: 2.3.2 -version: 1.6.3 +version: 1.6.4 diff --git a/charts/nextcloud/1.6.3/README.md b/charts/nextcloud/1.6.4/README.md similarity index 100% rename from charts/nextcloud/1.6.3/README.md rename to charts/nextcloud/1.6.4/README.md diff --git a/charts/nextcloud/1.6.3/app-readme.md b/charts/nextcloud/1.6.4/app-readme.md similarity index 100% rename from charts/nextcloud/1.6.3/app-readme.md rename to charts/nextcloud/1.6.4/app-readme.md diff --git a/charts/nextcloud/1.6.4/charts/common-2206.0.0.tgz b/charts/nextcloud/1.6.4/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/nextcloud/1.6.4/charts/common-2206.0.0.tgz differ diff --git a/charts/nextcloud/1.6.3/ix_values.yaml b/charts/nextcloud/1.6.4/ix_values.yaml similarity index 100% rename from charts/nextcloud/1.6.3/ix_values.yaml rename to charts/nextcloud/1.6.4/ix_values.yaml diff --git a/charts/nextcloud/1.6.3/migrations/migrate_from_1.1.0 b/charts/nextcloud/1.6.4/migrations/migrate_from_1.1.0 similarity index 100% rename from charts/nextcloud/1.6.3/migrations/migrate_from_1.1.0 rename to charts/nextcloud/1.6.4/migrations/migrate_from_1.1.0 diff --git a/test/nextcloud/1.6.3/questions.yaml b/charts/nextcloud/1.6.4/questions.yaml similarity index 89% rename from test/nextcloud/1.6.3/questions.yaml rename to charts/nextcloud/1.6.4/questions.yaml index d2394b42b4..336e27e633 100644 --- a/test/nextcloud/1.6.3/questions.yaml +++ b/charts/nextcloud/1.6.4/questions.yaml @@ -15,6 +15,9 @@ groups: description: "Configure how pods are replaced when configuration is upgraded" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" + portals: web_portal: @@ -268,3 +271,28 @@ questions: type: path editable: false default: "/postgres_backups" + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" \ No newline at end of file diff --git a/charts/nextcloud/1.6.3/requirements.lock b/charts/nextcloud/1.6.4/requirements.lock similarity index 67% rename from charts/nextcloud/1.6.3/requirements.lock rename to charts/nextcloud/1.6.4/requirements.lock index 4a7c02f48d..dabf2b287f 100644 --- a/charts/nextcloud/1.6.3/requirements.lock +++ b/charts/nextcloud/1.6.4/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 generated: "2021-05-10T13:07:35.423192+05:00" diff --git a/charts/nextcloud/1.6.3/templates/NOTES.txt b/charts/nextcloud/1.6.4/templates/NOTES.txt similarity index 100% rename from charts/nextcloud/1.6.3/templates/NOTES.txt rename to charts/nextcloud/1.6.4/templates/NOTES.txt diff --git a/charts/nextcloud/1.6.3/templates/_nginx.tpl b/charts/nextcloud/1.6.4/templates/_nginx.tpl similarity index 100% rename from charts/nextcloud/1.6.3/templates/_nginx.tpl rename to charts/nextcloud/1.6.4/templates/_nginx.tpl diff --git a/charts/nextcloud/1.6.3/templates/_postgres.tpl b/charts/nextcloud/1.6.4/templates/_postgres.tpl similarity index 100% rename from charts/nextcloud/1.6.3/templates/_postgres.tpl rename to charts/nextcloud/1.6.4/templates/_postgres.tpl diff --git a/charts/nextcloud/1.6.3/templates/backup-postgres-config.yaml b/charts/nextcloud/1.6.4/templates/backup-postgres-config.yaml similarity index 100% rename from charts/nextcloud/1.6.3/templates/backup-postgres-config.yaml rename to charts/nextcloud/1.6.4/templates/backup-postgres-config.yaml diff --git a/charts/nextcloud/1.6.3/templates/backup-postgres-hook.yaml b/charts/nextcloud/1.6.4/templates/backup-postgres-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.3/templates/backup-postgres-hook.yaml rename to charts/nextcloud/1.6.4/templates/backup-postgres-hook.yaml diff --git a/charts/nextcloud/1.6.3/templates/cronjob.yaml b/charts/nextcloud/1.6.4/templates/cronjob.yaml similarity index 100% rename from charts/nextcloud/1.6.3/templates/cronjob.yaml rename to charts/nextcloud/1.6.4/templates/cronjob.yaml diff --git a/charts/nextcloud/1.6.3/templates/deployment.yaml b/charts/nextcloud/1.6.4/templates/deployment.yaml similarity index 98% rename from charts/nextcloud/1.6.3/templates/deployment.yaml rename to charts/nextcloud/1.6.4/templates/deployment.yaml index eb0bacde36..f89ebe180b 100644 --- a/charts/nextcloud/1.6.3/templates/deployment.yaml +++ b/charts/nextcloud/1.6.4/templates/deployment.yaml @@ -28,6 +28,7 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} protocol: TCP {{ end }} - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 8 }} {{ include "common.containers.imageConfig" .Values.image | nindent 8 }} env: {{ include "postgres.envVariableConfiguration" $postgres_values | nindent 10 }} {{ $envList := list }} diff --git a/charts/nextcloud/1.6.3/templates/nginx-configmap.yaml b/charts/nextcloud/1.6.4/templates/nginx-configmap.yaml similarity index 100% rename from charts/nextcloud/1.6.3/templates/nginx-configmap.yaml rename to charts/nextcloud/1.6.4/templates/nginx-configmap.yaml diff --git a/charts/nextcloud/1.6.3/templates/nginx-secret.yaml b/charts/nextcloud/1.6.4/templates/nginx-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.3/templates/nginx-secret.yaml rename to charts/nextcloud/1.6.4/templates/nginx-secret.yaml diff --git a/charts/nextcloud/1.6.3/templates/nuke-deployments-hook.yaml b/charts/nextcloud/1.6.4/templates/nuke-deployments-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.3/templates/nuke-deployments-hook.yaml rename to charts/nextcloud/1.6.4/templates/nuke-deployments-hook.yaml diff --git a/charts/nextcloud/1.6.3/templates/postgres-deployment.yaml b/charts/nextcloud/1.6.4/templates/postgres-deployment.yaml similarity index 100% rename from charts/nextcloud/1.6.3/templates/postgres-deployment.yaml rename to charts/nextcloud/1.6.4/templates/postgres-deployment.yaml diff --git a/charts/nextcloud/1.6.3/templates/postgres-secret.yaml b/charts/nextcloud/1.6.4/templates/postgres-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.3/templates/postgres-secret.yaml rename to charts/nextcloud/1.6.4/templates/postgres-secret.yaml diff --git a/charts/nextcloud/1.6.3/templates/postgres-service.yaml b/charts/nextcloud/1.6.4/templates/postgres-service.yaml similarity index 100% rename from charts/nextcloud/1.6.3/templates/postgres-service.yaml rename to charts/nextcloud/1.6.4/templates/postgres-service.yaml diff --git a/charts/nextcloud/1.6.3/templates/secrets.yaml b/charts/nextcloud/1.6.4/templates/secrets.yaml similarity index 100% rename from charts/nextcloud/1.6.3/templates/secrets.yaml rename to charts/nextcloud/1.6.4/templates/secrets.yaml diff --git a/charts/nextcloud/1.6.3/templates/service.yaml b/charts/nextcloud/1.6.4/templates/service.yaml similarity index 100% rename from charts/nextcloud/1.6.3/templates/service.yaml rename to charts/nextcloud/1.6.4/templates/service.yaml diff --git a/charts/nextcloud/1.6.3/templates/serviceaccount.yaml b/charts/nextcloud/1.6.4/templates/serviceaccount.yaml similarity index 100% rename from charts/nextcloud/1.6.3/templates/serviceaccount.yaml rename to charts/nextcloud/1.6.4/templates/serviceaccount.yaml diff --git a/charts/nextcloud/1.6.3/templates/tests/deployment-check.yaml b/charts/nextcloud/1.6.4/templates/tests/deployment-check.yaml similarity index 100% rename from charts/nextcloud/1.6.3/templates/tests/deployment-check.yaml rename to charts/nextcloud/1.6.4/templates/tests/deployment-check.yaml diff --git a/charts/nextcloud/1.6.3/test_values.yaml b/charts/nextcloud/1.6.4/test_values.yaml similarity index 100% rename from charts/nextcloud/1.6.3/test_values.yaml rename to charts/nextcloud/1.6.4/test_values.yaml diff --git a/charts/photoprism/1.0.3/Chart.lock b/charts/photoprism/1.0.3/Chart.lock deleted file mode 100644 index c673f7db60..0000000000 --- a/charts/photoprism/1.0.3/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-14T16:04:57.43577594+05:00" diff --git a/charts/photoprism/1.0.3/charts/common-2112.0.0.tgz b/charts/photoprism/1.0.3/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/photoprism/1.0.3/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/photoprism/1.0.4/Chart.lock b/charts/photoprism/1.0.4/Chart.lock new file mode 100644 index 0000000000..2b4d22651e --- /dev/null +++ b/charts/photoprism/1.0.4/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.245474471+05:00" diff --git a/charts/photoprism/1.0.3/Chart.yaml b/charts/photoprism/1.0.4/Chart.yaml similarity index 75% rename from charts/photoprism/1.0.3/Chart.yaml rename to charts/photoprism/1.0.4/Chart.yaml index 1e1e3132f3..a2d6c6985e 100644 --- a/charts/photoprism/1.0.3/Chart.yaml +++ b/charts/photoprism/1.0.4/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "20220121" icon: https://photoprism.app/static/icons/logo.svg description: AI-powered app for browsing, organizing & sharing your photo collection. name: photoprism -version: 1.0.3 +version: 1.0.4 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 home: https://photoprism.app/ keywords: - media diff --git a/charts/photoprism/1.0.3/README.md b/charts/photoprism/1.0.4/README.md similarity index 100% rename from charts/photoprism/1.0.3/README.md rename to charts/photoprism/1.0.4/README.md diff --git a/charts/photoprism/1.0.3/app-readme.md b/charts/photoprism/1.0.4/app-readme.md similarity index 100% rename from charts/photoprism/1.0.3/app-readme.md rename to charts/photoprism/1.0.4/app-readme.md diff --git a/charts/photoprism/1.0.4/charts/common-2206.0.0.tgz b/charts/photoprism/1.0.4/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/photoprism/1.0.4/charts/common-2206.0.0.tgz differ diff --git a/charts/photoprism/1.0.3/ix_values.yaml b/charts/photoprism/1.0.4/ix_values.yaml similarity index 100% rename from charts/photoprism/1.0.3/ix_values.yaml rename to charts/photoprism/1.0.4/ix_values.yaml diff --git a/test/photoprism/1.0.3/questions.yaml b/charts/photoprism/1.0.4/questions.yaml similarity index 88% rename from test/photoprism/1.0.3/questions.yaml rename to charts/photoprism/1.0.4/questions.yaml index 269a6b72bf..3149d64b81 100644 --- a/test/photoprism/1.0.3/questions.yaml +++ b/charts/photoprism/1.0.4/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Networking Configuration for photo prism" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -252,4 +254,29 @@ questions: description: "Host path" schema: type: hostpath - required: true \ No newline at end of file + required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/test/photoprism/1.0.3/templates/deployment.yaml b/charts/photoprism/1.0.4/templates/deployment.yaml similarity index 97% rename from test/photoprism/1.0.3/templates/deployment.yaml rename to charts/photoprism/1.0.4/templates/deployment.yaml index e739b462c2..b06f324420 100644 --- a/test/photoprism/1.0.3/templates/deployment.yaml +++ b/charts/photoprism/1.0.4/templates/deployment.yaml @@ -30,6 +30,7 @@ spec: hostNetwork: false containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} diff --git a/charts/photoprism/1.0.3/templates/pre-install-job.yaml b/charts/photoprism/1.0.4/templates/pre-install-job.yaml similarity index 100% rename from charts/photoprism/1.0.3/templates/pre-install-job.yaml rename to charts/photoprism/1.0.4/templates/pre-install-job.yaml diff --git a/charts/photoprism/1.0.3/templates/secret.yaml b/charts/photoprism/1.0.4/templates/secret.yaml similarity index 100% rename from charts/photoprism/1.0.3/templates/secret.yaml rename to charts/photoprism/1.0.4/templates/secret.yaml diff --git a/charts/photoprism/1.0.3/templates/service.yaml b/charts/photoprism/1.0.4/templates/service.yaml similarity index 100% rename from charts/photoprism/1.0.3/templates/service.yaml rename to charts/photoprism/1.0.4/templates/service.yaml diff --git a/charts/photoprism/1.0.3/templates/tests/deployment-check.yaml b/charts/photoprism/1.0.4/templates/tests/deployment-check.yaml similarity index 100% rename from charts/photoprism/1.0.3/templates/tests/deployment-check.yaml rename to charts/photoprism/1.0.4/templates/tests/deployment-check.yaml diff --git a/charts/photoprism/1.0.3/test_values.yaml b/charts/photoprism/1.0.4/test_values.yaml similarity index 100% rename from charts/photoprism/1.0.3/test_values.yaml rename to charts/photoprism/1.0.4/test_values.yaml diff --git a/charts/pihole/1.0.3/Chart.lock b/charts/pihole/1.0.3/Chart.lock deleted file mode 100644 index cec0ddc7dc..0000000000 --- a/charts/pihole/1.0.3/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-14T16:04:57.624264811+05:00" diff --git a/charts/pihole/1.0.3/charts/common-2112.0.0.tgz b/charts/pihole/1.0.3/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/pihole/1.0.3/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/pihole/1.0.4/Chart.lock b/charts/pihole/1.0.4/Chart.lock new file mode 100644 index 0000000000..c9228c9abc --- /dev/null +++ b/charts/pihole/1.0.4/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.387055978+05:00" diff --git a/charts/pihole/1.0.3/Chart.yaml b/charts/pihole/1.0.4/Chart.yaml similarity index 73% rename from charts/pihole/1.0.3/Chart.yaml rename to charts/pihole/1.0.4/Chart.yaml index 35ba7bce94..4493c3e86e 100644 --- a/charts/pihole/1.0.3/Chart.yaml +++ b/charts/pihole/1.0.4/Chart.yaml @@ -3,11 +3,11 @@ appVersion: 2022.04.3 icon: https://truecharts.org/_static/img/appicons/pihole.png description: DNS and Ad-filtering for your network. name: pihole -version: 1.0.3 +version: 1.0.4 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 home: https://pi-hole.net/ keywords: - networking diff --git a/charts/pihole/1.0.3/README.md b/charts/pihole/1.0.4/README.md similarity index 100% rename from charts/pihole/1.0.3/README.md rename to charts/pihole/1.0.4/README.md diff --git a/charts/pihole/1.0.3/app-readme.md b/charts/pihole/1.0.4/app-readme.md similarity index 100% rename from charts/pihole/1.0.3/app-readme.md rename to charts/pihole/1.0.4/app-readme.md diff --git a/charts/pihole/1.0.4/charts/common-2206.0.0.tgz b/charts/pihole/1.0.4/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/pihole/1.0.4/charts/common-2206.0.0.tgz differ diff --git a/charts/pihole/1.0.3/ix_values.yaml b/charts/pihole/1.0.4/ix_values.yaml similarity index 100% rename from charts/pihole/1.0.3/ix_values.yaml rename to charts/pihole/1.0.4/ix_values.yaml diff --git a/test/pihole/1.0.3/questions.yaml b/charts/pihole/1.0.4/questions.yaml similarity index 87% rename from test/pihole/1.0.3/questions.yaml rename to charts/pihole/1.0.4/questions.yaml index c5b125ff64..3c7c2e6795 100644 --- a/test/pihole/1.0.3/questions.yaml +++ b/charts/pihole/1.0.4/questions.yaml @@ -7,6 +7,9 @@ groups: description: "Networking Configuration for pihole" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" + portals: web_portal: @@ -257,4 +260,29 @@ questions: description: "Host path" schema: type: hostpath - required: true \ No newline at end of file + required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/charts/pihole/1.0.3/templates/deployment.yaml b/charts/pihole/1.0.4/templates/deployment.yaml similarity index 97% rename from charts/pihole/1.0.3/templates/deployment.yaml rename to charts/pihole/1.0.4/templates/deployment.yaml index e6ed06ec4f..fb737c0326 100644 --- a/charts/pihole/1.0.3/templates/deployment.yaml +++ b/charts/pihole/1.0.4/templates/deployment.yaml @@ -30,6 +30,7 @@ spec: hostNetwork: {{ .Values.hostNetwork }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} diff --git a/charts/pihole/1.0.3/templates/pre-install-job.yaml b/charts/pihole/1.0.4/templates/pre-install-job.yaml similarity index 100% rename from charts/pihole/1.0.3/templates/pre-install-job.yaml rename to charts/pihole/1.0.4/templates/pre-install-job.yaml diff --git a/charts/pihole/1.0.3/templates/secret.yaml b/charts/pihole/1.0.4/templates/secret.yaml similarity index 100% rename from charts/pihole/1.0.3/templates/secret.yaml rename to charts/pihole/1.0.4/templates/secret.yaml diff --git a/charts/pihole/1.0.3/templates/service.yaml b/charts/pihole/1.0.4/templates/service.yaml similarity index 100% rename from charts/pihole/1.0.3/templates/service.yaml rename to charts/pihole/1.0.4/templates/service.yaml diff --git a/charts/pihole/1.0.3/templates/tests/deployment-check.yaml b/charts/pihole/1.0.4/templates/tests/deployment-check.yaml similarity index 100% rename from charts/pihole/1.0.3/templates/tests/deployment-check.yaml rename to charts/pihole/1.0.4/templates/tests/deployment-check.yaml diff --git a/charts/pihole/1.0.3/test_values.yaml b/charts/pihole/1.0.4/test_values.yaml similarity index 100% rename from charts/pihole/1.0.3/test_values.yaml rename to charts/pihole/1.0.4/test_values.yaml diff --git a/charts/plex/1.7.12/Chart.lock b/charts/plex/1.7.12/Chart.lock deleted file mode 100644 index c186a59bae..0000000000 --- a/charts/plex/1.7.12/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.698767+05:00" diff --git a/charts/plex/1.7.12/charts/common-2112.0.0.tgz b/charts/plex/1.7.12/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/plex/1.7.12/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/plex/1.7.12/.helmignore b/charts/plex/1.7.13/.helmignore similarity index 100% rename from charts/plex/1.7.12/.helmignore rename to charts/plex/1.7.13/.helmignore diff --git a/charts/plex/1.7.13/Chart.lock b/charts/plex/1.7.13/Chart.lock new file mode 100644 index 0000000000..9360a2a646 --- /dev/null +++ b/charts/plex/1.7.13/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:50.989496155+05:00" diff --git a/charts/plex/1.7.12/Chart.yaml b/charts/plex/1.7.13/Chart.yaml similarity index 80% rename from charts/plex/1.7.12/Chart.yaml rename to charts/plex/1.7.13/Chart.yaml index 4a9a613a85..5c386daa4f 100644 --- a/charts/plex/1.7.12/Chart.yaml +++ b/charts/plex/1.7.13/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: 1.27.1.5916 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Plex Media Server home: https://plex.tv/ icon: https://www.plex.tv/wp-content/uploads/2018/01/pmp-icon-1.png @@ -14,4 +14,4 @@ sources: - https://hub.docker.com/r/plexinc/pms-docker/ - https://github.com/k8s-at-home/charts/tree/master/charts/plex upstream_version: 2.1.0 -version: 1.7.12 +version: 1.7.13 diff --git a/charts/plex/1.7.12/README.md b/charts/plex/1.7.13/README.md similarity index 100% rename from charts/plex/1.7.12/README.md rename to charts/plex/1.7.13/README.md diff --git a/charts/plex/1.7.12/app-readme.md b/charts/plex/1.7.13/app-readme.md similarity index 100% rename from charts/plex/1.7.12/app-readme.md rename to charts/plex/1.7.13/app-readme.md diff --git a/charts/plex/1.7.13/charts/common-2206.0.0.tgz b/charts/plex/1.7.13/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/plex/1.7.13/charts/common-2206.0.0.tgz differ diff --git a/charts/plex/1.7.12/default_values.yaml b/charts/plex/1.7.13/default_values.yaml similarity index 100% rename from charts/plex/1.7.12/default_values.yaml rename to charts/plex/1.7.13/default_values.yaml diff --git a/charts/plex/1.7.12/ix_values.yaml b/charts/plex/1.7.13/ix_values.yaml similarity index 100% rename from charts/plex/1.7.12/ix_values.yaml rename to charts/plex/1.7.13/ix_values.yaml diff --git a/charts/plex/1.7.12/migrations/migrate_from_1.0.0 b/charts/plex/1.7.13/migrations/migrate_from_1.0.0 similarity index 100% rename from charts/plex/1.7.12/migrations/migrate_from_1.0.0 rename to charts/plex/1.7.13/migrations/migrate_from_1.0.0 diff --git a/test/plex/1.7.12/questions.yaml b/charts/plex/1.7.13/questions.yaml similarity index 91% rename from test/plex/1.7.12/questions.yaml rename to charts/plex/1.7.13/questions.yaml index 2c6c3ce108..ef84008462 100644 --- a/test/plex/1.7.12/questions.yaml +++ b/charts/plex/1.7.13/questions.yaml @@ -15,6 +15,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -332,3 +334,28 @@ questions: schema: type: boolean default: false + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/charts/plex/1.7.12/templates/NOTES.txt b/charts/plex/1.7.13/templates/NOTES.txt similarity index 100% rename from charts/plex/1.7.12/templates/NOTES.txt rename to charts/plex/1.7.13/templates/NOTES.txt diff --git a/test/plex/1.7.12/templates/deployment.yaml b/charts/plex/1.7.13/templates/deployment.yaml similarity index 98% rename from test/plex/1.7.12/templates/deployment.yaml rename to charts/plex/1.7.13/templates/deployment.yaml index dcf080930a..78b6a631c8 100644 --- a/test/plex/1.7.12/templates/deployment.yaml +++ b/charts/plex/1.7.13/templates/deployment.yaml @@ -10,6 +10,7 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} hostname: {{ template "common.names.fullname" . }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ if .Values.enablePlexPass }} {{ include "common.containers.imageConfig" .Values.plexpassImage | nindent 10 }} {{ else }} diff --git a/charts/plex/1.7.12/templates/probe_config.yaml b/charts/plex/1.7.13/templates/probe_config.yaml similarity index 100% rename from charts/plex/1.7.12/templates/probe_config.yaml rename to charts/plex/1.7.13/templates/probe_config.yaml diff --git a/charts/plex/1.7.12/templates/service-tcp.yaml b/charts/plex/1.7.13/templates/service-tcp.yaml similarity index 100% rename from charts/plex/1.7.12/templates/service-tcp.yaml rename to charts/plex/1.7.13/templates/service-tcp.yaml diff --git a/charts/plex/1.7.12/templates/service-udp.yaml b/charts/plex/1.7.13/templates/service-udp.yaml similarity index 100% rename from charts/plex/1.7.12/templates/service-udp.yaml rename to charts/plex/1.7.13/templates/service-udp.yaml diff --git a/charts/plex/1.7.12/templates/tests/deployment-check.yaml b/charts/plex/1.7.13/templates/tests/deployment-check.yaml similarity index 100% rename from charts/plex/1.7.12/templates/tests/deployment-check.yaml rename to charts/plex/1.7.13/templates/tests/deployment-check.yaml diff --git a/charts/plex/1.7.12/test_values.yaml b/charts/plex/1.7.13/test_values.yaml similarity index 100% rename from charts/plex/1.7.12/test_values.yaml rename to charts/plex/1.7.13/test_values.yaml diff --git a/charts/qbittorent/1.0.3/Chart.lock b/charts/qbittorent/1.0.3/Chart.lock deleted file mode 100644 index 3c77e9473e..0000000000 --- a/charts/qbittorent/1.0.3/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-14T16:04:57.472799995+05:00" diff --git a/charts/qbittorent/1.0.3/charts/common-2112.0.0.tgz b/charts/qbittorent/1.0.3/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/qbittorent/1.0.3/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/qbittorent/1.0.4/Chart.lock b/charts/qbittorent/1.0.4/Chart.lock new file mode 100644 index 0000000000..811ac5dea2 --- /dev/null +++ b/charts/qbittorent/1.0.4/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.304590324+05:00" diff --git a/test/qbittorent/1.0.3/Chart.yaml b/charts/qbittorent/1.0.4/Chart.yaml similarity index 74% rename from test/qbittorent/1.0.3/Chart.yaml rename to charts/qbittorent/1.0.4/Chart.yaml index 2537623235..4549fde4b8 100644 --- a/test/qbittorent/1.0.3/Chart.yaml +++ b/charts/qbittorent/1.0.4/Chart.yaml @@ -3,11 +3,11 @@ appVersion: 2.3.1 icon: https://truecharts.org/_static/img/appicons/qbittorrent.png description: Download data from qbittorent. name: qbittorent -version: 1.0.3 +version: 1.0.4 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 home: https://www.qbittorrent.org/ keywords: - storage diff --git a/charts/qbittorent/1.0.3/README.md b/charts/qbittorent/1.0.4/README.md similarity index 100% rename from charts/qbittorent/1.0.3/README.md rename to charts/qbittorent/1.0.4/README.md diff --git a/charts/qbittorent/1.0.3/app-readme.md b/charts/qbittorent/1.0.4/app-readme.md similarity index 100% rename from charts/qbittorent/1.0.3/app-readme.md rename to charts/qbittorent/1.0.4/app-readme.md diff --git a/charts/qbittorent/1.0.4/charts/common-2206.0.0.tgz b/charts/qbittorent/1.0.4/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/qbittorent/1.0.4/charts/common-2206.0.0.tgz differ diff --git a/charts/qbittorent/1.0.3/ix_values.yaml b/charts/qbittorent/1.0.4/ix_values.yaml similarity index 100% rename from charts/qbittorent/1.0.3/ix_values.yaml rename to charts/qbittorent/1.0.4/ix_values.yaml diff --git a/test/qbittorent/1.0.3/questions.yaml b/charts/qbittorent/1.0.4/questions.yaml similarity index 85% rename from test/qbittorent/1.0.3/questions.yaml rename to charts/qbittorent/1.0.4/questions.yaml index 921fd7412d..317ccb1c22 100644 --- a/test/qbittorent/1.0.3/questions.yaml +++ b/charts/qbittorent/1.0.4/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Networking Configuration for qbittorent" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -221,4 +223,29 @@ questions: description: "Host path" schema: type: hostpath - required: true \ No newline at end of file + required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/test/qbittorent/1.0.3/templates/deployment.yaml b/charts/qbittorent/1.0.4/templates/deployment.yaml similarity index 97% rename from test/qbittorent/1.0.3/templates/deployment.yaml rename to charts/qbittorent/1.0.4/templates/deployment.yaml index e7a3accfae..a13bf36dc9 100644 --- a/test/qbittorent/1.0.3/templates/deployment.yaml +++ b/charts/qbittorent/1.0.4/templates/deployment.yaml @@ -30,6 +30,7 @@ spec: hostNetwork: false containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} diff --git a/charts/qbittorent/1.0.3/templates/pre-install-job.yaml b/charts/qbittorent/1.0.4/templates/pre-install-job.yaml similarity index 100% rename from charts/qbittorent/1.0.3/templates/pre-install-job.yaml rename to charts/qbittorent/1.0.4/templates/pre-install-job.yaml diff --git a/charts/qbittorent/1.0.3/templates/service.yaml b/charts/qbittorent/1.0.4/templates/service.yaml similarity index 100% rename from charts/qbittorent/1.0.3/templates/service.yaml rename to charts/qbittorent/1.0.4/templates/service.yaml diff --git a/charts/qbittorent/1.0.3/templates/tests/deployment-check.yaml b/charts/qbittorent/1.0.4/templates/tests/deployment-check.yaml similarity index 100% rename from charts/qbittorent/1.0.3/templates/tests/deployment-check.yaml rename to charts/qbittorent/1.0.4/templates/tests/deployment-check.yaml diff --git a/charts/qbittorent/1.0.3/test_values.yaml b/charts/qbittorent/1.0.4/test_values.yaml similarity index 100% rename from charts/qbittorent/1.0.3/test_values.yaml rename to charts/qbittorent/1.0.4/test_values.yaml diff --git a/charts/syncthing/1.0.6/Chart.lock b/charts/syncthing/1.0.6/Chart.lock deleted file mode 100644 index 2a438af7b0..0000000000 --- a/charts/syncthing/1.0.6/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-14T16:04:57.537954349+05:00" diff --git a/charts/syncthing/1.0.6/charts/common-2112.0.0.tgz b/charts/syncthing/1.0.6/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/charts/syncthing/1.0.6/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/syncthing/1.0.7/Chart.lock b/charts/syncthing/1.0.7/Chart.lock new file mode 100644 index 0000000000..b7897a5d16 --- /dev/null +++ b/charts/syncthing/1.0.7/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.349055892+05:00" diff --git a/charts/syncthing/1.0.6/Chart.yaml b/charts/syncthing/1.0.7/Chart.yaml similarity index 75% rename from charts/syncthing/1.0.6/Chart.yaml rename to charts/syncthing/1.0.7/Chart.yaml index a4cefad50b..f03b0310c1 100644 --- a/charts/syncthing/1.0.6/Chart.yaml +++ b/charts/syncthing/1.0.7/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: 1.20.2 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Syncthing is a continuous file synchronization program. home: https://syncthing.net/ icon: https://truecharts.org/_static/img/appicons/syncthing.png @@ -11,4 +11,4 @@ keywords: - storage - backup name: syncthing -version: 1.0.6 +version: 1.0.7 diff --git a/charts/syncthing/1.0.6/README.md b/charts/syncthing/1.0.7/README.md similarity index 100% rename from charts/syncthing/1.0.6/README.md rename to charts/syncthing/1.0.7/README.md diff --git a/charts/syncthing/1.0.6/app-readme.md b/charts/syncthing/1.0.7/app-readme.md similarity index 100% rename from charts/syncthing/1.0.6/app-readme.md rename to charts/syncthing/1.0.7/app-readme.md diff --git a/charts/syncthing/1.0.7/charts/common-2206.0.0.tgz b/charts/syncthing/1.0.7/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/charts/syncthing/1.0.7/charts/common-2206.0.0.tgz differ diff --git a/charts/syncthing/1.0.6/ix_values.yaml b/charts/syncthing/1.0.7/ix_values.yaml similarity index 100% rename from charts/syncthing/1.0.6/ix_values.yaml rename to charts/syncthing/1.0.7/ix_values.yaml diff --git a/charts/syncthing/1.0.6/questions.yaml b/charts/syncthing/1.0.7/questions.yaml similarity index 83% rename from charts/syncthing/1.0.6/questions.yaml rename to charts/syncthing/1.0.7/questions.yaml index ef8fb1aefa..bb5ee3d82e 100644 --- a/charts/syncthing/1.0.6/questions.yaml +++ b/charts/syncthing/1.0.7/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Networking Configuration for syncthing" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -188,3 +190,29 @@ questions: required: true $ref: - "validations/lockedHostPath" + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" + diff --git a/charts/syncthing/1.0.6/templates/deployment.yaml b/charts/syncthing/1.0.7/templates/deployment.yaml similarity index 97% rename from charts/syncthing/1.0.6/templates/deployment.yaml rename to charts/syncthing/1.0.7/templates/deployment.yaml index ceb2cb30f9..63c8982488 100644 --- a/charts/syncthing/1.0.6/templates/deployment.yaml +++ b/charts/syncthing/1.0.7/templates/deployment.yaml @@ -31,6 +31,7 @@ spec: hostname: {{ .Release.Name }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} diff --git a/charts/syncthing/1.0.6/templates/pre-install-job.yaml b/charts/syncthing/1.0.7/templates/pre-install-job.yaml similarity index 100% rename from charts/syncthing/1.0.6/templates/pre-install-job.yaml rename to charts/syncthing/1.0.7/templates/pre-install-job.yaml diff --git a/charts/syncthing/1.0.6/templates/service.yaml b/charts/syncthing/1.0.7/templates/service.yaml similarity index 100% rename from charts/syncthing/1.0.6/templates/service.yaml rename to charts/syncthing/1.0.7/templates/service.yaml diff --git a/charts/syncthing/1.0.6/templates/tests/deployment-check.yaml b/charts/syncthing/1.0.7/templates/tests/deployment-check.yaml similarity index 100% rename from charts/syncthing/1.0.6/templates/tests/deployment-check.yaml rename to charts/syncthing/1.0.7/templates/tests/deployment-check.yaml diff --git a/charts/syncthing/1.0.6/test_values.yaml b/charts/syncthing/1.0.7/test_values.yaml similarity index 100% rename from charts/syncthing/1.0.6/test_values.yaml rename to charts/syncthing/1.0.7/test_values.yaml diff --git a/library/common/2112.0.0/Chart.yaml b/library/common/2112.0.0/Chart.yaml index a8dc7d1472..bcf75581f2 100644 --- a/library/common/2112.0.0/Chart.yaml +++ b/library/common/2112.0.0/Chart.yaml @@ -15,7 +15,7 @@ type: library # 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: 2112.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/2206.0.2/.helmignore b/library/common/2206.0.0/.helmignore similarity index 100% rename from test/ix-chart/2206.0.2/.helmignore rename to library/common/2206.0.0/.helmignore diff --git a/library/common/2206.0.0/Chart.yaml b/library/common/2206.0.0/Chart.yaml new file mode 100644 index 0000000000..bcf75581f2 --- /dev/null +++ b/library/common/2206.0.0/Chart.yaml @@ -0,0 +1,23 @@ +apiVersion: v2 +name: common +description: A library chart for iX Official Catalog + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: library + +# 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.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 +# follow Semantic Versioning. They should reflect the version the application is using. +appVersion: v1 diff --git a/library/common/2206.0.0/README.md b/library/common/2206.0.0/README.md new file mode 100644 index 0000000000..f8784843a2 --- /dev/null +++ b/library/common/2206.0.0/README.md @@ -0,0 +1,11 @@ +# Library Chart for iX Official Catalog iX Chart + +**WARNING: THIS CHART IS NOT MEANT TO BE INSTALLED DIRECTLY** + +This is a [Helm Library Chart](https://helm.sh/docs/topics/library_charts/#helm). It's purpose is for grouping common logic between the k8s@home charts. + +Since a lot of charts follow the same pattern this library was built to reduce maintenance cost between the charts that use it and try achieve a goal of being DRY. + +## Introduction + +This chart provides common template helpers which can be used to develop new charts using [Helm](https://helm.sh) package manager. diff --git a/library/common/2206.0.0/templates/_serviceaccount.tpl b/library/common/2206.0.0/templates/_serviceaccount.tpl new file mode 100644 index 0000000000..b96d4009a9 --- /dev/null +++ b/library/common/2206.0.0/templates/_serviceaccount.tpl @@ -0,0 +1,11 @@ +{{/* +Common service account +*/}} +{{- define "common.serviceaccount" -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "common.names.serviceAccountName" . | quote }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.selectorLabels" . | nindent 4 -}} +{{- end -}} diff --git a/library/common/2206.0.0/templates/classes/_service.tpl b/library/common/2206.0.0/templates/classes/_service.tpl new file mode 100644 index 0000000000..c63ab9b933 --- /dev/null +++ b/library/common/2206.0.0/templates/classes/_service.tpl @@ -0,0 +1,41 @@ +{{/* +This template serves as a blueprint for all Service objects that are created +within the common library. +*/}} +{{- define "common.classes.service" -}} +{{- $values := .commonService -}} +{{- $serviceName := include "common.names.fullname" . -}} +{{- if hasKey $values "nameSuffix" -}} + {{- $serviceName = (printf "%v-%v" $serviceName $values.nameSuffix) -}} +{{ end -}} +{{- $svcType := $values.type | default "" -}} +apiVersion: v1 +kind: Service +metadata: + name: {{ $serviceName }} + labels: + {{- include "common.labels" . | nindent 4 }} + {{- if $values.labels }} + {{ toYaml $values.labels | nindent 4 }} + {{- end }} + {{- if $values.annotations }} + {{- with $values.annotations }} + annotations: + {{ toYaml . | nindent 4 }} + {{- end }} + {{- end }} +spec: + {{- if (or (eq $svcType "ClusterIP") (empty $svcType)) }} + type: ClusterIP + {{- if $values.clusterIP }} + clusterIP: {{ $values.clusterIP }} + {{end}} + {{- else if eq $svcType "NodePort" }} + type: {{ $svcType }} + {{- else }} + {{- fail "Only ClusterIP and NodePort services are supported in common chart" }} + {{- end }} + {{- include "common.classes.service.ports" (dict "svcType" $svcType "values" $values ) | trim | nindent 2 }} + selector: + {{- include "common.labels.selectorLabels" . | nindent 4 }} +{{- end }} diff --git a/library/common/2206.0.0/templates/classes/_service_ports.tpl b/library/common/2206.0.0/templates/classes/_service_ports.tpl new file mode 100644 index 0000000000..a61900b42a --- /dev/null +++ b/library/common/2206.0.0/templates/classes/_service_ports.tpl @@ -0,0 +1,19 @@ +{{/* +Render all the ports and additionalPorts for a Service object. +*/}} +{{- define "common.classes.service.ports" -}} + {{- $values := .values -}} + {{- $ports := $values.ports -}} + {{- if $ports -}} + ports: + {{- range $_ := $ports }} + - port: {{ .port }} + targetPort: {{ .targetPort | default "http" }} + protocol: {{ .protocol | default "TCP" }} + name: {{ .name | default "http" }} + {{- if (and (eq $.svcType "NodePort") (not (empty .nodePort))) }} + nodePort: {{ .nodePort }} + {{ end }} + {{- end -}} + {{- end -}} +{{- end }} diff --git a/library/common/2206.0.0/templates/lib/chart/_annotations.tpl b/library/common/2206.0.0/templates/lib/chart/_annotations.tpl new file mode 100644 index 0000000000..ad80be1e90 --- /dev/null +++ b/library/common/2206.0.0/templates/lib/chart/_annotations.tpl @@ -0,0 +1,6 @@ +{{/* +Common workload annotations +*/}} +{{- define "common.annotations" -}} +rollme: {{ randAlphaNum 5 | quote }} +{{- end -}} diff --git a/library/common/2206.0.0/templates/lib/chart/_capabilities.tpl b/library/common/2206.0.0/templates/lib/chart/_capabilities.tpl new file mode 100644 index 0000000000..7a3c13c8b2 --- /dev/null +++ b/library/common/2206.0.0/templates/lib/chart/_capabilities.tpl @@ -0,0 +1,27 @@ +{{/* +Return the appropriate apiVersion for DaemonSet objects. +*/}} +{{- define "common.capabilities.daemonset.apiVersion" -}} +{{- print "apps/v1" -}} +{{- end -}} + +{{/* +Return the appropriate apiVersion for Deployment objects. +*/}} +{{- define "common.capabilities.deployment.apiVersion" -}} +{{- print "apps/v1" -}} +{{- end -}} + +{{/* +Return the appropriate apiVersion for StatefulSet objects. +*/}} +{{- define "common.capabilities.statefulset.apiVersion" -}} +{{- print "apps/v1" -}} +{{- end -}} + +{{/* +Return the appropriate apiVersion for StatefulSet objects. +*/}} +{{- define "common.capabilities.cronjob.apiVersion" -}} +{{- print "batch/v1beta1" -}} +{{- end -}} diff --git a/library/common/2206.0.0/templates/lib/chart/_labels.tpl b/library/common/2206.0.0/templates/lib/chart/_labels.tpl new file mode 100644 index 0000000000..f64aead636 --- /dev/null +++ b/library/common/2206.0.0/templates/lib/chart/_labels.tpl @@ -0,0 +1,24 @@ +{{/* +Common labels shared across objects. +*/}} +{{- define "common.labels" -}} +helm.sh/chart: {{ include "common.names.chart" . }} +{{ include "common.labels.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels shared across objects. +*/}} +{{- define "common.labels.selectorLabels" -}} +app.kubernetes.io/name: {{ include "common.names.name" . }} +app.kubernetes.io/instance: {{ include "common.names.releaseName" . }} +{{ if hasKey .Values "extraSelectorLabels" }} +{{ range $selector := .Values.extraSelectorLabels }} +{{ printf "%s: %s" $selector.key $selector.value }} +{{ end }} +{{ end }} +{{- end }} diff --git a/library/common/2206.0.0/templates/lib/chart/_names.tpl b/library/common/2206.0.0/templates/lib/chart/_names.tpl new file mode 100644 index 0000000000..e98c6b4e6f --- /dev/null +++ b/library/common/2206.0.0/templates/lib/chart/_names.tpl @@ -0,0 +1,66 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "common.names.name" -}} +{{- $values := (.common | default dict) -}} +{{- $name := (default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-") }} +{{- if hasKey $values "nameSuffix" -}} + {{- $name = (printf "%v-%v" $name $values.nameSuffix) -}} +{{ end -}} +{{- print $name -}} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "common.names.fullname" -}} +{{- $values := (.common | default dict) -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- $name = (.Release.Name | trunc 63 | trimSuffix "-") }} +{{- else }} +{{- $name = (printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-") }} +{{- end }} +{{- if hasKey $values "nameSuffix" -}} + {{- $name = (printf "%v-%v" $name $values.nameSuffix) -}} +{{ end -}} +{{- print $name -}} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "common.names.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Determine service account name for deployment or statefulset. +*/}} +{{- define "common.names.serviceAccountName" -}} +{{- if .Values.serviceAccountNameOverride }} +{{- .Values.serviceAccountNameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-service-account" (include "common.names.releaseName" .) | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} + + +{{/* +Determine release name +This will add a suffix to the release name if nameSuffix is set +*/}} +{{- define "common.names.releaseName" -}} +{{- $values := (.common | default dict) -}} +{{- if hasKey $values "nameSuffix" -}} + {{- printf "%v-%v" .Release.Name $values.nameSuffix -}} +{{- else -}} + {{- print .Release.Name -}} +{{ end -}} +{{- end -}} diff --git a/library/common/2206.0.0/templates/lib/containers/_environment.tpl b/library/common/2206.0.0/templates/lib/containers/_environment.tpl new file mode 100644 index 0000000000..d757f459c1 --- /dev/null +++ b/library/common/2206.0.0/templates/lib/containers/_environment.tpl @@ -0,0 +1,41 @@ +{{/* +Render environment variable +*/}} +{{- define "common.containers.environmentVariable" -}} +{{- $envVariable := . -}} +{{- include "common.schema.validateKeys" (dict "values" $envVariable "checkKeys" (list "name")) -}} +{{- if $envVariable.valueFromSecret -}} +{{- include "common.schema.validateKeys" (dict "values" $envVariable "checkKeys" (list "secretName" "secretKey")) -}} +- name: {{ $envVariable.name | quote }} + valueFrom: + secretKeyRef: + name: {{ $envVariable.secretName | quote }} + key: {{ $envVariable.secretKey | quote }} +{{- else -}} +{{- include "common.schema.validateKeys" (dict "values" $envVariable "checkKeys" (list "value")) -}} +- name: {{ $envVariable.name | quote }} + value: {{ $envVariable.value | quote }} +{{- end -}} +{{- end -}} + +{{/* +Render environment variables +*/}} +{{- define "common.containers.environmentVariables" -}} +{{- $values := . -}} +{{- include "common.schema.validateKeys" (dict "values" $values "checkKeys" (list "environmentVariables")) -}} +{{- range $envVariable := $values.environmentVariables -}} +{{- include "common.containers.environmentVariable" $envVariable | nindent 0 -}} +{{- end -}} +{{- end -}} + +{{/* +Render environment variables if present +*/}} +{{- define "common.containers.allEnvironmentVariables" -}} +{{- $values := . -}} +{{- include "common.schema.validateKeys" (dict "values" $values "checkKeys" (list "environmentVariables")) -}} +{{- if $values.environmentVariables -}} +env: {{- include "common.containers.environmentVariables" $values | nindent 2 -}} +{{- end -}} +{{- end -}} diff --git a/library/common/2206.0.0/templates/lib/containers/_image.tpl b/library/common/2206.0.0/templates/lib/containers/_image.tpl new file mode 100644 index 0000000000..2b2b04561d --- /dev/null +++ b/library/common/2206.0.0/templates/lib/containers/_image.tpl @@ -0,0 +1,9 @@ +{{/* +Retrieve image configuration for container +*/}} +{{- define "common.containers.imageConfig" -}} +{{- $values := . -}} +{{- include "common.schema.validateKeys" (dict "values" $values "checkKeys" (list "repository" "tag" "pullPolicy")) -}} +image: "{{ $values.repository }}{{- if hasKey $values "postfix" -}}-{{ $values.postfix }}{{- end -}}:{{ $values.tag }}" +imagePullPolicy: {{ $values.pullPolicy }} +{{- end -}} diff --git a/library/common/2206.0.0/templates/lib/containers/_port.tpl b/library/common/2206.0.0/templates/lib/containers/_port.tpl new file mode 100644 index 0000000000..d7226c9bd6 --- /dev/null +++ b/library/common/2206.0.0/templates/lib/containers/_port.tpl @@ -0,0 +1,15 @@ +{{/* +Retrieve ports configuration for container +*/}} +{{- define "common.containers.configurePorts" -}} +{{- if .ports -}} +ports: +{{- range $index, $port := .ports -}} +{{- include "common.schema.validateKeys" (dict "values" $port "checkKeys" (list "protocol" "containerPort")) }} +- protocol: {{ $port.protocol }} + containerPort: {{ $port.containerPort }} + {{ if hasKey $port "hostPort" }}hostPort: {{ $port.hostPort }}{{ end }} + {{ if hasKey $port "name" }}name: {{ $port.name }}{{ end }} +{{- end -}} +{{- end -}} +{{- end -}} diff --git a/library/common/2206.0.0/templates/lib/containers/_resource.tpl b/library/common/2206.0.0/templates/lib/containers/_resource.tpl new file mode 100644 index 0000000000..fd4f6eef02 --- /dev/null +++ b/library/common/2206.0.0/templates/lib/containers/_resource.tpl @@ -0,0 +1,10 @@ +{{/* +Retrieve GPU Configuration +*/}} +{{- define "common.containers.gpuConfiguration" -}} +{{- $values := . -}} +{{ if $values.gpuConfiguration }} +resources: + limits: {{- toYaml $values.gpuConfiguration | nindent 4 }} +{{ end }} +{{- end -}} diff --git a/library/common/2206.0.0/templates/lib/deployments/_utils.tpl b/library/common/2206.0.0/templates/lib/deployments/_utils.tpl new file mode 100644 index 0000000000..b8b2f76ad5 --- /dev/null +++ b/library/common/2206.0.0/templates/lib/deployments/_utils.tpl @@ -0,0 +1,41 @@ +{{/* +Retrieve deployment metadata +*/}} +{{- define "common.deployment.metadata" -}} +metadata: + name: {{ template "common.names.fullname" . }} + labels: {{ include "common.labels.selectorLabels" . | nindent 4 }} +{{- end -}} + + +{{/* +Retrieve replicas/strategy/selector +*/}} +{{- define "common.deployment.common_spec" -}} +replicas: {{ (default 1 .Values.replicas) }} +strategy: + type: {{ (default "Recreate" .Values.updateStrategy ) }} +selector: + matchLabels: {{ include "common.labels.selectorLabels" . | nindent 4 }} +{{- end -}} + + +{{/* +Retrieve deployment pod's metadata +*/}} +{{- define "common.deployment.pod.metadata" -}} +metadata: + name: {{ template "common.names.fullname" . }} + labels: {{ include "common.labels.selectorLabels" . | nindent 4 }} + annotations: {{ include "common.annotations" . | nindent 4 }} +{{- end -}} + + +{{/* +Retrieve common deployment configuration +*/}} +{{- define "common.deployment.common_config" -}} +apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }} +kind: Deployment +{{ include "common.deployment.metadata" . | nindent 0 }} +{{- end -}} diff --git a/library/common/2206.0.0/templates/lib/networking/_dns.tpl b/library/common/2206.0.0/templates/lib/networking/_dns.tpl new file mode 100644 index 0000000000..3a748a4aae --- /dev/null +++ b/library/common/2206.0.0/templates/lib/networking/_dns.tpl @@ -0,0 +1,12 @@ +{{/* +DNS Configuration +*/}} +{{- define "common.networking.dnsConfiguration" }} +{{ if .dnsPolicy }} +dnsPolicy: {{ .dnsPolicy }} +{{ end }} +{{ if .dnsConfig }} +dnsConfig: + {{ toYaml .dnsConfig | nindent 2 }} +{{ end }} +{{- end }} diff --git a/library/common/2206.0.0/templates/lib/resources/_certs.tpl b/library/common/2206.0.0/templates/lib/resources/_certs.tpl new file mode 100644 index 0000000000..9e091595e9 --- /dev/null +++ b/library/common/2206.0.0/templates/lib/resources/_certs.tpl @@ -0,0 +1,26 @@ +{{/* +Retrieve true/false if certificate is available in ixCertificates +*/}} +{{- define "common.resources.cert_present" -}} +{{- $values := . -}} +{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "commonCertOptions")) -}} +{{- hasKey $values.Values.ixCertificates ($values.commonCertOptions.certKeyName | toString) -}} +{{- end -}} + + +{{/* +Retrieve certificate from variable name +*/}} +{{- define "common.resources.cert" -}} +{{- $values := . -}} +{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "commonCertOptions")) -}} +{{- $certKey := ($values.commonCertOptions.certKeyName | toString) -}} +{{- if hasKey $values.Values.ixCertificates $certKey -}} +{{- $cert := get $values.Values.ixCertificates $certKey -}} +{{- if $values.commonCertOptions.publicKey -}} +{{ $cert.certificate }} +{{- else -}} +{{ $cert.privatekey }} +{{- end -}} +{{- end -}} +{{- end -}} diff --git a/library/common/2206.0.0/templates/lib/resources/_limitations.tpl b/library/common/2206.0.0/templates/lib/resources/_limitations.tpl new file mode 100644 index 0000000000..dd3a98c3f4 --- /dev/null +++ b/library/common/2206.0.0/templates/lib/resources/_limitations.tpl @@ -0,0 +1,11 @@ +{{/* + Resource limitations +*/}} +{{- define "common.resources.limitaion" -}} +{{- if .Values.enableResourceLimits -}} +resources: + limits: + cpu: {{ .Values.cpuLimit }} + memory: {{ .Values.memLimit }} +{{- end -}} +{{- end -}} diff --git a/library/common/2206.0.0/templates/lib/schema/_utils.tpl b/library/common/2206.0.0/templates/lib/schema/_utils.tpl new file mode 100644 index 0000000000..8577a0b615 --- /dev/null +++ b/library/common/2206.0.0/templates/lib/schema/_utils.tpl @@ -0,0 +1,19 @@ +{{/* +Checks if a list of keys are present in a dictionary +*/}} +{{- define "common.schema.validateKeys" -}} +{{- $values := . -}} +{{- if and (hasKey $values "values") (hasKey $values "checkKeys") -}} +{{- $missingKeys := list -}} +{{- range $values.checkKeys -}} +{{- if eq (hasKey $values.values . ) false -}} +{{- $missingKeys = mustAppend $missingKeys . -}} +{{- end -}} +{{- end -}} +{{- if $missingKeys -}} +{{- fail (printf "Missing %s from dictionary" ($missingKeys | join ", ")) -}} +{{- end -}} +{{- else -}} +{{- fail "A dictionary and list of keys to check must be provided" -}} +{{- end -}} +{{- end -}} diff --git a/library/common/2206.0.0/templates/lib/storage/_appStorage.tpl b/library/common/2206.0.0/templates/lib/storage/_appStorage.tpl new file mode 100644 index 0000000000..b97a8b2c09 --- /dev/null +++ b/library/common/2206.0.0/templates/lib/storage/_appStorage.tpl @@ -0,0 +1,75 @@ +{{/* +Define appVolumeMounts for container +*/}} +{{- define "common.storage.configureAppVolumeMountsInContainer" -}} +{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "appVolumeMounts")) -}} +{{- $appVolumeMounts := .appVolumeMounts -}} +{{- if $appVolumeMounts -}} +{{ range $name, $avm := $appVolumeMounts }} +{{- if (default true $avm.enabled) -}} +{{ if $avm.containerNameOverride }} +{{ $name = $avm.containerNameOverride }} +{{ end }} +- name: {{ $name }} + mountPath: {{ $avm.mountPath }} + {{ if $avm.subPath }} + subPath: {{ $avm.subPath }} + {{ end }} + {{ if $avm.readOnly }} + readOnly: {{ $avm.readOnly }} + {{ end }} +{{- end -}} +{{ end }} +{{- end -}} +{{- end -}} + + +{{/* +Define hostPath for appVolumes +*/}} +{{- define "common.storage.configureAppVolumes" -}} +{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "appVolumeMounts")) -}} +{{- $values := . -}} +{{- if $values.appVolumeMounts -}} +{{- range $name, $av := $values.appVolumeMounts -}} +{{ if (default true $av.enabled) }} +- name: {{ $name }} + {{ if or $av.emptyDir $.emptyDirVolumes }} + emptyDir: {} + {{- else -}} + hostPath: + {{ if $av.hostPathEnabled }} + path: {{ required "hostPath not set" $av.hostPath }} + {{ else }} + {{- include "common.schema.validateKeys" (dict "values" $values "checkKeys" (list "ixVolumes")) -}} + {{- include "common.schema.validateKeys" (dict "values" $av "checkKeys" (list "datasetName")) -}} + {{- $volDict := dict "datasetName" $av.datasetName "ixVolumes" $values.ixVolumes -}} + path: {{ include "common.storage.retrieveHostPathFromiXVolume" $volDict }} + {{ end }} + {{ end }} +{{ end }} +{{- end -}} +{{- end -}} +{{- end -}} + + +{{/* +Get all volumes configuration +*/}} +{{- define "common.storage.allAppVolumes" -}} +{{- $appVolumeMounts := .appVolumeMounts -}} +{{- if $appVolumeMounts -}} +volumes: {{- include "common.storage.configureAppVolumes" . | nindent 2 -}} +{{- end -}} +{{- end -}} + + +{{/* +Get all container volume moutns configuration +*/}} +{{- define "common.storage.allContainerVolumeMounts" -}} +{{- $appVolumeMounts := .appVolumeMounts -}} +{{- if $appVolumeMounts -}} +volumeMounts: {{- include "common.storage.configureAppVolumeMountsInContainer" . | nindent 2 -}} +{{- end -}} +{{- end -}} diff --git a/library/common/2206.0.0/templates/lib/storage/_hostpathValidation.tpl b/library/common/2206.0.0/templates/lib/storage/_hostpathValidation.tpl new file mode 100644 index 0000000000..046d0e7807 --- /dev/null +++ b/library/common/2206.0.0/templates/lib/storage/_hostpathValidation.tpl @@ -0,0 +1,56 @@ +{{/* +Validate list of host path in a specific format +*/}} +{{- define "common.storage.hostPathsValidation" -}} + {{- $allowed_paths := (list "mnt" "sys" "dev" "cluster") -}} + {{- range . -}} + {{- $host_p := splitList "/" . -}} + {{- $host_p := (without $host_p "") -}} + {{- $error_msg := (printf "Invalid hostpath %s. Path must be a valid path under a given pool e.g `/mnt/tank/somepath` is valid whereas `/mnt` or `/mnt/tank` are invalid examples." .) -}} + {{- if and (eq (index $host_p 0) "mnt") (lt ($host_p | len) 3) -}} + {{- fail $error_msg -}} + {{- else if (eq (index $host_p 0) "cluster") -}} + {{- if (lt ($host_p | len) 2) -}} + {{- fail $error_msg -}} + {{- else if (eq (index $host_p 1) "ctdb_shared_vol") -}} + {{- fail $error_msg -}} + {{- end -}} + {{- else if not (has (index $host_p 0) $allowed_paths) -}} + {{- fail $error_msg -}} + {{- end -}} + {{- end -}} +{{- end -}} + +{{/* +Validate app volume mount's host path +*/}} +{{- define "common.storage.appHostPathsValidate" -}} + {{- $host_p := list -}} + {{- range $path_name := .appVolumeMounts -}} + {{- if ($path_name.hostPathEnabled) -}} + {{- $host_p = mustAppend $host_p $path_name.hostPath -}} + {{- end -}} + {{- end -}} + {{- include "common.storage.hostPathsValidation" $host_p -}} +{{- end -}} + + +{{/* +Validate extra volume mount's host path +*/}} +{{- define "common.storage.extraHostPathsValidate" -}} + {{- $host_p := list -}} + {{- range $index, $hostPathConfiguration := .extraAppVolumeMounts -}} + {{- $host_p = mustAppend $host_p $hostPathConfiguration.hostPath -}} + {{- end -}} + {{- include "common.storage.hostPathsValidation" $host_p -}} +{{- end -}} + + +{{/* +Validate volumes mount's host paths +*/}} +{{- define "common.storage.hostPathValidate" -}} + {{- include "common.storage.extraHostPathsValidate" . -}} + {{- include "common.storage.appHostPathsValidate" . -}} +{{- end -}} diff --git a/library/common/2206.0.0/templates/lib/storage/_ixvolumes.tpl b/library/common/2206.0.0/templates/lib/storage/_ixvolumes.tpl new file mode 100644 index 0000000000..f45b9d8d96 --- /dev/null +++ b/library/common/2206.0.0/templates/lib/storage/_ixvolumes.tpl @@ -0,0 +1,11 @@ +{{/* +Retrieve host path from ix volumes based on dataset name +*/}} +{{- define "common.storage.retrieveHostPathFromiXVolume" -}} +{{- range $index, $hostPathConfiguration := $.ixVolumes }} +{{- $dsName := base $hostPathConfiguration.hostPath -}} +{{- if eq $.datasetName $dsName -}} +{{- $hostPathConfiguration.hostPath -}} +{{- end -}} +{{- end }} +{{- end -}} diff --git a/test/chia/1.3.29/charts/common-2112.0.0.tgz b/test/chia/1.3.29/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/chia/1.3.29/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/chia/1.3.29/requirements.lock b/test/chia/1.3.29/requirements.lock deleted file mode 100644 index f8debca24d..0000000000 --- a/test/chia/1.3.29/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.722808+05:00" diff --git a/test/chia/1.3.29/.helmignore b/test/chia/1.3.30/.helmignore similarity index 100% rename from test/chia/1.3.29/.helmignore rename to test/chia/1.3.30/.helmignore diff --git a/test/chia/1.3.29/Chart.yaml b/test/chia/1.3.30/Chart.yaml similarity index 80% rename from test/chia/1.3.29/Chart.yaml rename to test/chia/1.3.30/Chart.yaml index 0a4e10c687..0a224f74ae 100644 --- a/test/chia/1.3.29/Chart.yaml +++ b/test/chia/1.3.30/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v1.3.5 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Global, Versioned, peer-to-peer filesystem. home: https://www.chia.net/ icon: https://www.chia.net/img/chia_logo.svg @@ -15,4 +15,4 @@ name: chia sources: - https://github.com/Chia-Network/chia-blockchain - https://github.com/orgs/chia-network/packages/container/package/chia -version: 1.3.29 +version: 1.3.30 diff --git a/test/chia/1.3.29/README.md b/test/chia/1.3.30/README.md similarity index 100% rename from test/chia/1.3.29/README.md rename to test/chia/1.3.30/README.md diff --git a/test/chia/1.3.29/app-readme.md b/test/chia/1.3.30/app-readme.md similarity index 100% rename from test/chia/1.3.29/app-readme.md rename to test/chia/1.3.30/app-readme.md diff --git a/test/chia/1.3.30/charts/common-2206.0.0.tgz b/test/chia/1.3.30/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/chia/1.3.30/charts/common-2206.0.0.tgz differ diff --git a/test/chia/1.3.29/default_values.yaml b/test/chia/1.3.30/default_values.yaml similarity index 100% rename from test/chia/1.3.29/default_values.yaml rename to test/chia/1.3.30/default_values.yaml diff --git a/test/chia/1.3.29/ix_values.yaml b/test/chia/1.3.30/ix_values.yaml similarity index 100% rename from test/chia/1.3.29/ix_values.yaml rename to test/chia/1.3.30/ix_values.yaml diff --git a/charts/chia/1.3.29/questions.yaml b/test/chia/1.3.30/questions.yaml similarity index 84% rename from charts/chia/1.3.29/questions.yaml rename to test/chia/1.3.30/questions.yaml index 29ca90ccac..1dac7192db 100644 --- a/charts/chia/1.3.29/questions.yaml +++ b/test/chia/1.3.30/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Set the environment that will be visible to the container" - name: "Networking" description: "Configure networking for Chia container" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -180,3 +182,28 @@ questions: max: 65535 default: 8447 required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/test/chia/1.3.30/requirements.lock b/test/chia/1.3.30/requirements.lock new file mode 100644 index 0000000000..b3c751eb51 --- /dev/null +++ b/test/chia/1.3.30/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.06059343+05:00" diff --git a/test/chia/1.3.29/templates/deployment.yaml b/test/chia/1.3.30/templates/deployment.yaml similarity index 96% rename from test/chia/1.3.29/templates/deployment.yaml rename to test/chia/1.3.30/templates/deployment.yaml index 3fa28edc2a..9891ef394d 100644 --- a/test/chia/1.3.29/templates/deployment.yaml +++ b/test/chia/1.3.30/templates/deployment.yaml @@ -21,6 +21,7 @@ spec: containers: - name: {{ .Chart.Name }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} + {{ include "common.resources.limitaion" . | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} - name: extrappvolume-{{ $index }} diff --git a/test/chia/1.3.29/templates/generate-mnemonic.yaml b/test/chia/1.3.30/templates/generate-mnemonic.yaml similarity index 100% rename from test/chia/1.3.29/templates/generate-mnemonic.yaml rename to test/chia/1.3.30/templates/generate-mnemonic.yaml diff --git a/test/chia/1.3.29/templates/mnemonic-configmap.yaml b/test/chia/1.3.30/templates/mnemonic-configmap.yaml similarity index 100% rename from test/chia/1.3.29/templates/mnemonic-configmap.yaml rename to test/chia/1.3.30/templates/mnemonic-configmap.yaml diff --git a/test/chia/1.3.29/templates/networking.tpl b/test/chia/1.3.30/templates/networking.tpl similarity index 100% rename from test/chia/1.3.29/templates/networking.tpl rename to test/chia/1.3.30/templates/networking.tpl diff --git a/test/chia/1.3.29/templates/service.yaml b/test/chia/1.3.30/templates/service.yaml similarity index 100% rename from test/chia/1.3.29/templates/service.yaml rename to test/chia/1.3.30/templates/service.yaml diff --git a/test/chia/1.3.29/test_values.yaml b/test/chia/1.3.30/test_values.yaml similarity index 100% rename from test/chia/1.3.29/test_values.yaml rename to test/chia/1.3.30/test_values.yaml diff --git a/test/chia/1.3.29/values.yaml b/test/chia/1.3.30/values.yaml similarity index 100% rename from test/chia/1.3.29/values.yaml rename to test/chia/1.3.30/values.yaml diff --git a/test/collabora/1.2.4/charts/common-2112.0.0.tgz b/test/collabora/1.2.4/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/collabora/1.2.4/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/collabora/1.2.4/.helmignore b/test/collabora/1.2.5/.helmignore similarity index 100% rename from test/collabora/1.2.4/.helmignore rename to test/collabora/1.2.5/.helmignore diff --git a/charts/collabora/1.2.4/Chart.yaml b/test/collabora/1.2.5/Chart.yaml similarity index 84% rename from charts/collabora/1.2.4/Chart.yaml rename to test/collabora/1.2.5/Chart.yaml index f46a527e63..2c4da5ad30 100644 --- a/charts/collabora/1.2.4/Chart.yaml +++ b/test/collabora/1.2.5/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: 21.11.4.1.1 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: "Collabora Online Development Edition \u2013 an awesome, Online Office\ \ suite image suitable for home use." home: https://github.com/CollaboraOnline/online @@ -16,4 +16,4 @@ name: collabora sources: - https://github.com/CollaboraOnline/online.git - https://hub.docker.com/r/collabora/code -version: 1.2.4 +version: 1.2.5 diff --git a/test/collabora/1.2.4/README.md b/test/collabora/1.2.5/README.md similarity index 100% rename from test/collabora/1.2.4/README.md rename to test/collabora/1.2.5/README.md diff --git a/test/collabora/1.2.4/app-readme.md b/test/collabora/1.2.5/app-readme.md similarity index 100% rename from test/collabora/1.2.4/app-readme.md rename to test/collabora/1.2.5/app-readme.md diff --git a/test/collabora/1.2.5/charts/common-2206.0.0.tgz b/test/collabora/1.2.5/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/collabora/1.2.5/charts/common-2206.0.0.tgz differ diff --git a/test/collabora/1.2.4/ix_values.yaml b/test/collabora/1.2.5/ix_values.yaml similarity index 100% rename from test/collabora/1.2.4/ix_values.yaml rename to test/collabora/1.2.5/ix_values.yaml diff --git a/test/collabora/1.2.4/questions.yaml b/test/collabora/1.2.5/questions.yaml similarity index 80% rename from test/collabora/1.2.4/questions.yaml rename to test/collabora/1.2.5/questions.yaml index 91fac3eb7b..7ee8a2f850 100644 --- a/test/collabora/1.2.4/questions.yaml +++ b/test/collabora/1.2.5/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Configure Networking for Collabora" - name: "Storage" description: "Configure Storage for Collabora" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -129,3 +131,28 @@ questions: default: 9980 min: 9000 max: 65535 + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/test/collabora/1.2.5/requirements.lock b/test/collabora/1.2.5/requirements.lock new file mode 100644 index 0000000000..e55b1a0150 --- /dev/null +++ b/test/collabora/1.2.5/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.10176596+05:00" diff --git a/test/collabora/1.2.4/templates/_helpers.tpl b/test/collabora/1.2.5/templates/_helpers.tpl similarity index 100% rename from test/collabora/1.2.4/templates/_helpers.tpl rename to test/collabora/1.2.5/templates/_helpers.tpl diff --git a/test/collabora/1.2.4/templates/deployment.yaml b/test/collabora/1.2.5/templates/deployment.yaml similarity index 98% rename from test/collabora/1.2.4/templates/deployment.yaml rename to test/collabora/1.2.5/templates/deployment.yaml index d1a02c4948..fd2e76b5d9 100644 --- a/test/collabora/1.2.4/templates/deployment.yaml +++ b/test/collabora/1.2.5/templates/deployment.yaml @@ -37,6 +37,7 @@ spec: containerPort: 443 protocol: TCP - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} {{ if .Values.extraAppVolumeMounts }} volumeMounts: diff --git a/test/collabora/1.2.4/templates/nginx-conf.yaml b/test/collabora/1.2.5/templates/nginx-conf.yaml similarity index 100% rename from test/collabora/1.2.4/templates/nginx-conf.yaml rename to test/collabora/1.2.5/templates/nginx-conf.yaml diff --git a/test/collabora/1.2.4/templates/nginx-service.yaml b/test/collabora/1.2.5/templates/nginx-service.yaml similarity index 100% rename from test/collabora/1.2.4/templates/nginx-service.yaml rename to test/collabora/1.2.5/templates/nginx-service.yaml diff --git a/test/collabora/1.2.4/templates/secrets.yaml b/test/collabora/1.2.5/templates/secrets.yaml similarity index 100% rename from test/collabora/1.2.4/templates/secrets.yaml rename to test/collabora/1.2.5/templates/secrets.yaml diff --git a/test/collabora/1.2.4/templates/tests/deployment-check.yaml b/test/collabora/1.2.5/templates/tests/deployment-check.yaml similarity index 100% rename from test/collabora/1.2.4/templates/tests/deployment-check.yaml rename to test/collabora/1.2.5/templates/tests/deployment-check.yaml diff --git a/test/collabora/1.2.4/test_values.yaml b/test/collabora/1.2.5/test_values.yaml similarity index 100% rename from test/collabora/1.2.4/test_values.yaml rename to test/collabora/1.2.5/test_values.yaml diff --git a/test/diskoverdata/1.0.2/Chart.lock b/test/diskoverdata/1.0.2/Chart.lock deleted file mode 100644 index ad893eeb8e..0000000000 --- a/test/diskoverdata/1.0.2/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-14T16:04:57.912820777+05:00" diff --git a/test/diskoverdata/1.0.2/charts/common-2112.0.0.tgz b/test/diskoverdata/1.0.2/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/diskoverdata/1.0.2/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/diskoverdata/1.0.3/Chart.lock b/test/diskoverdata/1.0.3/Chart.lock new file mode 100644 index 0000000000..e2e0733aa3 --- /dev/null +++ b/test/diskoverdata/1.0.3/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.566570138+05:00" diff --git a/charts/diskoverdata/1.0.2/Chart.yaml b/test/diskoverdata/1.0.3/Chart.yaml similarity index 81% rename from charts/diskoverdata/1.0.2/Chart.yaml rename to test/diskoverdata/1.0.3/Chart.yaml index e72713f371..d0cad7c65d 100644 --- a/charts/diskoverdata/1.0.2/Chart.yaml +++ b/test/diskoverdata/1.0.3/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "2.0.1" icon: http://www.diskoverdata.com/wp-content/uploads/2019/09/diskover.png description: Diskover is used to monitor size/volumes of distributed dataset. name: diskoverdata -version: 1.0.2 +version: 1.0.3 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 home: https://github.com/diskoverdata/diskover-community/ keywords: - storage diff --git a/test/diskoverdata/1.0.2/README.md b/test/diskoverdata/1.0.3/README.md similarity index 100% rename from test/diskoverdata/1.0.2/README.md rename to test/diskoverdata/1.0.3/README.md diff --git a/test/diskoverdata/1.0.2/app-readme.md b/test/diskoverdata/1.0.3/app-readme.md similarity index 100% rename from test/diskoverdata/1.0.2/app-readme.md rename to test/diskoverdata/1.0.3/app-readme.md diff --git a/test/diskoverdata/1.0.3/charts/common-2206.0.0.tgz b/test/diskoverdata/1.0.3/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f144a0660b Binary files /dev/null and b/test/diskoverdata/1.0.3/charts/common-2206.0.0.tgz differ diff --git a/test/diskoverdata/1.0.2/ix_values.yaml b/test/diskoverdata/1.0.3/ix_values.yaml similarity index 100% rename from test/diskoverdata/1.0.2/ix_values.yaml rename to test/diskoverdata/1.0.3/ix_values.yaml diff --git a/test/diskoverdata/1.0.2/questions.yaml b/test/diskoverdata/1.0.3/questions.yaml similarity index 89% rename from test/diskoverdata/1.0.2/questions.yaml rename to test/diskoverdata/1.0.3/questions.yaml index 4e5ff35047..c30285208f 100644 --- a/test/diskoverdata/1.0.2/questions.yaml +++ b/test/diskoverdata/1.0.3/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Networking Configuration for Diskover" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -293,3 +295,28 @@ questions: type: path editable: false default: "/usr/share/elasticsearch/data" + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/test/diskoverdata/1.0.2/templates/_diskover.tpl b/test/diskoverdata/1.0.3/templates/_diskover.tpl similarity index 100% rename from test/diskoverdata/1.0.2/templates/_diskover.tpl rename to test/diskoverdata/1.0.3/templates/_diskover.tpl diff --git a/test/diskoverdata/1.0.2/templates/deployment.yaml b/test/diskoverdata/1.0.3/templates/deployment.yaml similarity index 99% rename from test/diskoverdata/1.0.2/templates/deployment.yaml rename to test/diskoverdata/1.0.3/templates/deployment.yaml index 1cedd245a3..f1bbd9c14c 100644 --- a/test/diskoverdata/1.0.2/templates/deployment.yaml +++ b/test/diskoverdata/1.0.3/templates/deployment.yaml @@ -74,6 +74,7 @@ spec: containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} - name: diskover-initial-scripts diff --git a/test/diskoverdata/1.0.2/templates/diskover-secrets.yaml b/test/diskoverdata/1.0.3/templates/diskover-secrets.yaml similarity index 100% rename from test/diskoverdata/1.0.2/templates/diskover-secrets.yaml rename to test/diskoverdata/1.0.3/templates/diskover-secrets.yaml diff --git a/test/diskoverdata/1.0.2/templates/elastic_search_deployment.yaml b/test/diskoverdata/1.0.3/templates/elastic_search_deployment.yaml similarity index 100% rename from test/diskoverdata/1.0.2/templates/elastic_search_deployment.yaml rename to test/diskoverdata/1.0.3/templates/elastic_search_deployment.yaml diff --git a/test/diskoverdata/1.0.2/templates/elastic_search_service.yaml b/test/diskoverdata/1.0.3/templates/elastic_search_service.yaml similarity index 100% rename from test/diskoverdata/1.0.2/templates/elastic_search_service.yaml rename to test/diskoverdata/1.0.3/templates/elastic_search_service.yaml diff --git a/test/diskoverdata/1.0.2/templates/elasticsearch-secret.yaml b/test/diskoverdata/1.0.3/templates/elasticsearch-secret.yaml similarity index 100% rename from test/diskoverdata/1.0.2/templates/elasticsearch-secret.yaml rename to test/diskoverdata/1.0.3/templates/elasticsearch-secret.yaml diff --git a/test/diskoverdata/1.0.2/templates/initial_scripts.yaml b/test/diskoverdata/1.0.3/templates/initial_scripts.yaml similarity index 100% rename from test/diskoverdata/1.0.2/templates/initial_scripts.yaml rename to test/diskoverdata/1.0.3/templates/initial_scripts.yaml diff --git a/test/diskoverdata/1.0.2/templates/pre-install-job.yaml b/test/diskoverdata/1.0.3/templates/pre-install-job.yaml similarity index 100% rename from test/diskoverdata/1.0.2/templates/pre-install-job.yaml rename to test/diskoverdata/1.0.3/templates/pre-install-job.yaml diff --git a/test/diskoverdata/1.0.2/templates/service.yaml b/test/diskoverdata/1.0.3/templates/service.yaml similarity index 100% rename from test/diskoverdata/1.0.2/templates/service.yaml rename to test/diskoverdata/1.0.3/templates/service.yaml diff --git a/test/diskoverdata/1.0.2/templates/tests/deployment-check.yaml b/test/diskoverdata/1.0.3/templates/tests/deployment-check.yaml similarity index 100% rename from test/diskoverdata/1.0.2/templates/tests/deployment-check.yaml rename to test/diskoverdata/1.0.3/templates/tests/deployment-check.yaml diff --git a/test/diskoverdata/1.0.2/test_values.yaml b/test/diskoverdata/1.0.3/test_values.yaml similarity index 100% rename from test/diskoverdata/1.0.2/test_values.yaml rename to test/diskoverdata/1.0.3/test_values.yaml diff --git a/test/emby/1.0.8/charts/common-2112.0.0.tgz b/test/emby/1.0.8/charts/common-2112.0.0.tgz deleted file mode 100644 index 3cb1689233..0000000000 Binary files a/test/emby/1.0.8/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/emby/1.0.8/requirements.lock b/test/emby/1.0.8/requirements.lock deleted file mode 100644 index 137d873a09..0000000000 --- a/test/emby/1.0.8/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.674776+05:00" diff --git a/test/emby/1.0.8/.helmignore b/test/emby/1.0.9/.helmignore similarity index 100% rename from test/emby/1.0.8/.helmignore rename to test/emby/1.0.9/.helmignore diff --git a/test/emby/1.0.9/Chart.lock b/test/emby/1.0.9/Chart.lock new file mode 100644 index 0000000000..b3a4e3c9bb --- /dev/null +++ b/test/emby/1.0.9/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:50.877815231+05:00" diff --git a/charts/emby/1.0.8/Chart.yaml b/test/emby/1.0.9/Chart.yaml similarity index 75% rename from charts/emby/1.0.8/Chart.yaml rename to test/emby/1.0.9/Chart.yaml index e385ab0844..b60775170e 100644 --- a/charts/emby/1.0.8/Chart.yaml +++ b/test/emby/1.0.9/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: 4.8.0.2 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Emby Server home: https://emby.media/ icon: https://images-na.ssl-images-amazon.com/images/I/41NwssJC1iL.png @@ -13,4 +13,4 @@ keywords: name: emby sources: - https://hub.docker.com/r/emby/embyserver -version: 1.0.8 +version: 1.0.9 diff --git a/test/emby/1.0.8/README.md b/test/emby/1.0.9/README.md similarity index 100% rename from test/emby/1.0.8/README.md rename to test/emby/1.0.9/README.md diff --git a/test/emby/1.0.8/app-readme.md b/test/emby/1.0.9/app-readme.md similarity index 100% rename from test/emby/1.0.8/app-readme.md rename to test/emby/1.0.9/app-readme.md diff --git a/test/emby/1.0.9/charts/common-2206.0.0.tgz b/test/emby/1.0.9/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/emby/1.0.9/charts/common-2206.0.0.tgz differ diff --git a/test/emby/1.0.8/ix_values.yaml b/test/emby/1.0.9/ix_values.yaml similarity index 81% rename from test/emby/1.0.8/ix_values.yaml rename to test/emby/1.0.9/ix_values.yaml index 871a1f572d..ab0a010279 100644 --- a/test/emby/1.0.8/ix_values.yaml +++ b/test/emby/1.0.9/ix_values.yaml @@ -1,4 +1,4 @@ image: pullPolicy: IfNotPresent repository: emby/embyserver - tag: 4.8.0.2 + tag: 4.7.5.0 diff --git a/test/emby/1.0.8/questions.yaml b/test/emby/1.0.9/questions.yaml similarity index 83% rename from test/emby/1.0.8/questions.yaml rename to test/emby/1.0.9/questions.yaml index 9ffdc86d63..ef2a764b57 100644 --- a/test/emby/1.0.8/questions.yaml +++ b/test/emby/1.0.9/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Configure when pod should be restarted in case of failure" - name: "Resource Reservation" description: "Specify resources to be allocated to workload" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -164,3 +166,28 @@ questions: schema: type: boolean default: false + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/test/collabora/1.2.4/requirements.lock b/test/emby/1.0.9/requirements.lock similarity index 67% rename from test/collabora/1.2.4/requirements.lock rename to test/emby/1.0.9/requirements.lock index 137d873a09..b4b664582d 100644 --- a/test/collabora/1.2.4/requirements.lock +++ b/test/emby/1.0.9/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 generated: "2021-12-06T21:24:36.674776+05:00" diff --git a/test/emby/1.0.8/templates/NOTES.txt b/test/emby/1.0.9/templates/NOTES.txt similarity index 100% rename from test/emby/1.0.8/templates/NOTES.txt rename to test/emby/1.0.9/templates/NOTES.txt diff --git a/charts/emby/1.0.8/templates/deployment.yaml b/test/emby/1.0.9/templates/deployment.yaml similarity index 97% rename from charts/emby/1.0.8/templates/deployment.yaml rename to test/emby/1.0.9/templates/deployment.yaml index c1e9272b0b..17ba9c54fd 100644 --- a/charts/emby/1.0.8/templates/deployment.yaml +++ b/test/emby/1.0.9/templates/deployment.yaml @@ -10,6 +10,7 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} hostname: {{ template "common.names.fullname" . }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} {{ include "common.containers.gpuConfiguration" .Values | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} diff --git a/test/emby/1.0.8/templates/service-tcp.yaml b/test/emby/1.0.9/templates/service-tcp.yaml similarity index 100% rename from test/emby/1.0.8/templates/service-tcp.yaml rename to test/emby/1.0.9/templates/service-tcp.yaml diff --git a/test/emby/1.0.8/templates/service-udp.yaml b/test/emby/1.0.9/templates/service-udp.yaml similarity index 100% rename from test/emby/1.0.8/templates/service-udp.yaml rename to test/emby/1.0.9/templates/service-udp.yaml diff --git a/test/emby/1.0.8/templates/tests/deployment-check.yaml b/test/emby/1.0.9/templates/tests/deployment-check.yaml similarity index 100% rename from test/emby/1.0.8/templates/tests/deployment-check.yaml rename to test/emby/1.0.9/templates/tests/deployment-check.yaml diff --git a/test/emby/1.0.8/test_values.yaml b/test/emby/1.0.9/test_values.yaml similarity index 100% rename from test/emby/1.0.8/test_values.yaml rename to test/emby/1.0.9/test_values.yaml diff --git a/test/home-assistant/1.0.11/Chart.lock b/test/home-assistant/1.0.11/Chart.lock deleted file mode 100644 index 25bdcdbf9a..0000000000 --- a/test/home-assistant/1.0.11/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-14T16:04:57.688006166+05:00" diff --git a/test/home-assistant/1.0.11/charts/common-2112.0.0.tgz b/test/home-assistant/1.0.11/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/home-assistant/1.0.11/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/home-assistant/1.0.12/Chart.lock b/test/home-assistant/1.0.12/Chart.lock new file mode 100644 index 0000000000..040ffc0865 --- /dev/null +++ b/test/home-assistant/1.0.12/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.430542161+05:00" diff --git a/charts/home-assistant/1.0.11/Chart.yaml b/test/home-assistant/1.0.12/Chart.yaml similarity index 79% rename from charts/home-assistant/1.0.11/Chart.yaml rename to test/home-assistant/1.0.12/Chart.yaml index f2be1e7445..ebb18165af 100644 --- a/charts/home-assistant/1.0.11/Chart.yaml +++ b/test/home-assistant/1.0.12/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: 2022.6.7 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: home-assistant App for TrueNAS SCALE home: https://github.com/home-assistant/home-assistant icon: https://truecharts.org/_static/img/appicons/home-assistant.png @@ -12,4 +12,4 @@ keywords: name: home-assistant sources: - https://github.com/home-assistant/home-assistant -version: 1.0.11 +version: 1.0.12 diff --git a/test/home-assistant/1.0.11/README.md b/test/home-assistant/1.0.12/README.md similarity index 100% rename from test/home-assistant/1.0.11/README.md rename to test/home-assistant/1.0.12/README.md diff --git a/test/home-assistant/1.0.11/app-readme.md b/test/home-assistant/1.0.12/app-readme.md similarity index 100% rename from test/home-assistant/1.0.11/app-readme.md rename to test/home-assistant/1.0.12/app-readme.md diff --git a/test/home-assistant/1.0.12/charts/common-2206.0.0.tgz b/test/home-assistant/1.0.12/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/home-assistant/1.0.12/charts/common-2206.0.0.tgz differ diff --git a/test/home-assistant/1.0.11/ix_values.yaml b/test/home-assistant/1.0.12/ix_values.yaml similarity index 100% rename from test/home-assistant/1.0.11/ix_values.yaml rename to test/home-assistant/1.0.12/ix_values.yaml diff --git a/charts/home-assistant/1.0.11/questions.yaml b/test/home-assistant/1.0.12/questions.yaml similarity index 88% rename from charts/home-assistant/1.0.11/questions.yaml rename to test/home-assistant/1.0.12/questions.yaml index 2afb8ed3fb..feb5225536 100644 --- a/charts/home-assistant/1.0.11/questions.yaml +++ b/test/home-assistant/1.0.12/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Networking Configuration for homeassistant" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -262,4 +264,29 @@ questions: description: "Host path" schema: type: hostpath - required: true \ No newline at end of file + required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/test/home-assistant/1.0.11/templates/_postgres.tpl b/test/home-assistant/1.0.12/templates/_postgres.tpl similarity index 100% rename from test/home-assistant/1.0.11/templates/_postgres.tpl rename to test/home-assistant/1.0.12/templates/_postgres.tpl diff --git a/test/home-assistant/1.0.11/templates/backup-postgres-config.yaml b/test/home-assistant/1.0.12/templates/backup-postgres-config.yaml similarity index 100% rename from test/home-assistant/1.0.11/templates/backup-postgres-config.yaml rename to test/home-assistant/1.0.12/templates/backup-postgres-config.yaml diff --git a/test/home-assistant/1.0.11/templates/backup-postgres-hook.yaml b/test/home-assistant/1.0.12/templates/backup-postgres-hook.yaml similarity index 100% rename from test/home-assistant/1.0.11/templates/backup-postgres-hook.yaml rename to test/home-assistant/1.0.12/templates/backup-postgres-hook.yaml diff --git a/test/home-assistant/1.0.11/templates/deployment.yaml b/test/home-assistant/1.0.12/templates/deployment.yaml similarity index 98% rename from test/home-assistant/1.0.11/templates/deployment.yaml rename to test/home-assistant/1.0.12/templates/deployment.yaml index 75a2500a40..65ab647567 100644 --- a/test/home-assistant/1.0.11/templates/deployment.yaml +++ b/test/home-assistant/1.0.12/templates/deployment.yaml @@ -55,6 +55,7 @@ spec: containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} diff --git a/test/home-assistant/1.0.11/templates/home-assistance-init-config.yaml b/test/home-assistant/1.0.12/templates/home-assistance-init-config.yaml similarity index 100% rename from test/home-assistant/1.0.11/templates/home-assistance-init-config.yaml rename to test/home-assistant/1.0.12/templates/home-assistance-init-config.yaml diff --git a/test/home-assistant/1.0.11/templates/postgres-config.yaml b/test/home-assistant/1.0.12/templates/postgres-config.yaml similarity index 100% rename from test/home-assistant/1.0.11/templates/postgres-config.yaml rename to test/home-assistant/1.0.12/templates/postgres-config.yaml diff --git a/test/home-assistant/1.0.11/templates/postgres-deployment.yaml b/test/home-assistant/1.0.12/templates/postgres-deployment.yaml similarity index 100% rename from test/home-assistant/1.0.11/templates/postgres-deployment.yaml rename to test/home-assistant/1.0.12/templates/postgres-deployment.yaml diff --git a/test/home-assistant/1.0.11/templates/postgres-secret.yaml b/test/home-assistant/1.0.12/templates/postgres-secret.yaml similarity index 100% rename from test/home-assistant/1.0.11/templates/postgres-secret.yaml rename to test/home-assistant/1.0.12/templates/postgres-secret.yaml diff --git a/test/home-assistant/1.0.11/templates/postgres-service.yaml b/test/home-assistant/1.0.12/templates/postgres-service.yaml similarity index 100% rename from test/home-assistant/1.0.11/templates/postgres-service.yaml rename to test/home-assistant/1.0.12/templates/postgres-service.yaml diff --git a/test/home-assistant/1.0.11/templates/pre-install-job.yaml b/test/home-assistant/1.0.12/templates/pre-install-job.yaml similarity index 100% rename from test/home-assistant/1.0.11/templates/pre-install-job.yaml rename to test/home-assistant/1.0.12/templates/pre-install-job.yaml diff --git a/test/home-assistant/1.0.11/templates/service.yaml b/test/home-assistant/1.0.12/templates/service.yaml similarity index 100% rename from test/home-assistant/1.0.11/templates/service.yaml rename to test/home-assistant/1.0.12/templates/service.yaml diff --git a/test/home-assistant/1.0.11/templates/tests/deployment-check.yaml b/test/home-assistant/1.0.12/templates/tests/deployment-check.yaml similarity index 100% rename from test/home-assistant/1.0.11/templates/tests/deployment-check.yaml rename to test/home-assistant/1.0.12/templates/tests/deployment-check.yaml diff --git a/test/home-assistant/1.0.11/test_values.yaml b/test/home-assistant/1.0.12/test_values.yaml similarity index 100% rename from test/home-assistant/1.0.11/test_values.yaml rename to test/home-assistant/1.0.12/test_values.yaml diff --git a/test/ipfs/1.2.4/charts/common-2112.0.0.tgz b/test/ipfs/1.2.4/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/ipfs/1.2.4/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/ipfs/1.2.4/requirements.lock b/test/ipfs/1.2.4/requirements.lock deleted file mode 100644 index 70c48680b4..0000000000 --- a/test/ipfs/1.2.4/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.550755+05:00" diff --git a/test/ipfs/1.2.4/.helmignore b/test/ipfs/1.2.5/.helmignore similarity index 100% rename from test/ipfs/1.2.4/.helmignore rename to test/ipfs/1.2.5/.helmignore diff --git a/charts/ipfs/1.2.4/Chart.yaml b/test/ipfs/1.2.5/Chart.yaml similarity index 80% rename from charts/ipfs/1.2.4/Chart.yaml rename to test/ipfs/1.2.5/Chart.yaml index fd453413ce..8f5f19978f 100644 --- a/charts/ipfs/1.2.4/Chart.yaml +++ b/test/ipfs/1.2.5/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v0.13.0 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Global, Versioned, peer-to-peer filesystem. home: https://ipfs.io icon: https://ipfs.io/ipfs/QmVk7srrwahXLNmcDYvyUEJptyoxpndnRa57YJ11L4jV26/ipfs.go.png @@ -15,4 +15,4 @@ sources: - https://github.com/ipfs/go-ipfs - https://hub.docker.com/r/ipfs/go-ipfs upstream_version: 0.8.0-rc1 -version: 1.2.4 +version: 1.2.5 diff --git a/test/ipfs/1.2.4/README.md b/test/ipfs/1.2.5/README.md similarity index 100% rename from test/ipfs/1.2.4/README.md rename to test/ipfs/1.2.5/README.md diff --git a/test/ipfs/1.2.4/app-readme.md b/test/ipfs/1.2.5/app-readme.md similarity index 100% rename from test/ipfs/1.2.4/app-readme.md rename to test/ipfs/1.2.5/app-readme.md diff --git a/test/ipfs/1.2.5/charts/common-2206.0.0.tgz b/test/ipfs/1.2.5/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/ipfs/1.2.5/charts/common-2206.0.0.tgz differ diff --git a/test/ipfs/1.2.4/ix_values.yaml b/test/ipfs/1.2.5/ix_values.yaml similarity index 100% rename from test/ipfs/1.2.4/ix_values.yaml rename to test/ipfs/1.2.5/ix_values.yaml diff --git a/test/ipfs/1.2.4/questions.yaml b/test/ipfs/1.2.5/questions.yaml similarity index 85% rename from test/ipfs/1.2.4/questions.yaml rename to test/ipfs/1.2.5/questions.yaml index 232ff66070..14d68c6f1b 100644 --- a/test/ipfs/1.2.4/questions.yaml +++ b/test/ipfs/1.2.5/questions.yaml @@ -9,6 +9,9 @@ groups: description: "Configure Storage for IPFS" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" + portals: web_portal: @@ -191,3 +194,28 @@ questions: schema: type: hostpath required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/test/ipfs/1.2.5/requirements.lock b/test/ipfs/1.2.5/requirements.lock new file mode 100644 index 0000000000..df0bbfa57e --- /dev/null +++ b/test/ipfs/1.2.5/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.187672514+05:00" diff --git a/test/ipfs/1.2.4/templates/NOTES.txt b/test/ipfs/1.2.5/templates/NOTES.txt similarity index 100% rename from test/ipfs/1.2.4/templates/NOTES.txt rename to test/ipfs/1.2.5/templates/NOTES.txt diff --git a/charts/ipfs/1.2.4/templates/deployment.yaml b/test/ipfs/1.2.5/templates/deployment.yaml similarity index 98% rename from charts/ipfs/1.2.4/templates/deployment.yaml rename to test/ipfs/1.2.5/templates/deployment.yaml index ae9d34b7e1..87f2e70a35 100644 --- a/charts/ipfs/1.2.4/templates/deployment.yaml +++ b/test/ipfs/1.2.5/templates/deployment.yaml @@ -46,6 +46,7 @@ spec: {{ include "common.storage.allContainerVolumeMounts" .Values | nindent 10 }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} {{ include "common.storage.allContainerVolumeMounts" .Values | nindent 10 }} ports: diff --git a/test/ipfs/1.2.4/templates/service.yaml b/test/ipfs/1.2.5/templates/service.yaml similarity index 100% rename from test/ipfs/1.2.4/templates/service.yaml rename to test/ipfs/1.2.5/templates/service.yaml diff --git a/test/ipfs/1.2.4/templates/serviceaccount.yaml b/test/ipfs/1.2.5/templates/serviceaccount.yaml similarity index 100% rename from test/ipfs/1.2.4/templates/serviceaccount.yaml rename to test/ipfs/1.2.5/templates/serviceaccount.yaml diff --git a/test/ipfs/1.2.4/templates/tests/deployment-check.yaml b/test/ipfs/1.2.5/templates/tests/deployment-check.yaml similarity index 100% rename from test/ipfs/1.2.4/templates/tests/deployment-check.yaml rename to test/ipfs/1.2.5/templates/tests/deployment-check.yaml diff --git a/test/ipfs/1.2.4/test_values.yaml b/test/ipfs/1.2.5/test_values.yaml similarity index 100% rename from test/ipfs/1.2.4/test_values.yaml rename to test/ipfs/1.2.5/test_values.yaml diff --git a/test/ix-chart/2206.0.2/Chart.lock b/test/ix-chart/2206.0.2/Chart.lock deleted file mode 100644 index ba76e05c13..0000000000 --- a/test/ix-chart/2206.0.2/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:40:37.023887+05:00" diff --git a/test/ix-chart/2206.0.2/charts/common-2112.0.0.tgz b/test/ix-chart/2206.0.2/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/ix-chart/2206.0.2/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/ix-chart/2206.0.3/.helmignore b/test/ix-chart/2206.0.3/.helmignore new file mode 100644 index 0000000000..0e8a0eb36f --- /dev/null +++ b/test/ix-chart/2206.0.3/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/test/ix-chart/2206.0.3/Chart.lock b/test/ix-chart/2206.0.3/Chart.lock new file mode 100644 index 0000000000..2b3f24a8f6 --- /dev/null +++ b/test/ix-chart/2206.0.3/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:50.913701514+05:00" diff --git a/test/ix-chart/2206.0.2/Chart.yaml b/test/ix-chart/2206.0.3/Chart.yaml similarity index 92% rename from test/ix-chart/2206.0.2/Chart.yaml rename to test/ix-chart/2206.0.3/Chart.yaml index 3692ef0034..956e7497bd 100644 --- a/test/ix-chart/2206.0.2/Chart.yaml +++ b/test/ix-chart/2206.0.3/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.2 +version: 2206.0.3 # 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 @@ -23,5 +23,5 @@ version: 2206.0.2 appVersion: v1 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 diff --git a/test/ix-chart/2206.0.2/README.md b/test/ix-chart/2206.0.3/README.md similarity index 100% rename from test/ix-chart/2206.0.2/README.md rename to test/ix-chart/2206.0.3/README.md diff --git a/test/ix-chart/2206.0.2/app-readme.md b/test/ix-chart/2206.0.3/app-readme.md similarity index 100% rename from test/ix-chart/2206.0.2/app-readme.md rename to test/ix-chart/2206.0.3/app-readme.md diff --git a/test/ix-chart/2206.0.3/charts/common-2206.0.0.tgz b/test/ix-chart/2206.0.3/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/ix-chart/2206.0.3/charts/common-2206.0.0.tgz differ diff --git a/test/ix-chart/2206.0.2/questions.yaml b/test/ix-chart/2206.0.3/questions.yaml similarity index 94% rename from test/ix-chart/2206.0.2/questions.yaml rename to test/ix-chart/2206.0.3/questions.yaml index 4b32d792ca..c5b711b8d8 100644 --- a/test/ix-chart/2206.0.2/questions.yaml +++ b/test/ix-chart/2206.0.3/questions.yaml @@ -21,6 +21,9 @@ groups: description: "Configure when pod should be restarted in case of failure" - name: "Resource Reservation" description: "Specify resources to be allocated to workload" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" + questions: # Workload type @@ -542,3 +545,28 @@ questions: label: "Add Capability" schema: type: string + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" \ No newline at end of file diff --git a/test/ix-chart/2206.0.2/templates/NOTES.txt b/test/ix-chart/2206.0.3/templates/NOTES.txt similarity index 100% rename from test/ix-chart/2206.0.2/templates/NOTES.txt rename to test/ix-chart/2206.0.3/templates/NOTES.txt diff --git a/test/ix-chart/2206.0.2/templates/_containers.tpl b/test/ix-chart/2206.0.3/templates/_containers.tpl similarity index 100% rename from test/ix-chart/2206.0.2/templates/_containers.tpl rename to test/ix-chart/2206.0.3/templates/_containers.tpl diff --git a/test/ix-chart/2206.0.2/templates/_helpers.tpl b/test/ix-chart/2206.0.3/templates/_helpers.tpl similarity index 100% rename from test/ix-chart/2206.0.2/templates/_helpers.tpl rename to test/ix-chart/2206.0.3/templates/_helpers.tpl diff --git a/test/ix-chart/2206.0.2/templates/_networking.tpl b/test/ix-chart/2206.0.3/templates/_networking.tpl similarity index 100% rename from test/ix-chart/2206.0.2/templates/_networking.tpl rename to test/ix-chart/2206.0.3/templates/_networking.tpl diff --git a/test/ix-chart/2206.0.2/templates/_volumes.tpl b/test/ix-chart/2206.0.3/templates/_volumes.tpl similarity index 100% rename from test/ix-chart/2206.0.2/templates/_volumes.tpl rename to test/ix-chart/2206.0.3/templates/_volumes.tpl diff --git a/charts/ix-chart/2206.0.2/templates/_workload.tpl b/test/ix-chart/2206.0.3/templates/_workload.tpl similarity index 98% rename from charts/ix-chart/2206.0.2/templates/_workload.tpl rename to test/ix-chart/2206.0.3/templates/_workload.tpl index 23f869a248..f0026ab02b 100644 --- a/charts/ix-chart/2206.0.2/templates/_workload.tpl +++ b/test/ix-chart/2206.0.3/templates/_workload.tpl @@ -54,6 +54,7 @@ restartPolicy: {{ template "restartPolicy" . }} hostNetwork: {{ template "hostNetworkingConfiguration" . }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 2 }} {{- include "volumeMountsConfiguration" . | indent 2}} tty: {{ .Values.tty }} stdin: {{ .Values.stdin }} diff --git a/test/ix-chart/2206.0.2/templates/external-interfaces.yaml b/test/ix-chart/2206.0.3/templates/external-interfaces.yaml similarity index 100% rename from test/ix-chart/2206.0.2/templates/external-interfaces.yaml rename to test/ix-chart/2206.0.3/templates/external-interfaces.yaml diff --git a/test/ix-chart/2206.0.2/templates/service.yaml b/test/ix-chart/2206.0.3/templates/service.yaml similarity index 100% rename from test/ix-chart/2206.0.2/templates/service.yaml rename to test/ix-chart/2206.0.3/templates/service.yaml diff --git a/test/ix-chart/2206.0.2/templates/tests/deployment-check.yaml b/test/ix-chart/2206.0.3/templates/tests/deployment-check.yaml similarity index 100% rename from test/ix-chart/2206.0.2/templates/tests/deployment-check.yaml rename to test/ix-chart/2206.0.3/templates/tests/deployment-check.yaml diff --git a/test/ix-chart/2206.0.2/templates/workload.yaml b/test/ix-chart/2206.0.3/templates/workload.yaml similarity index 100% rename from test/ix-chart/2206.0.2/templates/workload.yaml rename to test/ix-chart/2206.0.3/templates/workload.yaml diff --git a/test/ix-chart/2206.0.2/test_values.yaml b/test/ix-chart/2206.0.3/test_values.yaml similarity index 100% rename from test/ix-chart/2206.0.2/test_values.yaml rename to test/ix-chart/2206.0.3/test_values.yaml diff --git a/test/machinaris/1.1.7/charts/common-2112.0.0.tgz b/test/machinaris/1.1.7/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/machinaris/1.1.7/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/machinaris/1.1.7/requirements.lock b/test/machinaris/1.1.7/requirements.lock deleted file mode 100644 index c555ad2636..0000000000 --- a/test/machinaris/1.1.7/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T19:55:04.707082+05:00" diff --git a/test/machinaris/1.1.7/.helmignore b/test/machinaris/1.1.8/.helmignore similarity index 100% rename from test/machinaris/1.1.7/.helmignore rename to test/machinaris/1.1.8/.helmignore diff --git a/test/machinaris/1.1.7/Chart.yaml b/test/machinaris/1.1.8/Chart.yaml similarity index 80% rename from test/machinaris/1.1.7/Chart.yaml rename to test/machinaris/1.1.8/Chart.yaml index bc0c726f30..e8ff4cbfbc 100644 --- a/test/machinaris/1.1.7/Chart.yaml +++ b/test/machinaris/1.1.8/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v0.7.2 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Global, Versioned, peer-to-peer filesystem. home: https://github.com/guydavis/machinaris icon: https://raw.githubusercontent.com/guydavis/machinaris/main/web/static/favicon.ico @@ -14,4 +14,4 @@ keywords: name: machinaris sources: - https://github.com/guydavis/machinaris -version: 1.1.7 +version: 1.1.8 diff --git a/test/machinaris/1.1.7/README.md b/test/machinaris/1.1.8/README.md similarity index 100% rename from test/machinaris/1.1.7/README.md rename to test/machinaris/1.1.8/README.md diff --git a/test/machinaris/1.1.7/app-readme.md b/test/machinaris/1.1.8/app-readme.md similarity index 100% rename from test/machinaris/1.1.7/app-readme.md rename to test/machinaris/1.1.8/app-readme.md diff --git a/test/machinaris/1.1.8/charts/common-2206.0.0.tgz b/test/machinaris/1.1.8/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f144a0660b Binary files /dev/null and b/test/machinaris/1.1.8/charts/common-2206.0.0.tgz differ diff --git a/test/machinaris/1.1.7/ix_values.yaml b/test/machinaris/1.1.8/ix_values.yaml similarity index 100% rename from test/machinaris/1.1.7/ix_values.yaml rename to test/machinaris/1.1.8/ix_values.yaml diff --git a/test/machinaris/1.1.7/questions.yaml b/test/machinaris/1.1.8/questions.yaml similarity index 99% rename from test/machinaris/1.1.7/questions.yaml rename to test/machinaris/1.1.8/questions.yaml index 2bd5dba87e..d7e2965221 100644 --- a/test/machinaris/1.1.7/questions.yaml +++ b/test/machinaris/1.1.8/questions.yaml @@ -221,20 +221,25 @@ questions: group: "Resource Limits" schema: type: boolean + default: false - variable: cpuLimit - label: "CPU limit" + label: "CPU Limit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." group: "Resource Limits" schema: type: string show_if: [["enableResourceLimits", "=", true]] valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" - variable: memLimit - label: "Memory limit" + label: "Memory Limit" group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" schema: type: string show_if: [["enableResourceLimits", "=", true]] valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" # Cactus Configurations - variable: cactusEnabled diff --git a/test/machinaris/1.1.8/requirements.lock b/test/machinaris/1.1.8/requirements.lock new file mode 100644 index 0000000000..1ea08df473 --- /dev/null +++ b/test/machinaris/1.1.8/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.521131693+05:00" diff --git a/test/machinaris/1.1.7/templates/_helpers.tpl b/test/machinaris/1.1.8/templates/_helpers.tpl similarity index 100% rename from test/machinaris/1.1.7/templates/_helpers.tpl rename to test/machinaris/1.1.8/templates/_helpers.tpl diff --git a/test/machinaris/1.1.7/templates/coins-deployment.yaml b/test/machinaris/1.1.8/templates/coins-deployment.yaml similarity index 100% rename from test/machinaris/1.1.7/templates/coins-deployment.yaml rename to test/machinaris/1.1.8/templates/coins-deployment.yaml diff --git a/test/machinaris/1.1.7/templates/deployment.yaml b/test/machinaris/1.1.8/templates/deployment.yaml similarity index 100% rename from test/machinaris/1.1.7/templates/deployment.yaml rename to test/machinaris/1.1.8/templates/deployment.yaml diff --git a/test/machinaris/1.1.7/templates/service.yaml b/test/machinaris/1.1.8/templates/service.yaml similarity index 100% rename from test/machinaris/1.1.7/templates/service.yaml rename to test/machinaris/1.1.8/templates/service.yaml diff --git a/test/machinaris/1.1.7/templates/tests/cactus-check.yaml b/test/machinaris/1.1.8/templates/tests/cactus-check.yaml similarity index 100% rename from test/machinaris/1.1.7/templates/tests/cactus-check.yaml rename to test/machinaris/1.1.8/templates/tests/cactus-check.yaml diff --git a/test/machinaris/1.1.7/templates/tests/machinaris-check.yaml b/test/machinaris/1.1.8/templates/tests/machinaris-check.yaml similarity index 100% rename from test/machinaris/1.1.7/templates/tests/machinaris-check.yaml rename to test/machinaris/1.1.8/templates/tests/machinaris-check.yaml diff --git a/test/machinaris/1.1.7/test_values.yaml b/test/machinaris/1.1.8/test_values.yaml similarity index 100% rename from test/machinaris/1.1.7/test_values.yaml rename to test/machinaris/1.1.8/test_values.yaml diff --git a/test/minio/1.6.25/charts/common-2112.0.0.tgz b/test/minio/1.6.25/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/minio/1.6.25/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/minio/1.6.25/requirements.lock b/test/minio/1.6.25/requirements.lock deleted file mode 100644 index 7d9c01b810..0000000000 --- a/test/minio/1.6.25/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.62541+05:00" diff --git a/test/minio/1.6.25/.helmignore b/test/minio/1.6.26/.helmignore similarity index 100% rename from test/minio/1.6.25/.helmignore rename to test/minio/1.6.26/.helmignore diff --git a/test/minio/1.6.25/CHANGELOG.md b/test/minio/1.6.26/CHANGELOG.md similarity index 100% rename from test/minio/1.6.25/CHANGELOG.md rename to test/minio/1.6.26/CHANGELOG.md diff --git a/test/minio/1.6.25/Chart.yaml b/test/minio/1.6.26/Chart.yaml similarity index 80% rename from test/minio/1.6.25/Chart.yaml rename to test/minio/1.6.26/Chart.yaml index 69d4239244..99b9252949 100644 --- a/test/minio/1.6.25/Chart.yaml +++ b/test/minio/1.6.26/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: '2022-06-25' dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: High Performance, Kubernetes Native Object Storage home: https://min.io icon: https://min.io/resources/img/logo/MINIO_wordmark.png @@ -16,4 +16,4 @@ sources: - https://github.com/minio/minio - https://github.com/minio/charts upstream_version: 8.0.5 -version: 1.6.25 +version: 1.6.26 diff --git a/test/minio/1.6.25/README.md b/test/minio/1.6.26/README.md similarity index 100% rename from test/minio/1.6.25/README.md rename to test/minio/1.6.26/README.md diff --git a/test/minio/1.6.25/app-readme.md b/test/minio/1.6.26/app-readme.md similarity index 100% rename from test/minio/1.6.25/app-readme.md rename to test/minio/1.6.26/app-readme.md diff --git a/test/minio/1.6.26/charts/common-2206.0.0.tgz b/test/minio/1.6.26/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/minio/1.6.26/charts/common-2206.0.0.tgz differ diff --git a/test/minio/1.6.25/ix_values.yaml b/test/minio/1.6.26/ix_values.yaml similarity index 100% rename from test/minio/1.6.25/ix_values.yaml rename to test/minio/1.6.26/ix_values.yaml diff --git a/test/minio/1.6.25/migrations/migrate b/test/minio/1.6.26/migrations/migrate similarity index 100% rename from test/minio/1.6.25/migrations/migrate rename to test/minio/1.6.26/migrations/migrate diff --git a/test/minio/1.6.25/migrations/migrate_from_1.0.0 b/test/minio/1.6.26/migrations/migrate_from_1.0.0 similarity index 100% rename from test/minio/1.6.25/migrations/migrate_from_1.0.0 rename to test/minio/1.6.26/migrations/migrate_from_1.0.0 diff --git a/test/minio/1.6.25/questions.yaml b/test/minio/1.6.26/questions.yaml similarity index 87% rename from test/minio/1.6.25/questions.yaml rename to test/minio/1.6.26/questions.yaml index de5d504673..fbe42d066d 100644 --- a/test/minio/1.6.25/questions.yaml +++ b/test/minio/1.6.26/questions.yaml @@ -9,6 +9,8 @@ groups: description: "Configure Storage for Nextcloud" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -250,3 +252,28 @@ questions: schema: type: hostpath required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/test/minio/1.6.26/requirements.lock b/test/minio/1.6.26/requirements.lock new file mode 100644 index 0000000000..d6dffce599 --- /dev/null +++ b/test/minio/1.6.26/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.476831005+05:00" diff --git a/test/minio/1.6.25/templates/NOTES.txt b/test/minio/1.6.26/templates/NOTES.txt similarity index 100% rename from test/minio/1.6.25/templates/NOTES.txt rename to test/minio/1.6.26/templates/NOTES.txt diff --git a/test/minio/1.6.25/templates/_cert.tpl b/test/minio/1.6.26/templates/_cert.tpl similarity index 100% rename from test/minio/1.6.25/templates/_cert.tpl rename to test/minio/1.6.26/templates/_cert.tpl diff --git a/test/minio/1.6.25/templates/_helpers.tpl b/test/minio/1.6.26/templates/_helpers.tpl similarity index 100% rename from test/minio/1.6.25/templates/_helpers.tpl rename to test/minio/1.6.26/templates/_helpers.tpl diff --git a/test/minio/1.6.25/templates/configmap.yaml b/test/minio/1.6.26/templates/configmap.yaml similarity index 100% rename from test/minio/1.6.25/templates/configmap.yaml rename to test/minio/1.6.26/templates/configmap.yaml diff --git a/test/minio/1.6.25/templates/deployment.yaml b/test/minio/1.6.26/templates/deployment.yaml similarity index 98% rename from test/minio/1.6.25/templates/deployment.yaml rename to test/minio/1.6.26/templates/deployment.yaml index 28350458b8..042eabe123 100644 --- a/test/minio/1.6.25/templates/deployment.yaml +++ b/test/minio/1.6.26/templates/deployment.yaml @@ -34,6 +34,7 @@ spec: hostNetwork: {{ include "minio.hostNetworking" . }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{- include "minio.tlsKeysVolumeMount" . | nindent 12 }} diff --git a/test/minio/1.6.25/templates/pre-install-job.yaml b/test/minio/1.6.26/templates/pre-install-job.yaml similarity index 100% rename from test/minio/1.6.25/templates/pre-install-job.yaml rename to test/minio/1.6.26/templates/pre-install-job.yaml diff --git a/test/minio/1.6.25/templates/secrets.yaml b/test/minio/1.6.26/templates/secrets.yaml similarity index 100% rename from test/minio/1.6.25/templates/secrets.yaml rename to test/minio/1.6.26/templates/secrets.yaml diff --git a/test/minio/1.6.25/templates/service.yaml b/test/minio/1.6.26/templates/service.yaml similarity index 100% rename from test/minio/1.6.25/templates/service.yaml rename to test/minio/1.6.26/templates/service.yaml diff --git a/test/minio/1.6.25/templates/serviceaccount.yaml b/test/minio/1.6.26/templates/serviceaccount.yaml similarity index 100% rename from test/minio/1.6.25/templates/serviceaccount.yaml rename to test/minio/1.6.26/templates/serviceaccount.yaml diff --git a/test/minio/1.6.25/templates/tests/deployment-check.yaml b/test/minio/1.6.26/templates/tests/deployment-check.yaml similarity index 100% rename from test/minio/1.6.25/templates/tests/deployment-check.yaml rename to test/minio/1.6.26/templates/tests/deployment-check.yaml diff --git a/test/minio/1.6.25/test_values.yaml b/test/minio/1.6.26/test_values.yaml similarity index 100% rename from test/minio/1.6.25/test_values.yaml rename to test/minio/1.6.26/test_values.yaml diff --git a/test/netdata/1.0.7/charts/common-2112.0.0.tgz b/test/netdata/1.0.7/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/netdata/1.0.7/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/netdata/1.0.7/requirements.lock b/test/netdata/1.0.7/requirements.lock deleted file mode 100644 index 7d9c01b810..0000000000 --- a/test/netdata/1.0.7/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.62541+05:00" diff --git a/test/netdata/1.0.7/.helmignore b/test/netdata/1.0.8/.helmignore similarity index 100% rename from test/netdata/1.0.7/.helmignore rename to test/netdata/1.0.8/.helmignore diff --git a/charts/netdata/1.0.7/Chart.yaml b/test/netdata/1.0.8/Chart.yaml similarity index 80% rename from charts/netdata/1.0.7/Chart.yaml rename to test/netdata/1.0.8/Chart.yaml index 146cc653d7..4f6d65dba8 100644 --- a/charts/netdata/1.0.7/Chart.yaml +++ b/test/netdata/1.0.8/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v1.35.1 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Real-time performance monitoring, done right! home: https://www.netdata.cloud/ icon: https://netdata.github.io/helmchart/logo.png @@ -16,4 +16,4 @@ sources: - https://github.com/netdata/helmchart - https://github.com/netdata/netdata upstream_version: 3.7.12 -version: 1.0.7 +version: 1.0.8 diff --git a/test/netdata/1.0.7/README.md b/test/netdata/1.0.8/README.md similarity index 100% rename from test/netdata/1.0.7/README.md rename to test/netdata/1.0.8/README.md diff --git a/test/netdata/1.0.7/app-readme.md b/test/netdata/1.0.8/app-readme.md similarity index 100% rename from test/netdata/1.0.7/app-readme.md rename to test/netdata/1.0.8/app-readme.md diff --git a/test/netdata/1.0.8/charts/common-2206.0.0.tgz b/test/netdata/1.0.8/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/netdata/1.0.8/charts/common-2206.0.0.tgz differ diff --git a/test/netdata/1.0.7/ix_values.yaml b/test/netdata/1.0.8/ix_values.yaml similarity index 100% rename from test/netdata/1.0.7/ix_values.yaml rename to test/netdata/1.0.8/ix_values.yaml diff --git a/charts/netdata/1.0.7/questions.yaml b/test/netdata/1.0.8/questions.yaml similarity index 87% rename from charts/netdata/1.0.7/questions.yaml rename to test/netdata/1.0.8/questions.yaml index 69d76c018f..1e1b727e69 100644 --- a/charts/netdata/1.0.7/questions.yaml +++ b/test/netdata/1.0.8/questions.yaml @@ -9,6 +9,8 @@ groups: description: "Configure Storage for Netdata" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -224,3 +226,28 @@ questions: schema: type: hostpath required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/test/netdata/1.0.8/requirements.lock b/test/netdata/1.0.8/requirements.lock new file mode 100644 index 0000000000..2257736493 --- /dev/null +++ b/test/netdata/1.0.8/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.02504434+05:00" diff --git a/test/netdata/1.0.7/templates/_helpers.tpl b/test/netdata/1.0.8/templates/_helpers.tpl similarity index 100% rename from test/netdata/1.0.7/templates/_helpers.tpl rename to test/netdata/1.0.8/templates/_helpers.tpl diff --git a/test/netdata/1.0.7/templates/clusterrole.yaml b/test/netdata/1.0.8/templates/clusterrole.yaml similarity index 100% rename from test/netdata/1.0.7/templates/clusterrole.yaml rename to test/netdata/1.0.8/templates/clusterrole.yaml diff --git a/test/netdata/1.0.7/templates/clusterrolebinding.yaml b/test/netdata/1.0.8/templates/clusterrolebinding.yaml similarity index 100% rename from test/netdata/1.0.7/templates/clusterrolebinding.yaml rename to test/netdata/1.0.8/templates/clusterrolebinding.yaml diff --git a/charts/netdata/1.0.7/templates/deployment.yaml b/test/netdata/1.0.8/templates/deployment.yaml similarity index 97% rename from charts/netdata/1.0.7/templates/deployment.yaml rename to test/netdata/1.0.8/templates/deployment.yaml index 65dd93746d..aed5f5a367 100644 --- a/charts/netdata/1.0.7/templates/deployment.yaml +++ b/test/netdata/1.0.8/templates/deployment.yaml @@ -28,6 +28,7 @@ spec: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + {{ include "common.resources.limitaion" . | nindent 10 }} env: {{ $envList := (default list .Values.environmentVariables) }} {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} diff --git a/test/netdata/1.0.7/templates/pre-install-job.yaml b/test/netdata/1.0.8/templates/pre-install-job.yaml similarity index 100% rename from test/netdata/1.0.7/templates/pre-install-job.yaml rename to test/netdata/1.0.8/templates/pre-install-job.yaml diff --git a/test/netdata/1.0.7/templates/service.yaml b/test/netdata/1.0.8/templates/service.yaml similarity index 100% rename from test/netdata/1.0.7/templates/service.yaml rename to test/netdata/1.0.8/templates/service.yaml diff --git a/test/netdata/1.0.7/templates/serviceaccount.yaml b/test/netdata/1.0.8/templates/serviceaccount.yaml similarity index 100% rename from test/netdata/1.0.7/templates/serviceaccount.yaml rename to test/netdata/1.0.8/templates/serviceaccount.yaml diff --git a/test/netdata/1.0.7/templates/tests/deployment-check.yaml b/test/netdata/1.0.8/templates/tests/deployment-check.yaml similarity index 100% rename from test/netdata/1.0.7/templates/tests/deployment-check.yaml rename to test/netdata/1.0.8/templates/tests/deployment-check.yaml diff --git a/test/netdata/1.0.7/test_values.yaml b/test/netdata/1.0.8/test_values.yaml similarity index 100% rename from test/netdata/1.0.7/test_values.yaml rename to test/netdata/1.0.8/test_values.yaml diff --git a/test/nextcloud/1.6.3/Chart.lock b/test/nextcloud/1.6.3/Chart.lock deleted file mode 100644 index ab8e203f89..0000000000 --- a/test/nextcloud/1.6.3/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-22T02:45:30.570293724+05:00" diff --git a/test/nextcloud/1.6.3/charts/common-2112.0.0.tgz b/test/nextcloud/1.6.3/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/nextcloud/1.6.3/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/nextcloud/1.6.3/.helmignore b/test/nextcloud/1.6.4/.helmignore similarity index 100% rename from test/nextcloud/1.6.3/.helmignore rename to test/nextcloud/1.6.4/.helmignore diff --git a/test/nextcloud/1.6.4/Chart.lock b/test/nextcloud/1.6.4/Chart.lock new file mode 100644 index 0000000000..2fff9bc91e --- /dev/null +++ b/test/nextcloud/1.6.4/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:50.949598386+05:00" diff --git a/test/nextcloud/1.6.3/Chart.yaml b/test/nextcloud/1.6.4/Chart.yaml similarity index 84% rename from test/nextcloud/1.6.3/Chart.yaml rename to test/nextcloud/1.6.4/Chart.yaml index 73f861705c..f1559daf1a 100644 --- a/test/nextcloud/1.6.3/Chart.yaml +++ b/test/nextcloud/1.6.4/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: 24.0.2 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: A file sharing server that puts the control and security of your own data back into your hands. home: https://nextcloud.com/ @@ -19,4 +19,4 @@ sources: - https://github.com/nextcloud/docker - https://github.com/nextcloud/helm upstream_version: 2.3.2 -version: 1.6.3 +version: 1.6.4 diff --git a/test/nextcloud/1.6.3/README.md b/test/nextcloud/1.6.4/README.md similarity index 100% rename from test/nextcloud/1.6.3/README.md rename to test/nextcloud/1.6.4/README.md diff --git a/test/nextcloud/1.6.3/app-readme.md b/test/nextcloud/1.6.4/app-readme.md similarity index 100% rename from test/nextcloud/1.6.3/app-readme.md rename to test/nextcloud/1.6.4/app-readme.md diff --git a/test/nextcloud/1.6.4/charts/common-2206.0.0.tgz b/test/nextcloud/1.6.4/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/nextcloud/1.6.4/charts/common-2206.0.0.tgz differ diff --git a/test/nextcloud/1.6.3/ix_values.yaml b/test/nextcloud/1.6.4/ix_values.yaml similarity index 100% rename from test/nextcloud/1.6.3/ix_values.yaml rename to test/nextcloud/1.6.4/ix_values.yaml diff --git a/test/nextcloud/1.6.3/migrations/migrate_from_1.1.0 b/test/nextcloud/1.6.4/migrations/migrate_from_1.1.0 similarity index 100% rename from test/nextcloud/1.6.3/migrations/migrate_from_1.1.0 rename to test/nextcloud/1.6.4/migrations/migrate_from_1.1.0 diff --git a/charts/nextcloud/1.6.3/questions.yaml b/test/nextcloud/1.6.4/questions.yaml similarity index 89% rename from charts/nextcloud/1.6.3/questions.yaml rename to test/nextcloud/1.6.4/questions.yaml index d2394b42b4..336e27e633 100644 --- a/charts/nextcloud/1.6.3/questions.yaml +++ b/test/nextcloud/1.6.4/questions.yaml @@ -15,6 +15,9 @@ groups: description: "Configure how pods are replaced when configuration is upgraded" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" + portals: web_portal: @@ -268,3 +271,28 @@ questions: type: path editable: false default: "/postgres_backups" + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" \ No newline at end of file diff --git a/test/nextcloud/1.6.3/requirements.lock b/test/nextcloud/1.6.4/requirements.lock similarity index 67% rename from test/nextcloud/1.6.3/requirements.lock rename to test/nextcloud/1.6.4/requirements.lock index 4a7c02f48d..dabf2b287f 100644 --- a/test/nextcloud/1.6.3/requirements.lock +++ b/test/nextcloud/1.6.4/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 generated: "2021-05-10T13:07:35.423192+05:00" diff --git a/test/nextcloud/1.6.3/templates/NOTES.txt b/test/nextcloud/1.6.4/templates/NOTES.txt similarity index 100% rename from test/nextcloud/1.6.3/templates/NOTES.txt rename to test/nextcloud/1.6.4/templates/NOTES.txt diff --git a/test/nextcloud/1.6.3/templates/_nginx.tpl b/test/nextcloud/1.6.4/templates/_nginx.tpl similarity index 100% rename from test/nextcloud/1.6.3/templates/_nginx.tpl rename to test/nextcloud/1.6.4/templates/_nginx.tpl diff --git a/test/nextcloud/1.6.3/templates/_postgres.tpl b/test/nextcloud/1.6.4/templates/_postgres.tpl similarity index 100% rename from test/nextcloud/1.6.3/templates/_postgres.tpl rename to test/nextcloud/1.6.4/templates/_postgres.tpl diff --git a/test/nextcloud/1.6.3/templates/backup-postgres-config.yaml b/test/nextcloud/1.6.4/templates/backup-postgres-config.yaml similarity index 100% rename from test/nextcloud/1.6.3/templates/backup-postgres-config.yaml rename to test/nextcloud/1.6.4/templates/backup-postgres-config.yaml diff --git a/test/nextcloud/1.6.3/templates/backup-postgres-hook.yaml b/test/nextcloud/1.6.4/templates/backup-postgres-hook.yaml similarity index 100% rename from test/nextcloud/1.6.3/templates/backup-postgres-hook.yaml rename to test/nextcloud/1.6.4/templates/backup-postgres-hook.yaml diff --git a/test/nextcloud/1.6.3/templates/cronjob.yaml b/test/nextcloud/1.6.4/templates/cronjob.yaml similarity index 100% rename from test/nextcloud/1.6.3/templates/cronjob.yaml rename to test/nextcloud/1.6.4/templates/cronjob.yaml diff --git a/test/nextcloud/1.6.3/templates/deployment.yaml b/test/nextcloud/1.6.4/templates/deployment.yaml similarity index 98% rename from test/nextcloud/1.6.3/templates/deployment.yaml rename to test/nextcloud/1.6.4/templates/deployment.yaml index eb0bacde36..f89ebe180b 100644 --- a/test/nextcloud/1.6.3/templates/deployment.yaml +++ b/test/nextcloud/1.6.4/templates/deployment.yaml @@ -28,6 +28,7 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} protocol: TCP {{ end }} - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 8 }} {{ include "common.containers.imageConfig" .Values.image | nindent 8 }} env: {{ include "postgres.envVariableConfiguration" $postgres_values | nindent 10 }} {{ $envList := list }} diff --git a/test/nextcloud/1.6.3/templates/nginx-configmap.yaml b/test/nextcloud/1.6.4/templates/nginx-configmap.yaml similarity index 100% rename from test/nextcloud/1.6.3/templates/nginx-configmap.yaml rename to test/nextcloud/1.6.4/templates/nginx-configmap.yaml diff --git a/test/nextcloud/1.6.3/templates/nginx-secret.yaml b/test/nextcloud/1.6.4/templates/nginx-secret.yaml similarity index 100% rename from test/nextcloud/1.6.3/templates/nginx-secret.yaml rename to test/nextcloud/1.6.4/templates/nginx-secret.yaml diff --git a/test/nextcloud/1.6.3/templates/nuke-deployments-hook.yaml b/test/nextcloud/1.6.4/templates/nuke-deployments-hook.yaml similarity index 100% rename from test/nextcloud/1.6.3/templates/nuke-deployments-hook.yaml rename to test/nextcloud/1.6.4/templates/nuke-deployments-hook.yaml diff --git a/test/nextcloud/1.6.3/templates/postgres-deployment.yaml b/test/nextcloud/1.6.4/templates/postgres-deployment.yaml similarity index 100% rename from test/nextcloud/1.6.3/templates/postgres-deployment.yaml rename to test/nextcloud/1.6.4/templates/postgres-deployment.yaml diff --git a/test/nextcloud/1.6.3/templates/postgres-secret.yaml b/test/nextcloud/1.6.4/templates/postgres-secret.yaml similarity index 100% rename from test/nextcloud/1.6.3/templates/postgres-secret.yaml rename to test/nextcloud/1.6.4/templates/postgres-secret.yaml diff --git a/test/nextcloud/1.6.3/templates/postgres-service.yaml b/test/nextcloud/1.6.4/templates/postgres-service.yaml similarity index 100% rename from test/nextcloud/1.6.3/templates/postgres-service.yaml rename to test/nextcloud/1.6.4/templates/postgres-service.yaml diff --git a/test/nextcloud/1.6.3/templates/secrets.yaml b/test/nextcloud/1.6.4/templates/secrets.yaml similarity index 100% rename from test/nextcloud/1.6.3/templates/secrets.yaml rename to test/nextcloud/1.6.4/templates/secrets.yaml diff --git a/test/nextcloud/1.6.3/templates/service.yaml b/test/nextcloud/1.6.4/templates/service.yaml similarity index 100% rename from test/nextcloud/1.6.3/templates/service.yaml rename to test/nextcloud/1.6.4/templates/service.yaml diff --git a/test/nextcloud/1.6.3/templates/serviceaccount.yaml b/test/nextcloud/1.6.4/templates/serviceaccount.yaml similarity index 100% rename from test/nextcloud/1.6.3/templates/serviceaccount.yaml rename to test/nextcloud/1.6.4/templates/serviceaccount.yaml diff --git a/test/nextcloud/1.6.3/templates/tests/deployment-check.yaml b/test/nextcloud/1.6.4/templates/tests/deployment-check.yaml similarity index 100% rename from test/nextcloud/1.6.3/templates/tests/deployment-check.yaml rename to test/nextcloud/1.6.4/templates/tests/deployment-check.yaml diff --git a/test/nextcloud/1.6.3/test_values.yaml b/test/nextcloud/1.6.4/test_values.yaml similarity index 100% rename from test/nextcloud/1.6.3/test_values.yaml rename to test/nextcloud/1.6.4/test_values.yaml diff --git a/test/photoprism/1.0.3/Chart.lock b/test/photoprism/1.0.3/Chart.lock deleted file mode 100644 index c673f7db60..0000000000 --- a/test/photoprism/1.0.3/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-14T16:04:57.43577594+05:00" diff --git a/test/photoprism/1.0.3/charts/common-2112.0.0.tgz b/test/photoprism/1.0.3/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/photoprism/1.0.3/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/photoprism/1.0.4/Chart.lock b/test/photoprism/1.0.4/Chart.lock new file mode 100644 index 0000000000..2b4d22651e --- /dev/null +++ b/test/photoprism/1.0.4/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.245474471+05:00" diff --git a/test/photoprism/1.0.3/Chart.yaml b/test/photoprism/1.0.4/Chart.yaml similarity index 75% rename from test/photoprism/1.0.3/Chart.yaml rename to test/photoprism/1.0.4/Chart.yaml index 1e1e3132f3..a2d6c6985e 100644 --- a/test/photoprism/1.0.3/Chart.yaml +++ b/test/photoprism/1.0.4/Chart.yaml @@ -3,11 +3,11 @@ appVersion: "20220121" icon: https://photoprism.app/static/icons/logo.svg description: AI-powered app for browsing, organizing & sharing your photo collection. name: photoprism -version: 1.0.3 +version: 1.0.4 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 home: https://photoprism.app/ keywords: - media diff --git a/test/photoprism/1.0.3/README.md b/test/photoprism/1.0.4/README.md similarity index 100% rename from test/photoprism/1.0.3/README.md rename to test/photoprism/1.0.4/README.md diff --git a/test/photoprism/1.0.3/app-readme.md b/test/photoprism/1.0.4/app-readme.md similarity index 100% rename from test/photoprism/1.0.3/app-readme.md rename to test/photoprism/1.0.4/app-readme.md diff --git a/test/photoprism/1.0.4/charts/common-2206.0.0.tgz b/test/photoprism/1.0.4/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/photoprism/1.0.4/charts/common-2206.0.0.tgz differ diff --git a/test/photoprism/1.0.3/ix_values.yaml b/test/photoprism/1.0.4/ix_values.yaml similarity index 100% rename from test/photoprism/1.0.3/ix_values.yaml rename to test/photoprism/1.0.4/ix_values.yaml diff --git a/charts/photoprism/1.0.3/questions.yaml b/test/photoprism/1.0.4/questions.yaml similarity index 88% rename from charts/photoprism/1.0.3/questions.yaml rename to test/photoprism/1.0.4/questions.yaml index 269a6b72bf..3149d64b81 100644 --- a/charts/photoprism/1.0.3/questions.yaml +++ b/test/photoprism/1.0.4/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Networking Configuration for photo prism" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -252,4 +254,29 @@ questions: description: "Host path" schema: type: hostpath - required: true \ No newline at end of file + required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/charts/photoprism/1.0.3/templates/deployment.yaml b/test/photoprism/1.0.4/templates/deployment.yaml similarity index 97% rename from charts/photoprism/1.0.3/templates/deployment.yaml rename to test/photoprism/1.0.4/templates/deployment.yaml index e739b462c2..b06f324420 100644 --- a/charts/photoprism/1.0.3/templates/deployment.yaml +++ b/test/photoprism/1.0.4/templates/deployment.yaml @@ -30,6 +30,7 @@ spec: hostNetwork: false containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} diff --git a/test/photoprism/1.0.3/templates/pre-install-job.yaml b/test/photoprism/1.0.4/templates/pre-install-job.yaml similarity index 100% rename from test/photoprism/1.0.3/templates/pre-install-job.yaml rename to test/photoprism/1.0.4/templates/pre-install-job.yaml diff --git a/test/photoprism/1.0.3/templates/secret.yaml b/test/photoprism/1.0.4/templates/secret.yaml similarity index 100% rename from test/photoprism/1.0.3/templates/secret.yaml rename to test/photoprism/1.0.4/templates/secret.yaml diff --git a/test/photoprism/1.0.3/templates/service.yaml b/test/photoprism/1.0.4/templates/service.yaml similarity index 100% rename from test/photoprism/1.0.3/templates/service.yaml rename to test/photoprism/1.0.4/templates/service.yaml diff --git a/test/photoprism/1.0.3/templates/tests/deployment-check.yaml b/test/photoprism/1.0.4/templates/tests/deployment-check.yaml similarity index 100% rename from test/photoprism/1.0.3/templates/tests/deployment-check.yaml rename to test/photoprism/1.0.4/templates/tests/deployment-check.yaml diff --git a/test/photoprism/1.0.3/test_values.yaml b/test/photoprism/1.0.4/test_values.yaml similarity index 100% rename from test/photoprism/1.0.3/test_values.yaml rename to test/photoprism/1.0.4/test_values.yaml diff --git a/test/pihole/1.0.3/Chart.lock b/test/pihole/1.0.3/Chart.lock deleted file mode 100644 index cec0ddc7dc..0000000000 --- a/test/pihole/1.0.3/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-14T16:04:57.624264811+05:00" diff --git a/test/pihole/1.0.3/charts/common-2112.0.0.tgz b/test/pihole/1.0.3/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/pihole/1.0.3/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/pihole/1.0.4/Chart.lock b/test/pihole/1.0.4/Chart.lock new file mode 100644 index 0000000000..c9228c9abc --- /dev/null +++ b/test/pihole/1.0.4/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.387055978+05:00" diff --git a/test/pihole/1.0.3/Chart.yaml b/test/pihole/1.0.4/Chart.yaml similarity index 73% rename from test/pihole/1.0.3/Chart.yaml rename to test/pihole/1.0.4/Chart.yaml index 35ba7bce94..4493c3e86e 100644 --- a/test/pihole/1.0.3/Chart.yaml +++ b/test/pihole/1.0.4/Chart.yaml @@ -3,11 +3,11 @@ appVersion: 2022.04.3 icon: https://truecharts.org/_static/img/appicons/pihole.png description: DNS and Ad-filtering for your network. name: pihole -version: 1.0.3 +version: 1.0.4 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 home: https://pi-hole.net/ keywords: - networking diff --git a/test/pihole/1.0.3/README.md b/test/pihole/1.0.4/README.md similarity index 100% rename from test/pihole/1.0.3/README.md rename to test/pihole/1.0.4/README.md diff --git a/test/pihole/1.0.3/app-readme.md b/test/pihole/1.0.4/app-readme.md similarity index 100% rename from test/pihole/1.0.3/app-readme.md rename to test/pihole/1.0.4/app-readme.md diff --git a/test/pihole/1.0.4/charts/common-2206.0.0.tgz b/test/pihole/1.0.4/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/pihole/1.0.4/charts/common-2206.0.0.tgz differ diff --git a/test/pihole/1.0.3/ix_values.yaml b/test/pihole/1.0.4/ix_values.yaml similarity index 100% rename from test/pihole/1.0.3/ix_values.yaml rename to test/pihole/1.0.4/ix_values.yaml diff --git a/charts/pihole/1.0.3/questions.yaml b/test/pihole/1.0.4/questions.yaml similarity index 87% rename from charts/pihole/1.0.3/questions.yaml rename to test/pihole/1.0.4/questions.yaml index c5b125ff64..3c7c2e6795 100644 --- a/charts/pihole/1.0.3/questions.yaml +++ b/test/pihole/1.0.4/questions.yaml @@ -7,6 +7,9 @@ groups: description: "Networking Configuration for pihole" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" + portals: web_portal: @@ -257,4 +260,29 @@ questions: description: "Host path" schema: type: hostpath - required: true \ No newline at end of file + required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/test/pihole/1.0.3/templates/deployment.yaml b/test/pihole/1.0.4/templates/deployment.yaml similarity index 97% rename from test/pihole/1.0.3/templates/deployment.yaml rename to test/pihole/1.0.4/templates/deployment.yaml index e6ed06ec4f..fb737c0326 100644 --- a/test/pihole/1.0.3/templates/deployment.yaml +++ b/test/pihole/1.0.4/templates/deployment.yaml @@ -30,6 +30,7 @@ spec: hostNetwork: {{ .Values.hostNetwork }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} diff --git a/test/pihole/1.0.3/templates/pre-install-job.yaml b/test/pihole/1.0.4/templates/pre-install-job.yaml similarity index 100% rename from test/pihole/1.0.3/templates/pre-install-job.yaml rename to test/pihole/1.0.4/templates/pre-install-job.yaml diff --git a/test/pihole/1.0.3/templates/secret.yaml b/test/pihole/1.0.4/templates/secret.yaml similarity index 100% rename from test/pihole/1.0.3/templates/secret.yaml rename to test/pihole/1.0.4/templates/secret.yaml diff --git a/test/pihole/1.0.3/templates/service.yaml b/test/pihole/1.0.4/templates/service.yaml similarity index 100% rename from test/pihole/1.0.3/templates/service.yaml rename to test/pihole/1.0.4/templates/service.yaml diff --git a/test/pihole/1.0.3/templates/tests/deployment-check.yaml b/test/pihole/1.0.4/templates/tests/deployment-check.yaml similarity index 100% rename from test/pihole/1.0.3/templates/tests/deployment-check.yaml rename to test/pihole/1.0.4/templates/tests/deployment-check.yaml diff --git a/test/pihole/1.0.3/test_values.yaml b/test/pihole/1.0.4/test_values.yaml similarity index 100% rename from test/pihole/1.0.3/test_values.yaml rename to test/pihole/1.0.4/test_values.yaml diff --git a/test/plex/1.7.12/Chart.lock b/test/plex/1.7.12/Chart.lock deleted file mode 100644 index c186a59bae..0000000000 --- a/test/plex/1.7.12/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.698767+05:00" diff --git a/test/plex/1.7.12/charts/common-2112.0.0.tgz b/test/plex/1.7.12/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/plex/1.7.12/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/plex/1.7.12/.helmignore b/test/plex/1.7.13/.helmignore similarity index 100% rename from test/plex/1.7.12/.helmignore rename to test/plex/1.7.13/.helmignore diff --git a/test/plex/1.7.13/Chart.lock b/test/plex/1.7.13/Chart.lock new file mode 100644 index 0000000000..9360a2a646 --- /dev/null +++ b/test/plex/1.7.13/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:50.989496155+05:00" diff --git a/test/plex/1.7.12/Chart.yaml b/test/plex/1.7.13/Chart.yaml similarity index 80% rename from test/plex/1.7.12/Chart.yaml rename to test/plex/1.7.13/Chart.yaml index 4a9a613a85..5c386daa4f 100644 --- a/test/plex/1.7.12/Chart.yaml +++ b/test/plex/1.7.13/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: 1.27.1.5916 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Plex Media Server home: https://plex.tv/ icon: https://www.plex.tv/wp-content/uploads/2018/01/pmp-icon-1.png @@ -14,4 +14,4 @@ sources: - https://hub.docker.com/r/plexinc/pms-docker/ - https://github.com/k8s-at-home/charts/tree/master/charts/plex upstream_version: 2.1.0 -version: 1.7.12 +version: 1.7.13 diff --git a/test/plex/1.7.12/README.md b/test/plex/1.7.13/README.md similarity index 100% rename from test/plex/1.7.12/README.md rename to test/plex/1.7.13/README.md diff --git a/test/plex/1.7.12/app-readme.md b/test/plex/1.7.13/app-readme.md similarity index 100% rename from test/plex/1.7.12/app-readme.md rename to test/plex/1.7.13/app-readme.md diff --git a/test/plex/1.7.13/charts/common-2206.0.0.tgz b/test/plex/1.7.13/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/plex/1.7.13/charts/common-2206.0.0.tgz differ diff --git a/test/plex/1.7.12/default_values.yaml b/test/plex/1.7.13/default_values.yaml similarity index 100% rename from test/plex/1.7.12/default_values.yaml rename to test/plex/1.7.13/default_values.yaml diff --git a/test/plex/1.7.12/ix_values.yaml b/test/plex/1.7.13/ix_values.yaml similarity index 100% rename from test/plex/1.7.12/ix_values.yaml rename to test/plex/1.7.13/ix_values.yaml diff --git a/test/plex/1.7.12/migrations/migrate_from_1.0.0 b/test/plex/1.7.13/migrations/migrate_from_1.0.0 similarity index 100% rename from test/plex/1.7.12/migrations/migrate_from_1.0.0 rename to test/plex/1.7.13/migrations/migrate_from_1.0.0 diff --git a/charts/plex/1.7.12/questions.yaml b/test/plex/1.7.13/questions.yaml similarity index 91% rename from charts/plex/1.7.12/questions.yaml rename to test/plex/1.7.13/questions.yaml index 2c6c3ce108..ef84008462 100644 --- a/charts/plex/1.7.12/questions.yaml +++ b/test/plex/1.7.13/questions.yaml @@ -15,6 +15,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -332,3 +334,28 @@ questions: schema: type: boolean default: false + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/test/plex/1.7.12/templates/NOTES.txt b/test/plex/1.7.13/templates/NOTES.txt similarity index 100% rename from test/plex/1.7.12/templates/NOTES.txt rename to test/plex/1.7.13/templates/NOTES.txt diff --git a/charts/plex/1.7.12/templates/deployment.yaml b/test/plex/1.7.13/templates/deployment.yaml similarity index 98% rename from charts/plex/1.7.12/templates/deployment.yaml rename to test/plex/1.7.13/templates/deployment.yaml index dcf080930a..78b6a631c8 100644 --- a/charts/plex/1.7.12/templates/deployment.yaml +++ b/test/plex/1.7.13/templates/deployment.yaml @@ -10,6 +10,7 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} hostname: {{ template "common.names.fullname" . }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ if .Values.enablePlexPass }} {{ include "common.containers.imageConfig" .Values.plexpassImage | nindent 10 }} {{ else }} diff --git a/test/plex/1.7.12/templates/probe_config.yaml b/test/plex/1.7.13/templates/probe_config.yaml similarity index 100% rename from test/plex/1.7.12/templates/probe_config.yaml rename to test/plex/1.7.13/templates/probe_config.yaml diff --git a/test/plex/1.7.12/templates/service-tcp.yaml b/test/plex/1.7.13/templates/service-tcp.yaml similarity index 100% rename from test/plex/1.7.12/templates/service-tcp.yaml rename to test/plex/1.7.13/templates/service-tcp.yaml diff --git a/test/plex/1.7.12/templates/service-udp.yaml b/test/plex/1.7.13/templates/service-udp.yaml similarity index 100% rename from test/plex/1.7.12/templates/service-udp.yaml rename to test/plex/1.7.13/templates/service-udp.yaml diff --git a/test/plex/1.7.12/templates/tests/deployment-check.yaml b/test/plex/1.7.13/templates/tests/deployment-check.yaml similarity index 100% rename from test/plex/1.7.12/templates/tests/deployment-check.yaml rename to test/plex/1.7.13/templates/tests/deployment-check.yaml diff --git a/test/plex/1.7.12/test_values.yaml b/test/plex/1.7.13/test_values.yaml similarity index 100% rename from test/plex/1.7.12/test_values.yaml rename to test/plex/1.7.13/test_values.yaml diff --git a/test/qbittorent/1.0.3/Chart.lock b/test/qbittorent/1.0.3/Chart.lock deleted file mode 100644 index 3c77e9473e..0000000000 --- a/test/qbittorent/1.0.3/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-14T16:04:57.472799995+05:00" diff --git a/test/qbittorent/1.0.3/charts/common-2112.0.0.tgz b/test/qbittorent/1.0.3/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/qbittorent/1.0.3/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/qbittorent/1.0.4/Chart.lock b/test/qbittorent/1.0.4/Chart.lock new file mode 100644 index 0000000000..811ac5dea2 --- /dev/null +++ b/test/qbittorent/1.0.4/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.304590324+05:00" diff --git a/charts/qbittorent/1.0.3/Chart.yaml b/test/qbittorent/1.0.4/Chart.yaml similarity index 74% rename from charts/qbittorent/1.0.3/Chart.yaml rename to test/qbittorent/1.0.4/Chart.yaml index 2537623235..4549fde4b8 100644 --- a/charts/qbittorent/1.0.3/Chart.yaml +++ b/test/qbittorent/1.0.4/Chart.yaml @@ -3,11 +3,11 @@ appVersion: 2.3.1 icon: https://truecharts.org/_static/img/appicons/qbittorrent.png description: Download data from qbittorent. name: qbittorent -version: 1.0.3 +version: 1.0.4 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 home: https://www.qbittorrent.org/ keywords: - storage diff --git a/test/qbittorent/1.0.3/README.md b/test/qbittorent/1.0.4/README.md similarity index 100% rename from test/qbittorent/1.0.3/README.md rename to test/qbittorent/1.0.4/README.md diff --git a/test/qbittorent/1.0.3/app-readme.md b/test/qbittorent/1.0.4/app-readme.md similarity index 100% rename from test/qbittorent/1.0.3/app-readme.md rename to test/qbittorent/1.0.4/app-readme.md diff --git a/test/qbittorent/1.0.4/charts/common-2206.0.0.tgz b/test/qbittorent/1.0.4/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/qbittorent/1.0.4/charts/common-2206.0.0.tgz differ diff --git a/test/qbittorent/1.0.3/ix_values.yaml b/test/qbittorent/1.0.4/ix_values.yaml similarity index 100% rename from test/qbittorent/1.0.3/ix_values.yaml rename to test/qbittorent/1.0.4/ix_values.yaml diff --git a/charts/qbittorent/1.0.3/questions.yaml b/test/qbittorent/1.0.4/questions.yaml similarity index 85% rename from charts/qbittorent/1.0.3/questions.yaml rename to test/qbittorent/1.0.4/questions.yaml index 921fd7412d..317ccb1c22 100644 --- a/charts/qbittorent/1.0.3/questions.yaml +++ b/test/qbittorent/1.0.4/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Networking Configuration for qbittorent" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -221,4 +223,29 @@ questions: description: "Host path" schema: type: hostpath - required: true \ No newline at end of file + required: true + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" diff --git a/charts/qbittorent/1.0.3/templates/deployment.yaml b/test/qbittorent/1.0.4/templates/deployment.yaml similarity index 97% rename from charts/qbittorent/1.0.3/templates/deployment.yaml rename to test/qbittorent/1.0.4/templates/deployment.yaml index e7a3accfae..a13bf36dc9 100644 --- a/charts/qbittorent/1.0.3/templates/deployment.yaml +++ b/test/qbittorent/1.0.4/templates/deployment.yaml @@ -30,6 +30,7 @@ spec: hostNetwork: false containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} diff --git a/test/qbittorent/1.0.3/templates/pre-install-job.yaml b/test/qbittorent/1.0.4/templates/pre-install-job.yaml similarity index 100% rename from test/qbittorent/1.0.3/templates/pre-install-job.yaml rename to test/qbittorent/1.0.4/templates/pre-install-job.yaml diff --git a/test/qbittorent/1.0.3/templates/service.yaml b/test/qbittorent/1.0.4/templates/service.yaml similarity index 100% rename from test/qbittorent/1.0.3/templates/service.yaml rename to test/qbittorent/1.0.4/templates/service.yaml diff --git a/test/qbittorent/1.0.3/templates/tests/deployment-check.yaml b/test/qbittorent/1.0.4/templates/tests/deployment-check.yaml similarity index 100% rename from test/qbittorent/1.0.3/templates/tests/deployment-check.yaml rename to test/qbittorent/1.0.4/templates/tests/deployment-check.yaml diff --git a/test/qbittorent/1.0.3/test_values.yaml b/test/qbittorent/1.0.4/test_values.yaml similarity index 100% rename from test/qbittorent/1.0.3/test_values.yaml rename to test/qbittorent/1.0.4/test_values.yaml diff --git a/test/syncthing/1.0.6/Chart.lock b/test/syncthing/1.0.6/Chart.lock deleted file mode 100644 index 2a438af7b0..0000000000 --- a/test/syncthing/1.0.6/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2022-06-14T16:04:57.537954349+05:00" diff --git a/test/syncthing/1.0.6/charts/common-2112.0.0.tgz b/test/syncthing/1.0.6/charts/common-2112.0.0.tgz deleted file mode 100644 index fd37bb5128..0000000000 Binary files a/test/syncthing/1.0.6/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/syncthing/1.0.7/Chart.lock b/test/syncthing/1.0.7/Chart.lock new file mode 100644 index 0000000000..b7897a5d16 --- /dev/null +++ b/test/syncthing/1.0.7/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 +digest: sha256:b5cc6b211cae3adaa3ab8bd5eca73e34c178b11b3daad489e27e0f72190bb115 +generated: "2022-06-28T00:19:51.349055892+05:00" diff --git a/test/syncthing/1.0.6/Chart.yaml b/test/syncthing/1.0.7/Chart.yaml similarity index 75% rename from test/syncthing/1.0.6/Chart.yaml rename to test/syncthing/1.0.7/Chart.yaml index a4cefad50b..f03b0310c1 100644 --- a/test/syncthing/1.0.6/Chart.yaml +++ b/test/syncthing/1.0.7/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: 1.20.2 dependencies: - name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 + repository: file://../../../library/common/2206.0.0 + version: 2206.0.0 description: Syncthing is a continuous file synchronization program. home: https://syncthing.net/ icon: https://truecharts.org/_static/img/appicons/syncthing.png @@ -11,4 +11,4 @@ keywords: - storage - backup name: syncthing -version: 1.0.6 +version: 1.0.7 diff --git a/test/syncthing/1.0.6/README.md b/test/syncthing/1.0.7/README.md similarity index 100% rename from test/syncthing/1.0.6/README.md rename to test/syncthing/1.0.7/README.md diff --git a/test/syncthing/1.0.6/app-readme.md b/test/syncthing/1.0.7/app-readme.md similarity index 100% rename from test/syncthing/1.0.6/app-readme.md rename to test/syncthing/1.0.7/app-readme.md diff --git a/test/syncthing/1.0.7/charts/common-2206.0.0.tgz b/test/syncthing/1.0.7/charts/common-2206.0.0.tgz new file mode 100644 index 0000000000..f3b5eb0c31 Binary files /dev/null and b/test/syncthing/1.0.7/charts/common-2206.0.0.tgz differ diff --git a/test/syncthing/1.0.6/ix_values.yaml b/test/syncthing/1.0.7/ix_values.yaml similarity index 100% rename from test/syncthing/1.0.6/ix_values.yaml rename to test/syncthing/1.0.7/ix_values.yaml diff --git a/test/syncthing/1.0.6/questions.yaml b/test/syncthing/1.0.7/questions.yaml similarity index 83% rename from test/syncthing/1.0.6/questions.yaml rename to test/syncthing/1.0.7/questions.yaml index ef8fb1aefa..bb5ee3d82e 100644 --- a/test/syncthing/1.0.6/questions.yaml +++ b/test/syncthing/1.0.7/questions.yaml @@ -7,6 +7,8 @@ groups: description: "Networking Configuration for syncthing" - name: "Advanced DNS Settings" description: "Configure DNS settings" + - name: "Resource Limits" + description: "Set CPU/memory limits for Kubernetes Pod" portals: web_portal: @@ -188,3 +190,29 @@ questions: required: true $ref: - "validations/lockedHostPath" + + - variable: enableResourceLimits + label: "Enable Pod resource limits" + group: "Resource Limits" + schema: + type: boolean + default: false + - variable: cpuLimit + label: "CPU Limresource limitsit" + description: "CPU resource limit allow plain integer values with suffix m(milli) e.g 1000m, 100." + group: "Resource Limits" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)" + default: "4000m" + - variable: memLimit + label: "Memory Limit" + group: "Resource Limits" + description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M, 128974848000m, 123Mi" + schema: + type: string + show_if: [["enableResourceLimits", "=", true]] + valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + default: "8Gi" + diff --git a/test/syncthing/1.0.6/templates/deployment.yaml b/test/syncthing/1.0.7/templates/deployment.yaml similarity index 97% rename from test/syncthing/1.0.6/templates/deployment.yaml rename to test/syncthing/1.0.7/templates/deployment.yaml index ceb2cb30f9..63c8982488 100644 --- a/test/syncthing/1.0.6/templates/deployment.yaml +++ b/test/syncthing/1.0.7/templates/deployment.yaml @@ -31,6 +31,7 @@ spec: hostname: {{ .Release.Name }} containers: - name: {{ .Chart.Name }} + {{ include "common.resources.limitaion" . | nindent 10 }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} diff --git a/test/syncthing/1.0.6/templates/pre-install-job.yaml b/test/syncthing/1.0.7/templates/pre-install-job.yaml similarity index 100% rename from test/syncthing/1.0.6/templates/pre-install-job.yaml rename to test/syncthing/1.0.7/templates/pre-install-job.yaml diff --git a/test/syncthing/1.0.6/templates/service.yaml b/test/syncthing/1.0.7/templates/service.yaml similarity index 100% rename from test/syncthing/1.0.6/templates/service.yaml rename to test/syncthing/1.0.7/templates/service.yaml diff --git a/test/syncthing/1.0.6/templates/tests/deployment-check.yaml b/test/syncthing/1.0.7/templates/tests/deployment-check.yaml similarity index 100% rename from test/syncthing/1.0.6/templates/tests/deployment-check.yaml rename to test/syncthing/1.0.7/templates/tests/deployment-check.yaml diff --git a/test/syncthing/1.0.6/test_values.yaml b/test/syncthing/1.0.7/test_values.yaml similarity index 100% rename from test/syncthing/1.0.6/test_values.yaml rename to test/syncthing/1.0.7/test_values.yaml