Merge pull request #79 from truenas/test-train-update

Update test train catalog items

test/chia/1.2.2/Chart.yaml

@@ -1,18 +1,18 @@
 apiVersion: v1
+appVersion: 1.1.7
+dependencies:
+- name: common
+  repository: file://../../../library/common/2105.0.0
+  version: 2105.0.0
 description: Global, Versioned, peer-to-peer filesystem.
-name: chia
-version: 1.2.1
-appVersion: 1.1.4
+home: https://www.chia.net/
+icon: https://www.chia.net/img/chia_logo.svg
 keywords:
 - storage
 - crypto
 - blockchain
-home: https://www.chia.net/
-icon: https://www.chia.net/img/chia_logo.svg
+name: chia
 sources:
 - https://github.com/Chia-Network/chia-blockchain
 - https://github.com/orgs/chia-network/packages/container/package/chia
-dependencies:
-  - name: common
-    repository: file://../../../library/common/2105.0.0
-    version: 2105.0.0
+version: 1.2.2

test/chia/1.2.2/ix_values.yaml

@@ -1,5 +1,5 @@
 image:
-  repository: ghcr.io/chia-network/chia
-  tag: 1.1.4
   pullPolicy: IfNotPresent
+  repository: ghcr.io/chia-network/chia
+  tag: 1.1.7
 updateStrategy: Recreate

test/chia/1.2.2/test_values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: ghcr.io/chia-network/chia
-  tag: 1.1.4
+  tag: 1.1.7
   pullPolicy: IfNotPresent
 updateStrategy: Recreate
 

test/chia/upgrade_info.json

@@ -0,0 +1 @@
+{"filename":  "ix_values.yaml", "keys": ["image"]}

test/chia/upgrade_strategy

@@ -0,0 +1,24 @@
+#!/usr/bin/python3
+import json
+import sys
+
+from catalog_update.upgrade_strategy import semantic_versioning
+
+
+def newer_mapping(image_tags):
+    key = list(image_tags.keys())[0]
+    version = semantic_versioning(image_tags[key])
+    if not version:
+        return {}
+
+    return {
+        'tags': {key: version},
+        'app_version': version,
+    }
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 2:
+        exit(1)
+
+    print(json.dumps(newer_mapping(json.loads(sys.argv[1]))))

test/ipfs/1.1.1/Chart.yaml

@@ -1,18 +1,18 @@
 apiVersion: v1
+appVersion: v0.9.0
+dependencies:
+- name: common
+  repository: file://../../../library/common/2105.0.0
+  version: 2105.0.0
 description: Global, Versioned, peer-to-peer filesystem.
-name: ipfs
-version: 1.1.0
-appVersion: v0.8.0
+home: https://ipfs.io
+icon: https://ipfs.io/ipfs/QmVk7srrwahXLNmcDYvyUEJptyoxpndnRa57YJ11L4jV26/ipfs.go.png
 keywords:
 - storage
 - p2p
-home: https://ipfs.io
-icon: https://ipfs.io/ipfs/QmVk7srrwahXLNmcDYvyUEJptyoxpndnRa57YJ11L4jV26/ipfs.go.png
+name: ipfs
 sources:
 - https://github.com/ipfs/go-ipfs
 - https://hub.docker.com/r/ipfs/go-ipfs
 upstream_version: 0.8.0-rc1
-dependencies:
-  - name: common
-    repository: file://../../../library/common/2105.0.0
-    version: 2105.0.0
+version: 1.1.1

test/ipfs/1.1.1/ix_values.yaml

@@ -1,4 +1,4 @@
 image:
-  repository: ipfs/go-ipfs
-  tag: v0.8.0
   pullPolicy: IfNotPresent
+  repository: ipfs/go-ipfs
+  tag: v0.9.0

test/ipfs/1.1.1/test_values.yaml

@@ -2,7 +2,7 @@
 ##
 image:
   repository: ipfs/go-ipfs
-  tag: v0.8.0
+  tag: v0.9.0
   pullPolicy: IfNotPresent
 
 ## Additional arguments to pass to minio binary

test/ipfs/upgrade_info.json

@@ -0,0 +1 @@
+{"filename":  "ix_values.yaml", "keys": ["image"]}

test/ipfs/upgrade_strategy

@@ -0,0 +1,24 @@
+#!/usr/bin/python3
+import json
+import sys
+
+from catalog_update.upgrade_strategy import semantic_versioning
+
+
+def newer_mapping(image_tags):
+    key = list(image_tags.keys())[0]
+    version = semantic_versioning(image_tags[key])
+    if not version:
+        return {}
+
+    return {
+        'tags': {key: f'v{version}'},
+        'app_version': f'v{version}',
+    }
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 2:
+        exit(1)
+
+    print(json.dumps(newer_mapping(json.loads(sys.argv[1]))))

test/minio/1.3.1/Chart.yaml

@@ -1,19 +1,19 @@
 apiVersion: v1
+appVersion: '2021-06-17'
+dependencies:
+- name: common
+  repository: file://../../../library/common/2105.0.0
+  version: 2105.0.0
 description: High Performance, Kubernetes Native Object Storage
-name: minio
-version: 1.3.0
-appVersion: RELEASE.2021-02-19T04-38-02Z
+home: https://min.io
+icon: https://min.io/resources/img/logo/MINIO_wordmark.png
 keywords:
 - storage
 - object-storage
 - S3
-home: https://min.io
-icon: https://min.io/resources/img/logo/MINIO_wordmark.png
+name: minio
 sources:
 - https://github.com/minio/minio
 - https://github.com/minio/charts
 upstream_version: 8.0.5
-dependencies:
-  - name: common
-    repository: file://../../../library/common/2105.0.0
-    version: 2105.0.0
+version: 1.3.1

test/minio/1.3.1/ix_values.yaml

@@ -1,4 +1,4 @@
 image:
-  repository: minio/minio
-  tag: RELEASE.2021-02-19T04-38-02Z
   pullPolicy: IfNotPresent
+  repository: minio/minio
+  tag: RELEASE.2021-06-17T00-10-46Z

test/minio/1.3.1/test_values.yaml

@@ -2,7 +2,7 @@
 ##
 image:
   repository: minio/minio
-  tag: RELEASE.2021-02-19T04-38-02Z
+  tag: RELEASE.2021-06-17T00-10-46Z
   pullPolicy: IfNotPresent
 
 ## Additional arguments to pass to minio binary

test/minio/upgrade_info.json

@@ -0,0 +1 @@
+{"filename":  "ix_values.yaml", "keys": ["image"]}

test/minio/upgrade_strategy

@@ -0,0 +1,25 @@
+#!/usr/bin/python3
+import json
+import sys
+
+from catalog_update.upgrade_strategy import datetime_versioning
+
+
+def newer_mapping(image_tags):
+    key = list(image_tags.keys())[0]
+    tags = {t.strip('RELEASE.'): t for t in image_tags[key] if t.startswith('RELEASE.') and t.endswith('Z')}
+    version = datetime_versioning(list(tags), '%Y-%m-%dT%H-%M-%SZ')
+    if not version:
+        return {}
+
+    return {
+        'tags': {key: tags[version]},
+        'app_version': version.split('T')[0],
+    }
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 2:
+        exit(1)
+
+    print(json.dumps(newer_mapping(json.loads(sys.argv[1]))))

test/nextcloud/1.3.0/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: nextcloud
 version: 1.3.0
-appVersion: 20.0.7
+appVersion: 21.0.2
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
 - nextcloud

test/nextcloud/1.3.0/ix_values.yaml

@@ -1,4 +1,4 @@
 image:
   repository: nextcloud
-  tag: 20.0.7
+  tag: 21.0.2
   pullPolicy: IfNotPresent

test/nextcloud/1.3.0/test_values.yaml

@@ -3,7 +3,7 @@
 ##
 image:
   repository: nextcloud
-  tag: 19.0.3-apache
+  tag: 21.0.2
   pullPolicy: IfNotPresent
 
 nextcloud:

test/nextcloud/upgrade_info.json

@@ -0,0 +1 @@
+{"filename":  "ix_values.yaml", "keys": ["image"]}

test/nextcloud/upgrade_strategy

@@ -0,0 +1,24 @@
+#!/usr/bin/python3
+import json
+import sys
+
+from catalog_update.upgrade_strategy import semantic_versioning
+
+
+def newer_mapping(image_tags):
+    key = list(image_tags.keys())[0]
+    version = semantic_versioning(image_tags[key])
+    if not version:
+        return {}
+
+    return {
+        'tags': {key: version},
+        'app_version': version,
+    }
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 2:
+        exit(1)
+
+    print(json.dumps(newer_mapping(json.loads(sys.argv[1]))))

test/plex/1.6.1/Chart.yaml

@@ -1,18 +0,0 @@
-apiVersion: v2
-appVersion: 1.21.3.4046-3c1c83ba4
-description: Plex Media Server
-name: plex
-version: 1.6.1
-keywords:
-  - plex
-home: https://plex.tv/
-icon: https://www.plex.tv/wp-content/uploads/2018/01/pmp-icon-1.png
-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
-dependencies:
-  - name: common
-    repository: file://../../../library/common/2105.0.0
-    version: 2105.0.0
-

test/plex/1.6.2/Chart.yaml

@@ -0,0 +1,17 @@
+apiVersion: v2
+appVersion: 1.23.3.4707
+dependencies:
+- name: common
+  repository: file://../../../library/common/2105.0.0
+  version: 2105.0.0
+description: Plex Media Server
+home: https://plex.tv/
+icon: https://www.plex.tv/wp-content/uploads/2018/01/pmp-icon-1.png
+keywords:
+- plex
+name: plex
+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.6.2

test/plex/1.6.2/ix_values.yaml

@@ -1,4 +1,4 @@
 image:
-  repository: plexinc/pms-docker
-  tag: 1.21.3.4046-3c1c83ba4
   pullPolicy: IfNotPresent
+  repository: plexinc/pms-docker
+  tag: 1.23.3.4707-ebb5fe9f3

test/plex/1.6.2/test_values.yaml

@@ -6,7 +6,7 @@
 
 image:
   repository: plexinc/pms-docker
-  tag: 1.20.2.3402-0fec14d92
+  tag: 1.23.3.4707-ebb5fe9f3
   pullPolicy: IfNotPresent
 
 #####   START  --> Official PLEX container environment variables

test/plex/upgrade_info.json

@@ -0,0 +1 @@
+{"filename":  "ix_values.yaml", "keys": ["image"]}

test/plex/upgrade_strategy

@@ -0,0 +1,25 @@
+#!/usr/bin/python3
+import json
+import sys
+
+from catalog_update.upgrade_strategy import semantic_versioning
+
+
+def newer_mapping(image_tags):
+    key = list(image_tags.keys())[0]
+    tags = {t.rsplit('-', 1)[0]: t for t in image_tags[key]}
+    version = semantic_versioning(list(tags))
+    if not version:
+        return {}
+
+    return {
+        'tags': {key: tags[version]},
+        'app_version': version,
+    }
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 2:
+        exit(1)
+
+    print(json.dumps(newer_mapping(json.loads(sys.argv[1]))))