Merge pull request #629 from truenas/mrehan/update-commons-chart-resources

NAS-117426 / 22.12 / Add common method for defining cpu/memory/gpu limitations

charts/chia/1.3.32/requirements.lock

@@ -1,6 +0,0 @@
-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.33/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v1
 appVersion: v1.5.0
 dependencies:
 - name: common
-  repository: file://../../../library/common/2206.0.0
-  version: 2206.0.0
+  repository: file://../../../library/common/2207.0.0
+  version: 2207.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.32
+version: 1.3.33

charts/chia/1.3.33/requirements.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: file://../../../library/common/2207.0.0
+  version: 2207.0.0
+digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506
+generated: "2022-07-25T00:20:43.583595794+05:00"

charts/chia/1.3.33/templates/deployment.yaml

@@ -21,7 +21,7 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
-          {{ include "common.resources.limitaion" . | nindent 10 }}
+          {{ include "common.resources.limitation" . | nindent 10 }}
           volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }}
           {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
             - name: extrappvolume-{{ $index }}

charts/collabora/1.2.5/requirements.lock

@@ -1,6 +0,0 @@
-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.6/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v1
 appVersion: 21.11.4.1.1
 dependencies:
 - name: common
-  repository: file://../../../library/common/2206.0.0
-  version: 2206.0.0
+  repository: file://../../../library/common/2207.0.0
+  version: 2207.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.5
+version: 1.2.6

charts/collabora/1.2.6/requirements.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: file://../../../library/common/2207.0.0
+  version: 2207.0.0
+digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506
+generated: "2022-07-25T00:20:48.244687333+05:00"

charts/collabora/1.2.6/templates/deployment.yaml

@@ -37,7 +37,7 @@ spec:
             containerPort: 443
             protocol: TCP
         - name: {{ .Chart.Name }}
-          {{ include "common.resources.limitaion" . | nindent 10 }}
+          {{ include "common.resources.limitation" . | nindent 10 }}
           {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
           {{ if .Values.extraAppVolumeMounts }}
           volumeMounts:

charts/diskoverdata/1.0.3/Chart.lock

@@ -1,6 +0,0 @@
-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.4/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: file://../../../library/common/2207.0.0
+  version: 2207.0.0
+digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506
+generated: "2022-07-25T00:20:48.080698555+05:00"

charts/diskoverdata/1.0.4/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.3
+version: 1.0.4
 dependencies:
 - name: common
-  repository: file://../../../library/common/2206.0.0
-  version: 2206.0.0
+  repository: file://../../../library/common/2207.0.0
+  version: 2207.0.0
 home: https://github.com/diskoverdata/diskover-community/
 keywords:
 - storage

charts/diskoverdata/1.0.4/templates/deployment.yaml

@@ -74,7 +74,7 @@ spec:
 
       containers:
         - name: {{ .Chart.Name }}
-          {{ include "common.resources.limitaion" . | nindent 10 }}
+          {{ include "common.resources.limitation" . | 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.10/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: file://../../../library/common/2207.0.0
+  version: 2207.0.0
+digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506
+generated: "2022-07-28T22:31:02.894743529+05:00"

charts/emby/1.0.10/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 appVersion: 4.8.0.2
 dependencies:
 - name: common
-  repository: file://../../../library/common/2206.0.0
-  version: 2206.0.0
+  repository: file://../../../library/common/2207.0.0
+  version: 2207.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.9
+version: 1.0.10

charts/emby/1.0.10/requirements.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
-  repository: file://../../../library/common/2206.0.0
-  version: 2206.0.0
+  repository: file://../../../library/common/2207.0.0
+  version: 2207.0.0
 digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0
 generated: "2021-12-06T21:24:36.674776+05:00"

charts/emby/1.0.10/templates/deployment.yaml

@@ -10,9 +10,8 @@ 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.resources.limitation" . | 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 }}
             {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
             - name: extrappvolume-{{ $index }}

charts/emby/1.0.9/Chart.lock

@@ -1,6 +0,0 @@
-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/upgrade_strategy

@@ -1,13 +1,20 @@
 #!/usr/bin/python3
 import json
+import re
 import sys
 
 from catalog_update.upgrade_strategy import semantic_versioning
 
 
+RE_STABLE_VERSION = re.compile(r'\d+.\d+.\d+.\d+')
+
+
 def newer_mapping(image_tags):
     key = list(image_tags.keys())[0]
-    version = semantic_versioning(sorted(image_tags[key], reverse=True))
+    version = semantic_versioning(sorted(
+        [tag for tag in image_tags[key] if RE_STABLE_VERSION.fullmatch(tag) and tag.split('.')[2] != '0'],
+        reverse=True
+    ))
     if not version:
         return {}
 

charts/home-assistant/1.0.20/Chart.lock

@@ -1,6 +0,0 @@
-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.21/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: file://../../../library/common/2207.0.0
+  version: 2207.0.0
+digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506
+generated: "2022-07-25T00:20:48.151643214+05:00"

charts/home-assistant/1.0.21/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 appVersion: 2022.7.7
 dependencies:
 - name: common
-  repository: file://../../../library/common/2206.0.0
-  version: 2206.0.0
+  repository: file://../../../library/common/2207.0.0
+  version: 2207.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.20
+version: 1.0.21

charts/home-assistant/1.0.21/templates/deployment.yaml

@@ -55,7 +55,7 @@ spec:
 
       containers:
         - name: {{ .Chart.Name }}
-          {{ include "common.resources.limitaion" . | nindent 10 }}
+          {{ include "common.resources.limitation" . | 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.7/requirements.lock

@@ -1,6 +0,0 @@
-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"

charts/ipfs/1.2.8/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v1
 appVersion: v0.14.0
 dependencies:
 - name: common
-  repository: file://../../../library/common/2206.0.0
-  version: 2206.0.0
+  repository: file://../../../library/common/2207.0.0
+  version: 2207.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.7
+version: 1.2.8