From 004d8db898a5daa66dbfaa6701ee9eb817d56b9c Mon Sep 17 00:00:00 2001 From: sonicaj Date: Sun, 4 Jul 2021 17:00:14 +0500 Subject: [PATCH 1/5] Update chia catalog item in test train --- test/chia/{1.2.1 => 1.2.2}/.helmignore | 0 test/chia/{1.2.1 => 1.2.2}/Chart.yaml | 18 ++++++------- test/chia/{1.2.1 => 1.2.2}/README.md | 0 test/chia/{1.2.1 => 1.2.2}/app-readme.md | 0 .../charts/common-2105.0.0.tgz | Bin .../chia/{1.2.1 => 1.2.2}/default_values.yaml | 0 test/chia/{1.2.1 => 1.2.2}/ix_values.yaml | 4 +-- test/chia/{1.2.1 => 1.2.2}/questions.yaml | 0 test/chia/{1.2.1 => 1.2.2}/requirements.lock | 0 .../templates/deployment.yaml | 0 .../templates/generate-mnemonic.yaml | 0 .../templates/mnemonic-configmap.yaml | 0 test/chia/{1.2.1 => 1.2.2}/test_values.yaml | 2 +- test/chia/{1.2.1 => 1.2.2}/values.yaml | 0 test/chia/upgrade_info.json | 1 + test/chia/upgrade_strategy | 24 ++++++++++++++++++ 16 files changed, 37 insertions(+), 12 deletions(-) rename test/chia/{1.2.1 => 1.2.2}/.helmignore (100%) rename test/chia/{1.2.1 => 1.2.2}/Chart.yaml (72%) rename test/chia/{1.2.1 => 1.2.2}/README.md (100%) rename test/chia/{1.2.1 => 1.2.2}/app-readme.md (100%) rename test/chia/{1.2.1 => 1.2.2}/charts/common-2105.0.0.tgz (100%) rename test/chia/{1.2.1 => 1.2.2}/default_values.yaml (100%) rename test/chia/{1.2.1 => 1.2.2}/ix_values.yaml (88%) rename test/chia/{1.2.1 => 1.2.2}/questions.yaml (100%) rename test/chia/{1.2.1 => 1.2.2}/requirements.lock (100%) rename test/chia/{1.2.1 => 1.2.2}/templates/deployment.yaml (100%) rename test/chia/{1.2.1 => 1.2.2}/templates/generate-mnemonic.yaml (100%) rename test/chia/{1.2.1 => 1.2.2}/templates/mnemonic-configmap.yaml (100%) rename test/chia/{1.2.1 => 1.2.2}/test_values.yaml (94%) rename test/chia/{1.2.1 => 1.2.2}/values.yaml (100%) create mode 100644 test/chia/upgrade_info.json create mode 100755 test/chia/upgrade_strategy diff --git a/test/chia/1.2.1/.helmignore b/test/chia/1.2.2/.helmignore similarity index 100% rename from test/chia/1.2.1/.helmignore rename to test/chia/1.2.2/.helmignore diff --git a/test/chia/1.2.1/Chart.yaml b/test/chia/1.2.2/Chart.yaml similarity index 72% rename from test/chia/1.2.1/Chart.yaml rename to test/chia/1.2.2/Chart.yaml index 45413560..5c2d6dc2 100644 --- a/test/chia/1.2.1/Chart.yaml +++ b/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 diff --git a/test/chia/1.2.1/README.md b/test/chia/1.2.2/README.md similarity index 100% rename from test/chia/1.2.1/README.md rename to test/chia/1.2.2/README.md diff --git a/test/chia/1.2.1/app-readme.md b/test/chia/1.2.2/app-readme.md similarity index 100% rename from test/chia/1.2.1/app-readme.md rename to test/chia/1.2.2/app-readme.md diff --git a/test/chia/1.2.1/charts/common-2105.0.0.tgz b/test/chia/1.2.2/charts/common-2105.0.0.tgz similarity index 100% rename from test/chia/1.2.1/charts/common-2105.0.0.tgz rename to test/chia/1.2.2/charts/common-2105.0.0.tgz diff --git a/test/chia/1.2.1/default_values.yaml b/test/chia/1.2.2/default_values.yaml similarity index 100% rename from test/chia/1.2.1/default_values.yaml rename to test/chia/1.2.2/default_values.yaml diff --git a/test/chia/1.2.1/ix_values.yaml b/test/chia/1.2.2/ix_values.yaml similarity index 88% rename from test/chia/1.2.1/ix_values.yaml rename to test/chia/1.2.2/ix_values.yaml index 0c663f67..acac3810 100644 --- a/test/chia/1.2.1/ix_values.yaml +++ b/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 diff --git a/test/chia/1.2.1/questions.yaml b/test/chia/1.2.2/questions.yaml similarity index 100% rename from test/chia/1.2.1/questions.yaml rename to test/chia/1.2.2/questions.yaml diff --git a/test/chia/1.2.1/requirements.lock b/test/chia/1.2.2/requirements.lock similarity index 100% rename from test/chia/1.2.1/requirements.lock rename to test/chia/1.2.2/requirements.lock diff --git a/test/chia/1.2.1/templates/deployment.yaml b/test/chia/1.2.2/templates/deployment.yaml similarity index 100% rename from test/chia/1.2.1/templates/deployment.yaml rename to test/chia/1.2.2/templates/deployment.yaml diff --git a/test/chia/1.2.1/templates/generate-mnemonic.yaml b/test/chia/1.2.2/templates/generate-mnemonic.yaml similarity index 100% rename from test/chia/1.2.1/templates/generate-mnemonic.yaml rename to test/chia/1.2.2/templates/generate-mnemonic.yaml diff --git a/test/chia/1.2.1/templates/mnemonic-configmap.yaml b/test/chia/1.2.2/templates/mnemonic-configmap.yaml similarity index 100% rename from test/chia/1.2.1/templates/mnemonic-configmap.yaml rename to test/chia/1.2.2/templates/mnemonic-configmap.yaml diff --git a/test/chia/1.2.1/test_values.yaml b/test/chia/1.2.2/test_values.yaml similarity index 94% rename from test/chia/1.2.1/test_values.yaml rename to test/chia/1.2.2/test_values.yaml index b2fd50d6..e53da72e 100644 --- a/test/chia/1.2.1/test_values.yaml +++ b/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 diff --git a/test/chia/1.2.1/values.yaml b/test/chia/1.2.2/values.yaml similarity index 100% rename from test/chia/1.2.1/values.yaml rename to test/chia/1.2.2/values.yaml diff --git a/test/chia/upgrade_info.json b/test/chia/upgrade_info.json new file mode 100644 index 00000000..5bf84fb9 --- /dev/null +++ b/test/chia/upgrade_info.json @@ -0,0 +1 @@ +{"filename": "ix_values.yaml", "keys": ["image"]} diff --git a/test/chia/upgrade_strategy b/test/chia/upgrade_strategy new file mode 100755 index 00000000..adafa418 --- /dev/null +++ b/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])))) From 15afe4c9ecb3f4592eb23609c72f3c9dc6bd304e Mon Sep 17 00:00:00 2001 From: sonicaj Date: Sun, 4 Jul 2021 17:02:45 +0500 Subject: [PATCH 2/5] Update ipfs catalog item in test train --- test/ipfs/{1.1.0 => 1.1.1}/.helmignore | 0 test/ipfs/{1.1.0 => 1.1.1}/Chart.yaml | 18 ++++++------- test/ipfs/{1.1.0 => 1.1.1}/README.md | 0 test/ipfs/{1.1.0 => 1.1.1}/app-readme.md | 0 .../charts/common-2105.0.0.tgz | Bin .../ipfs/{1.1.0 => 1.1.1}/default_values.yaml | 0 test/ipfs/{1.1.0 => 1.1.1}/ix_values.yaml | 4 +-- test/ipfs/{1.1.0 => 1.1.1}/questions.yaml | 0 test/ipfs/{1.1.0 => 1.1.1}/requirements.lock | 0 .../ipfs/{1.1.0 => 1.1.1}/templates/NOTES.txt | 0 .../templates/deployment.yaml | 0 .../{1.1.0 => 1.1.1}/templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 test/ipfs/{1.1.0 => 1.1.1}/test_values.yaml | 2 +- test/ipfs/{1.1.0 => 1.1.1}/values.yaml | 0 test/ipfs/upgrade_info.json | 1 + test/ipfs/upgrade_strategy | 24 ++++++++++++++++++ 17 files changed, 37 insertions(+), 12 deletions(-) rename test/ipfs/{1.1.0 => 1.1.1}/.helmignore (100%) rename test/ipfs/{1.1.0 => 1.1.1}/Chart.yaml (72%) rename test/ipfs/{1.1.0 => 1.1.1}/README.md (100%) rename test/ipfs/{1.1.0 => 1.1.1}/app-readme.md (100%) rename test/ipfs/{1.1.0 => 1.1.1}/charts/common-2105.0.0.tgz (100%) rename test/ipfs/{1.1.0 => 1.1.1}/default_values.yaml (100%) rename test/ipfs/{1.1.0 => 1.1.1}/ix_values.yaml (81%) rename test/ipfs/{1.1.0 => 1.1.1}/questions.yaml (100%) rename test/ipfs/{1.1.0 => 1.1.1}/requirements.lock (100%) rename test/ipfs/{1.1.0 => 1.1.1}/templates/NOTES.txt (100%) rename test/ipfs/{1.1.0 => 1.1.1}/templates/deployment.yaml (100%) rename test/ipfs/{1.1.0 => 1.1.1}/templates/service.yaml (100%) rename test/ipfs/{1.1.0 => 1.1.1}/templates/serviceaccount.yaml (100%) rename test/ipfs/{1.1.0 => 1.1.1}/test_values.yaml (97%) rename test/ipfs/{1.1.0 => 1.1.1}/values.yaml (100%) create mode 100644 test/ipfs/upgrade_info.json create mode 100755 test/ipfs/upgrade_strategy diff --git a/test/ipfs/1.1.0/.helmignore b/test/ipfs/1.1.1/.helmignore similarity index 100% rename from test/ipfs/1.1.0/.helmignore rename to test/ipfs/1.1.1/.helmignore diff --git a/test/ipfs/1.1.0/Chart.yaml b/test/ipfs/1.1.1/Chart.yaml similarity index 72% rename from test/ipfs/1.1.0/Chart.yaml rename to test/ipfs/1.1.1/Chart.yaml index e0336e6a..d1565b9e 100644 --- a/test/ipfs/1.1.0/Chart.yaml +++ b/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 diff --git a/test/ipfs/1.1.0/README.md b/test/ipfs/1.1.1/README.md similarity index 100% rename from test/ipfs/1.1.0/README.md rename to test/ipfs/1.1.1/README.md diff --git a/test/ipfs/1.1.0/app-readme.md b/test/ipfs/1.1.1/app-readme.md similarity index 100% rename from test/ipfs/1.1.0/app-readme.md rename to test/ipfs/1.1.1/app-readme.md diff --git a/test/ipfs/1.1.0/charts/common-2105.0.0.tgz b/test/ipfs/1.1.1/charts/common-2105.0.0.tgz similarity index 100% rename from test/ipfs/1.1.0/charts/common-2105.0.0.tgz rename to test/ipfs/1.1.1/charts/common-2105.0.0.tgz diff --git a/test/ipfs/1.1.0/default_values.yaml b/test/ipfs/1.1.1/default_values.yaml similarity index 100% rename from test/ipfs/1.1.0/default_values.yaml rename to test/ipfs/1.1.1/default_values.yaml diff --git a/test/ipfs/1.1.0/ix_values.yaml b/test/ipfs/1.1.1/ix_values.yaml similarity index 81% rename from test/ipfs/1.1.0/ix_values.yaml rename to test/ipfs/1.1.1/ix_values.yaml index a41f18a1..b88dfe6c 100644 --- a/test/ipfs/1.1.0/ix_values.yaml +++ b/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 diff --git a/test/ipfs/1.1.0/questions.yaml b/test/ipfs/1.1.1/questions.yaml similarity index 100% rename from test/ipfs/1.1.0/questions.yaml rename to test/ipfs/1.1.1/questions.yaml diff --git a/test/ipfs/1.1.0/requirements.lock b/test/ipfs/1.1.1/requirements.lock similarity index 100% rename from test/ipfs/1.1.0/requirements.lock rename to test/ipfs/1.1.1/requirements.lock diff --git a/test/ipfs/1.1.0/templates/NOTES.txt b/test/ipfs/1.1.1/templates/NOTES.txt similarity index 100% rename from test/ipfs/1.1.0/templates/NOTES.txt rename to test/ipfs/1.1.1/templates/NOTES.txt diff --git a/test/ipfs/1.1.0/templates/deployment.yaml b/test/ipfs/1.1.1/templates/deployment.yaml similarity index 100% rename from test/ipfs/1.1.0/templates/deployment.yaml rename to test/ipfs/1.1.1/templates/deployment.yaml diff --git a/test/ipfs/1.1.0/templates/service.yaml b/test/ipfs/1.1.1/templates/service.yaml similarity index 100% rename from test/ipfs/1.1.0/templates/service.yaml rename to test/ipfs/1.1.1/templates/service.yaml diff --git a/test/ipfs/1.1.0/templates/serviceaccount.yaml b/test/ipfs/1.1.1/templates/serviceaccount.yaml similarity index 100% rename from test/ipfs/1.1.0/templates/serviceaccount.yaml rename to test/ipfs/1.1.1/templates/serviceaccount.yaml diff --git a/test/ipfs/1.1.0/test_values.yaml b/test/ipfs/1.1.1/test_values.yaml similarity index 97% rename from test/ipfs/1.1.0/test_values.yaml rename to test/ipfs/1.1.1/test_values.yaml index 9b6d8652..2f385ced 100644 --- a/test/ipfs/1.1.0/test_values.yaml +++ b/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 diff --git a/test/ipfs/1.1.0/values.yaml b/test/ipfs/1.1.1/values.yaml similarity index 100% rename from test/ipfs/1.1.0/values.yaml rename to test/ipfs/1.1.1/values.yaml diff --git a/test/ipfs/upgrade_info.json b/test/ipfs/upgrade_info.json new file mode 100644 index 00000000..5bf84fb9 --- /dev/null +++ b/test/ipfs/upgrade_info.json @@ -0,0 +1 @@ +{"filename": "ix_values.yaml", "keys": ["image"]} diff --git a/test/ipfs/upgrade_strategy b/test/ipfs/upgrade_strategy new file mode 100755 index 00000000..3682360b --- /dev/null +++ b/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])))) From 59c7faee3b06f4915ee0271a9f47cbb034abcdc2 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Sun, 4 Jul 2021 17:47:06 +0500 Subject: [PATCH 3/5] Update minio catalog item in test train --- test/minio/{1.3.0 => 1.3.1}/.helmignore | 0 test/minio/{1.3.0 => 1.3.1}/Chart.yaml | 18 ++++++------- test/minio/{1.3.0 => 1.3.1}/README.md | 0 test/minio/{1.3.0 => 1.3.1}/app-readme.md | 0 .../charts/common-2105.0.0.tgz | Bin .../{1.3.0 => 1.3.1}/default_values.yaml | 0 test/minio/{1.3.0 => 1.3.1}/ix_values.yaml | 4 +-- .../migrations/migrate_from_1.0.0 | 0 test/minio/{1.3.0 => 1.3.1}/questions.yaml | 0 test/minio/{1.3.0 => 1.3.1}/requirements.lock | 0 .../{1.3.0 => 1.3.1}/templates/NOTES.txt | 0 .../{1.3.0 => 1.3.1}/templates/_cert.tpl | 0 .../{1.3.0 => 1.3.1}/templates/_helpers.tpl | 0 .../{1.3.0 => 1.3.1}/templates/configmap.yaml | 0 .../templates/deployment.yaml | 0 .../{1.3.0 => 1.3.1}/templates/secrets.yaml | 0 .../{1.3.0 => 1.3.1}/templates/service.yaml | 0 .../templates/serviceaccount.yaml | 0 test/minio/{1.3.0 => 1.3.1}/test_values.yaml | 2 +- test/minio/{1.3.0 => 1.3.1}/values.yaml | 0 test/minio/upgrade_info.json | 1 + test/minio/upgrade_strategy | 25 ++++++++++++++++++ 22 files changed, 38 insertions(+), 12 deletions(-) rename test/minio/{1.3.0 => 1.3.1}/.helmignore (100%) rename test/minio/{1.3.0 => 1.3.1}/Chart.yaml (68%) rename test/minio/{1.3.0 => 1.3.1}/README.md (100%) rename test/minio/{1.3.0 => 1.3.1}/app-readme.md (100%) rename test/minio/{1.3.0 => 1.3.1}/charts/common-2105.0.0.tgz (100%) rename test/minio/{1.3.0 => 1.3.1}/default_values.yaml (100%) rename test/minio/{1.3.0 => 1.3.1}/ix_values.yaml (62%) rename test/minio/{1.3.0 => 1.3.1}/migrations/migrate_from_1.0.0 (100%) rename test/minio/{1.3.0 => 1.3.1}/questions.yaml (100%) rename test/minio/{1.3.0 => 1.3.1}/requirements.lock (100%) rename test/minio/{1.3.0 => 1.3.1}/templates/NOTES.txt (100%) rename test/minio/{1.3.0 => 1.3.1}/templates/_cert.tpl (100%) rename test/minio/{1.3.0 => 1.3.1}/templates/_helpers.tpl (100%) rename test/minio/{1.3.0 => 1.3.1}/templates/configmap.yaml (100%) rename test/minio/{1.3.0 => 1.3.1}/templates/deployment.yaml (100%) rename test/minio/{1.3.0 => 1.3.1}/templates/secrets.yaml (100%) rename test/minio/{1.3.0 => 1.3.1}/templates/service.yaml (100%) rename test/minio/{1.3.0 => 1.3.1}/templates/serviceaccount.yaml (100%) rename test/minio/{1.3.0 => 1.3.1}/test_values.yaml (93%) rename test/minio/{1.3.0 => 1.3.1}/values.yaml (100%) create mode 100644 test/minio/upgrade_info.json create mode 100755 test/minio/upgrade_strategy diff --git a/test/minio/1.3.0/.helmignore b/test/minio/1.3.1/.helmignore similarity index 100% rename from test/minio/1.3.0/.helmignore rename to test/minio/1.3.1/.helmignore diff --git a/test/minio/1.3.0/Chart.yaml b/test/minio/1.3.1/Chart.yaml similarity index 68% rename from test/minio/1.3.0/Chart.yaml rename to test/minio/1.3.1/Chart.yaml index d7e833c0..1cbad246 100644 --- a/test/minio/1.3.0/Chart.yaml +++ b/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 diff --git a/test/minio/1.3.0/README.md b/test/minio/1.3.1/README.md similarity index 100% rename from test/minio/1.3.0/README.md rename to test/minio/1.3.1/README.md diff --git a/test/minio/1.3.0/app-readme.md b/test/minio/1.3.1/app-readme.md similarity index 100% rename from test/minio/1.3.0/app-readme.md rename to test/minio/1.3.1/app-readme.md diff --git a/test/minio/1.3.0/charts/common-2105.0.0.tgz b/test/minio/1.3.1/charts/common-2105.0.0.tgz similarity index 100% rename from test/minio/1.3.0/charts/common-2105.0.0.tgz rename to test/minio/1.3.1/charts/common-2105.0.0.tgz diff --git a/test/minio/1.3.0/default_values.yaml b/test/minio/1.3.1/default_values.yaml similarity index 100% rename from test/minio/1.3.0/default_values.yaml rename to test/minio/1.3.1/default_values.yaml diff --git a/test/minio/1.3.0/ix_values.yaml b/test/minio/1.3.1/ix_values.yaml similarity index 62% rename from test/minio/1.3.0/ix_values.yaml rename to test/minio/1.3.1/ix_values.yaml index 3a1e63df..8a06acd1 100644 --- a/test/minio/1.3.0/ix_values.yaml +++ b/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 diff --git a/test/minio/1.3.0/migrations/migrate_from_1.0.0 b/test/minio/1.3.1/migrations/migrate_from_1.0.0 similarity index 100% rename from test/minio/1.3.0/migrations/migrate_from_1.0.0 rename to test/minio/1.3.1/migrations/migrate_from_1.0.0 diff --git a/test/minio/1.3.0/questions.yaml b/test/minio/1.3.1/questions.yaml similarity index 100% rename from test/minio/1.3.0/questions.yaml rename to test/minio/1.3.1/questions.yaml diff --git a/test/minio/1.3.0/requirements.lock b/test/minio/1.3.1/requirements.lock similarity index 100% rename from test/minio/1.3.0/requirements.lock rename to test/minio/1.3.1/requirements.lock diff --git a/test/minio/1.3.0/templates/NOTES.txt b/test/minio/1.3.1/templates/NOTES.txt similarity index 100% rename from test/minio/1.3.0/templates/NOTES.txt rename to test/minio/1.3.1/templates/NOTES.txt diff --git a/test/minio/1.3.0/templates/_cert.tpl b/test/minio/1.3.1/templates/_cert.tpl similarity index 100% rename from test/minio/1.3.0/templates/_cert.tpl rename to test/minio/1.3.1/templates/_cert.tpl diff --git a/test/minio/1.3.0/templates/_helpers.tpl b/test/minio/1.3.1/templates/_helpers.tpl similarity index 100% rename from test/minio/1.3.0/templates/_helpers.tpl rename to test/minio/1.3.1/templates/_helpers.tpl diff --git a/test/minio/1.3.0/templates/configmap.yaml b/test/minio/1.3.1/templates/configmap.yaml similarity index 100% rename from test/minio/1.3.0/templates/configmap.yaml rename to test/minio/1.3.1/templates/configmap.yaml diff --git a/test/minio/1.3.0/templates/deployment.yaml b/test/minio/1.3.1/templates/deployment.yaml similarity index 100% rename from test/minio/1.3.0/templates/deployment.yaml rename to test/minio/1.3.1/templates/deployment.yaml diff --git a/test/minio/1.3.0/templates/secrets.yaml b/test/minio/1.3.1/templates/secrets.yaml similarity index 100% rename from test/minio/1.3.0/templates/secrets.yaml rename to test/minio/1.3.1/templates/secrets.yaml diff --git a/test/minio/1.3.0/templates/service.yaml b/test/minio/1.3.1/templates/service.yaml similarity index 100% rename from test/minio/1.3.0/templates/service.yaml rename to test/minio/1.3.1/templates/service.yaml diff --git a/test/minio/1.3.0/templates/serviceaccount.yaml b/test/minio/1.3.1/templates/serviceaccount.yaml similarity index 100% rename from test/minio/1.3.0/templates/serviceaccount.yaml rename to test/minio/1.3.1/templates/serviceaccount.yaml diff --git a/test/minio/1.3.0/test_values.yaml b/test/minio/1.3.1/test_values.yaml similarity index 93% rename from test/minio/1.3.0/test_values.yaml rename to test/minio/1.3.1/test_values.yaml index 99b2cf30..08ad23b3 100644 --- a/test/minio/1.3.0/test_values.yaml +++ b/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 diff --git a/test/minio/1.3.0/values.yaml b/test/minio/1.3.1/values.yaml similarity index 100% rename from test/minio/1.3.0/values.yaml rename to test/minio/1.3.1/values.yaml diff --git a/test/minio/upgrade_info.json b/test/minio/upgrade_info.json new file mode 100644 index 00000000..5bf84fb9 --- /dev/null +++ b/test/minio/upgrade_info.json @@ -0,0 +1 @@ +{"filename": "ix_values.yaml", "keys": ["image"]} diff --git a/test/minio/upgrade_strategy b/test/minio/upgrade_strategy new file mode 100755 index 00000000..f8293e4f --- /dev/null +++ b/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])))) From 7e40aa20b57f4bde764ffeea61a60e58ba636f8d Mon Sep 17 00:00:00 2001 From: sonicaj Date: Sun, 4 Jul 2021 17:57:45 +0500 Subject: [PATCH 4/5] Update nextcloud catalog item in test train --- test/nextcloud/1.3.0/Chart.yaml | 2 +- test/nextcloud/1.3.0/ix_values.yaml | 2 +- test/nextcloud/1.3.0/test_values.yaml | 2 +- test/nextcloud/upgrade_info.json | 1 + test/nextcloud/upgrade_strategy | 24 ++++++++++++++++++++++++ 5 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 test/nextcloud/upgrade_info.json create mode 100755 test/nextcloud/upgrade_strategy diff --git a/test/nextcloud/1.3.0/Chart.yaml b/test/nextcloud/1.3.0/Chart.yaml index ab14879c..7f44eb64 100644 --- a/test/nextcloud/1.3.0/Chart.yaml +++ b/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 diff --git a/test/nextcloud/1.3.0/ix_values.yaml b/test/nextcloud/1.3.0/ix_values.yaml index c709e485..0d2d539c 100644 --- a/test/nextcloud/1.3.0/ix_values.yaml +++ b/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 diff --git a/test/nextcloud/1.3.0/test_values.yaml b/test/nextcloud/1.3.0/test_values.yaml index 6e765690..24fde43d 100644 --- a/test/nextcloud/1.3.0/test_values.yaml +++ b/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: diff --git a/test/nextcloud/upgrade_info.json b/test/nextcloud/upgrade_info.json new file mode 100644 index 00000000..5bf84fb9 --- /dev/null +++ b/test/nextcloud/upgrade_info.json @@ -0,0 +1 @@ +{"filename": "ix_values.yaml", "keys": ["image"]} diff --git a/test/nextcloud/upgrade_strategy b/test/nextcloud/upgrade_strategy new file mode 100755 index 00000000..adafa418 --- /dev/null +++ b/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])))) From 54337743e6cb3a90c8408e36a653b1a44b7fcb03 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Sun, 4 Jul 2021 17:58:36 +0500 Subject: [PATCH 5/5] Update plex catalog item in test train --- test/plex/1.6.1/Chart.yaml | 18 ------------- test/plex/{1.6.1 => 1.6.2}/.helmignore | 0 test/plex/{1.6.1 => 1.6.2}/Chart.lock | 0 test/plex/1.6.2/Chart.yaml | 17 ++++++++++++ test/plex/{1.6.1 => 1.6.2}/README.md | 0 test/plex/{1.6.1 => 1.6.2}/app-readme.md | 0 .../charts/common-2105.0.0.tgz | Bin .../plex/{1.6.1 => 1.6.2}/default_values.yaml | 0 test/plex/{1.6.1 => 1.6.2}/ix_values.yaml | 4 +-- .../migrations/migrate_from_1.0.0 | 0 test/plex/{1.6.1 => 1.6.2}/questions.yaml | 0 .../plex/{1.6.1 => 1.6.2}/templates/NOTES.txt | 0 .../templates/deployment.yaml | 0 .../templates/probe_config.yaml | 0 .../templates/service-tcp.yaml | 0 .../templates/service-udp.yaml | 0 test/plex/{1.6.1 => 1.6.2}/test_values.yaml | 2 +- test/plex/{1.6.1 => 1.6.2}/values.yaml | 0 test/plex/upgrade_info.json | 1 + test/plex/upgrade_strategy | 25 ++++++++++++++++++ 20 files changed, 46 insertions(+), 21 deletions(-) delete mode 100644 test/plex/1.6.1/Chart.yaml rename test/plex/{1.6.1 => 1.6.2}/.helmignore (100%) rename test/plex/{1.6.1 => 1.6.2}/Chart.lock (100%) create mode 100644 test/plex/1.6.2/Chart.yaml rename test/plex/{1.6.1 => 1.6.2}/README.md (100%) rename test/plex/{1.6.1 => 1.6.2}/app-readme.md (100%) rename test/plex/{1.6.1 => 1.6.2}/charts/common-2105.0.0.tgz (100%) rename test/plex/{1.6.1 => 1.6.2}/default_values.yaml (100%) rename test/plex/{1.6.1 => 1.6.2}/ix_values.yaml (69%) rename test/plex/{1.6.1 => 1.6.2}/migrations/migrate_from_1.0.0 (100%) rename test/plex/{1.6.1 => 1.6.2}/questions.yaml (100%) rename test/plex/{1.6.1 => 1.6.2}/templates/NOTES.txt (100%) rename test/plex/{1.6.1 => 1.6.2}/templates/deployment.yaml (100%) rename test/plex/{1.6.1 => 1.6.2}/templates/probe_config.yaml (100%) rename test/plex/{1.6.1 => 1.6.2}/templates/service-tcp.yaml (100%) rename test/plex/{1.6.1 => 1.6.2}/templates/service-udp.yaml (100%) rename test/plex/{1.6.1 => 1.6.2}/test_values.yaml (98%) rename test/plex/{1.6.1 => 1.6.2}/values.yaml (100%) create mode 100644 test/plex/upgrade_info.json create mode 100755 test/plex/upgrade_strategy diff --git a/test/plex/1.6.1/Chart.yaml b/test/plex/1.6.1/Chart.yaml deleted file mode 100644 index f027411a..00000000 --- a/test/plex/1.6.1/Chart.yaml +++ /dev/null @@ -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 - diff --git a/test/plex/1.6.1/.helmignore b/test/plex/1.6.2/.helmignore similarity index 100% rename from test/plex/1.6.1/.helmignore rename to test/plex/1.6.2/.helmignore diff --git a/test/plex/1.6.1/Chart.lock b/test/plex/1.6.2/Chart.lock similarity index 100% rename from test/plex/1.6.1/Chart.lock rename to test/plex/1.6.2/Chart.lock diff --git a/test/plex/1.6.2/Chart.yaml b/test/plex/1.6.2/Chart.yaml new file mode 100644 index 00000000..6f8de164 --- /dev/null +++ b/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 diff --git a/test/plex/1.6.1/README.md b/test/plex/1.6.2/README.md similarity index 100% rename from test/plex/1.6.1/README.md rename to test/plex/1.6.2/README.md diff --git a/test/plex/1.6.1/app-readme.md b/test/plex/1.6.2/app-readme.md similarity index 100% rename from test/plex/1.6.1/app-readme.md rename to test/plex/1.6.2/app-readme.md diff --git a/test/plex/1.6.1/charts/common-2105.0.0.tgz b/test/plex/1.6.2/charts/common-2105.0.0.tgz similarity index 100% rename from test/plex/1.6.1/charts/common-2105.0.0.tgz rename to test/plex/1.6.2/charts/common-2105.0.0.tgz diff --git a/test/plex/1.6.1/default_values.yaml b/test/plex/1.6.2/default_values.yaml similarity index 100% rename from test/plex/1.6.1/default_values.yaml rename to test/plex/1.6.2/default_values.yaml diff --git a/test/plex/1.6.1/ix_values.yaml b/test/plex/1.6.2/ix_values.yaml similarity index 69% rename from test/plex/1.6.1/ix_values.yaml rename to test/plex/1.6.2/ix_values.yaml index aa004191..23808f27 100644 --- a/test/plex/1.6.1/ix_values.yaml +++ b/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 diff --git a/test/plex/1.6.1/migrations/migrate_from_1.0.0 b/test/plex/1.6.2/migrations/migrate_from_1.0.0 similarity index 100% rename from test/plex/1.6.1/migrations/migrate_from_1.0.0 rename to test/plex/1.6.2/migrations/migrate_from_1.0.0 diff --git a/test/plex/1.6.1/questions.yaml b/test/plex/1.6.2/questions.yaml similarity index 100% rename from test/plex/1.6.1/questions.yaml rename to test/plex/1.6.2/questions.yaml diff --git a/test/plex/1.6.1/templates/NOTES.txt b/test/plex/1.6.2/templates/NOTES.txt similarity index 100% rename from test/plex/1.6.1/templates/NOTES.txt rename to test/plex/1.6.2/templates/NOTES.txt diff --git a/test/plex/1.6.1/templates/deployment.yaml b/test/plex/1.6.2/templates/deployment.yaml similarity index 100% rename from test/plex/1.6.1/templates/deployment.yaml rename to test/plex/1.6.2/templates/deployment.yaml diff --git a/test/plex/1.6.1/templates/probe_config.yaml b/test/plex/1.6.2/templates/probe_config.yaml similarity index 100% rename from test/plex/1.6.1/templates/probe_config.yaml rename to test/plex/1.6.2/templates/probe_config.yaml diff --git a/test/plex/1.6.1/templates/service-tcp.yaml b/test/plex/1.6.2/templates/service-tcp.yaml similarity index 100% rename from test/plex/1.6.1/templates/service-tcp.yaml rename to test/plex/1.6.2/templates/service-tcp.yaml diff --git a/test/plex/1.6.1/templates/service-udp.yaml b/test/plex/1.6.2/templates/service-udp.yaml similarity index 100% rename from test/plex/1.6.1/templates/service-udp.yaml rename to test/plex/1.6.2/templates/service-udp.yaml diff --git a/test/plex/1.6.1/test_values.yaml b/test/plex/1.6.2/test_values.yaml similarity index 98% rename from test/plex/1.6.1/test_values.yaml rename to test/plex/1.6.2/test_values.yaml index 193c0fe3..f053fa52 100644 --- a/test/plex/1.6.1/test_values.yaml +++ b/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 diff --git a/test/plex/1.6.1/values.yaml b/test/plex/1.6.2/values.yaml similarity index 100% rename from test/plex/1.6.1/values.yaml rename to test/plex/1.6.2/values.yaml diff --git a/test/plex/upgrade_info.json b/test/plex/upgrade_info.json new file mode 100644 index 00000000..5bf84fb9 --- /dev/null +++ b/test/plex/upgrade_info.json @@ -0,0 +1 @@ +{"filename": "ix_values.yaml", "keys": ["image"]} diff --git a/test/plex/upgrade_strategy b/test/plex/upgrade_strategy new file mode 100755 index 00000000..a8940ad6 --- /dev/null +++ b/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]))))