Merge pull request #552 from truenas/NAS-116721

NAS-116721 / 22.12 / Add resource limits for applications

charts/chia/1.3.29/requirements.lock

@@ -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"

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

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"

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"

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 }}

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

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"

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"

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:

charts/diskoverdata/1.0.2/Chart.lock

@@ -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"

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"

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

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"

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

charts/emby/1.0.8/requirements.lock

@@ -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"

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"

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

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

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"

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"

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 }}

charts/home-assistant/1.0.11/Chart.lock

@@ -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"

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"

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

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
+                  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"

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 }}

charts/ipfs/1.2.4/requirements.lock

@@ -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"

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