From 59c7faee3b06f4915ee0271a9f47cbb034abcdc2 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Sun, 4 Jul 2021 17:47:06 +0500 Subject: [PATCH] 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 d7e833c0f2..1cbad2460c 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 3a1e63df71..8a06acd14a 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 99b2cf30c7..08ad23b3e9 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 0000000000..5bf84fb901 --- /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 0000000000..f8293e4f9f --- /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]))))