From 94e2cf477d054e2a20db29821cd0c678b4c895ac Mon Sep 17 00:00:00 2001 From: sonicaj Date: Fri, 3 May 2024 11:23:26 +0000 Subject: [PATCH] Publish new changes in catalog --- charts/nextcloud/{2.0.1 => 2.0.2}/.helmignore | 0 charts/nextcloud/{2.0.1 => 2.0.2}/Chart.lock | 0 charts/nextcloud/{2.0.1 => 2.0.2}/Chart.yaml | 2 +- charts/nextcloud/{2.0.1 => 2.0.2}/README.md | 0 charts/nextcloud/{2.0.1 => 2.0.2}/app-readme.md | 0 .../{2.0.1 => 2.0.2}/charts/common-1.2.9.tgz | Bin .../nextcloud/{2.0.1 => 2.0.2}/ci/basic-values.yaml | 0 .../nextcloud/{2.0.1 => 2.0.2}/ci/https-values.yaml | 0 charts/nextcloud/{2.0.1 => 2.0.2}/ci/no-cron.yaml | 0 .../nextcloud/{2.0.1 => 2.0.2}/ci/nocmd-values.yaml | 0 .../{2.0.1 => 2.0.2}/ci/onedata-values.yaml | 0 charts/nextcloud/{2.0.1 => 2.0.2}/ix_values.yaml | 0 charts/nextcloud/{2.0.1 => 2.0.2}/metadata.yaml | 0 .../nextcloud/{2.0.1 => 2.0.2}/migrations/migrate | 7 ++++++- charts/nextcloud/{2.0.1 => 2.0.2}/questions.yaml | 7 +++++++ .../nextcloud/{2.0.1 => 2.0.2}/templates/NOTES.txt | 0 .../{2.0.1 => 2.0.2}/templates/_configuration.tpl | 0 .../nextcloud/{2.0.1 => 2.0.2}/templates/_cron.tpl | 0 .../{2.0.1 => 2.0.2}/templates/_migration.tpl | 0 .../templates/_nextcloud-configs.tpl | 0 .../{2.0.1 => 2.0.2}/templates/_nextcloud.tpl | 0 .../templates/_nginx-configuration.tpl | 0 .../nextcloud/{2.0.1 => 2.0.2}/templates/_nginx.tpl | 0 .../{2.0.1 => 2.0.2}/templates/_persistence.tpl | 0 .../{2.0.1 => 2.0.2}/templates/_portal.tpl | 0 .../{2.0.1 => 2.0.2}/templates/_postgres.tpl | 0 .../nextcloud/{2.0.1 => 2.0.2}/templates/_redis.tpl | 0 .../{2.0.1 => 2.0.2}/templates/_service.tpl | 0 .../{2.0.1 => 2.0.2}/templates/common.yaml | 0 .../nextcloud/{2.0.1 => 2.0.2}/to_keep_versions.md | 0 30 files changed, 14 insertions(+), 2 deletions(-) rename charts/nextcloud/{2.0.1 => 2.0.2}/.helmignore (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/Chart.lock (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/Chart.yaml (97%) rename charts/nextcloud/{2.0.1 => 2.0.2}/README.md (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/app-readme.md (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/charts/common-1.2.9.tgz (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/ci/basic-values.yaml (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/ci/https-values.yaml (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/ci/no-cron.yaml (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/ci/nocmd-values.yaml (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/ci/onedata-values.yaml (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/ix_values.yaml (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/metadata.yaml (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/migrations/migrate (90%) rename charts/nextcloud/{2.0.1 => 2.0.2}/questions.yaml (99%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/NOTES.txt (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/_configuration.tpl (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/_cron.tpl (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/_migration.tpl (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/_nextcloud-configs.tpl (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/_nextcloud.tpl (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/_nginx-configuration.tpl (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/_nginx.tpl (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/_persistence.tpl (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/_portal.tpl (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/_postgres.tpl (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/_redis.tpl (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/_service.tpl (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/templates/common.yaml (100%) rename charts/nextcloud/{2.0.1 => 2.0.2}/to_keep_versions.md (100%) diff --git a/charts/nextcloud/2.0.1/.helmignore b/charts/nextcloud/2.0.2/.helmignore similarity index 100% rename from charts/nextcloud/2.0.1/.helmignore rename to charts/nextcloud/2.0.2/.helmignore diff --git a/charts/nextcloud/2.0.1/Chart.lock b/charts/nextcloud/2.0.2/Chart.lock similarity index 100% rename from charts/nextcloud/2.0.1/Chart.lock rename to charts/nextcloud/2.0.2/Chart.lock diff --git a/charts/nextcloud/2.0.1/Chart.yaml b/charts/nextcloud/2.0.2/Chart.yaml similarity index 97% rename from charts/nextcloud/2.0.1/Chart.yaml rename to charts/nextcloud/2.0.2/Chart.yaml index 9a7af2ffcd..836b1fbb4b 100644 --- a/charts/nextcloud/2.0.1/Chart.yaml +++ b/charts/nextcloud/2.0.2/Chart.yaml @@ -4,7 +4,7 @@ description: A file sharing server that puts the control and security of your ow annotations: title: Nextcloud type: application -version: 2.0.1 +version: 2.0.2 apiVersion: v2 appVersion: 29.0.0 kubeVersion: '>=1.16.0-0' diff --git a/charts/nextcloud/2.0.1/README.md b/charts/nextcloud/2.0.2/README.md similarity index 100% rename from charts/nextcloud/2.0.1/README.md rename to charts/nextcloud/2.0.2/README.md diff --git a/charts/nextcloud/2.0.1/app-readme.md b/charts/nextcloud/2.0.2/app-readme.md similarity index 100% rename from charts/nextcloud/2.0.1/app-readme.md rename to charts/nextcloud/2.0.2/app-readme.md diff --git a/charts/nextcloud/2.0.1/charts/common-1.2.9.tgz b/charts/nextcloud/2.0.2/charts/common-1.2.9.tgz similarity index 100% rename from charts/nextcloud/2.0.1/charts/common-1.2.9.tgz rename to charts/nextcloud/2.0.2/charts/common-1.2.9.tgz diff --git a/charts/nextcloud/2.0.1/ci/basic-values.yaml b/charts/nextcloud/2.0.2/ci/basic-values.yaml similarity index 100% rename from charts/nextcloud/2.0.1/ci/basic-values.yaml rename to charts/nextcloud/2.0.2/ci/basic-values.yaml diff --git a/charts/nextcloud/2.0.1/ci/https-values.yaml b/charts/nextcloud/2.0.2/ci/https-values.yaml similarity index 100% rename from charts/nextcloud/2.0.1/ci/https-values.yaml rename to charts/nextcloud/2.0.2/ci/https-values.yaml diff --git a/charts/nextcloud/2.0.1/ci/no-cron.yaml b/charts/nextcloud/2.0.2/ci/no-cron.yaml similarity index 100% rename from charts/nextcloud/2.0.1/ci/no-cron.yaml rename to charts/nextcloud/2.0.2/ci/no-cron.yaml diff --git a/charts/nextcloud/2.0.1/ci/nocmd-values.yaml b/charts/nextcloud/2.0.2/ci/nocmd-values.yaml similarity index 100% rename from charts/nextcloud/2.0.1/ci/nocmd-values.yaml rename to charts/nextcloud/2.0.2/ci/nocmd-values.yaml diff --git a/charts/nextcloud/2.0.1/ci/onedata-values.yaml b/charts/nextcloud/2.0.2/ci/onedata-values.yaml similarity index 100% rename from charts/nextcloud/2.0.1/ci/onedata-values.yaml rename to charts/nextcloud/2.0.2/ci/onedata-values.yaml diff --git a/charts/nextcloud/2.0.1/ix_values.yaml b/charts/nextcloud/2.0.2/ix_values.yaml similarity index 100% rename from charts/nextcloud/2.0.1/ix_values.yaml rename to charts/nextcloud/2.0.2/ix_values.yaml diff --git a/charts/nextcloud/2.0.1/metadata.yaml b/charts/nextcloud/2.0.2/metadata.yaml similarity index 100% rename from charts/nextcloud/2.0.1/metadata.yaml rename to charts/nextcloud/2.0.2/metadata.yaml diff --git a/charts/nextcloud/2.0.1/migrations/migrate b/charts/nextcloud/2.0.2/migrations/migrate similarity index 90% rename from charts/nextcloud/2.0.1/migrations/migrate rename to charts/nextcloud/2.0.2/migrations/migrate index db4fd9cfb9..135e93b9b6 100755 --- a/charts/nextcloud/2.0.1/migrations/migrate +++ b/charts/nextcloud/2.0.2/migrations/migrate @@ -93,13 +93,18 @@ def migrate_common_lib(values): return values def migrate(values): - if 'isDataInTheSameVolume' in values.keys(): + if 'isDataInTheSameVolume' in values.keys() or 'shouldShowStorageToggle' in values.keys(): values['ncStorage']['isDataInTheSameVolume'] = values.pop('isDataInTheSameVolume', True) values['ncStorage']['shouldShowStorageToggle'] = values.pop('shouldShowStorageToggle', True) return values # If this missing, we have already migrated if not 'appVolumeMounts' in values.keys(): + # If 'shouldFixMigration' missing, we should fix migration and then add the key + if not 'migrationFixed' in values['ncStorage'].keys(): + values['ncStorage']['shouldShowStorageToggle'] = True + values['ncStorage']['isDataInTheSameVolume'] = True + values['ncStorage']['migrationFixed'] = True return values diff --git a/charts/nextcloud/2.0.1/questions.yaml b/charts/nextcloud/2.0.2/questions.yaml similarity index 99% rename from charts/nextcloud/2.0.1/questions.yaml rename to charts/nextcloud/2.0.2/questions.yaml index 8929a49912..a5975f8cfb 100644 --- a/charts/nextcloud/2.0.1/questions.yaml +++ b/charts/nextcloud/2.0.2/questions.yaml @@ -254,6 +254,13 @@ questions: type: boolean default: false hidden: true + # Dummy variable so we can skip "fixing" migration on new installations + - variable: migrationFixed + label: "" + schema: + type: boolean + default: true + hidden: true - variable: isDataInTheSameVolume label: "Pre v2 Storage Structure (See the tooltip for more information)" description: | diff --git a/charts/nextcloud/2.0.1/templates/NOTES.txt b/charts/nextcloud/2.0.2/templates/NOTES.txt similarity index 100% rename from charts/nextcloud/2.0.1/templates/NOTES.txt rename to charts/nextcloud/2.0.2/templates/NOTES.txt diff --git a/charts/nextcloud/2.0.1/templates/_configuration.tpl b/charts/nextcloud/2.0.2/templates/_configuration.tpl similarity index 100% rename from charts/nextcloud/2.0.1/templates/_configuration.tpl rename to charts/nextcloud/2.0.2/templates/_configuration.tpl diff --git a/charts/nextcloud/2.0.1/templates/_cron.tpl b/charts/nextcloud/2.0.2/templates/_cron.tpl similarity index 100% rename from charts/nextcloud/2.0.1/templates/_cron.tpl rename to charts/nextcloud/2.0.2/templates/_cron.tpl diff --git a/charts/nextcloud/2.0.1/templates/_migration.tpl b/charts/nextcloud/2.0.2/templates/_migration.tpl similarity index 100% rename from charts/nextcloud/2.0.1/templates/_migration.tpl rename to charts/nextcloud/2.0.2/templates/_migration.tpl diff --git a/charts/nextcloud/2.0.1/templates/_nextcloud-configs.tpl b/charts/nextcloud/2.0.2/templates/_nextcloud-configs.tpl similarity index 100% rename from charts/nextcloud/2.0.1/templates/_nextcloud-configs.tpl rename to charts/nextcloud/2.0.2/templates/_nextcloud-configs.tpl diff --git a/charts/nextcloud/2.0.1/templates/_nextcloud.tpl b/charts/nextcloud/2.0.2/templates/_nextcloud.tpl similarity index 100% rename from charts/nextcloud/2.0.1/templates/_nextcloud.tpl rename to charts/nextcloud/2.0.2/templates/_nextcloud.tpl diff --git a/charts/nextcloud/2.0.1/templates/_nginx-configuration.tpl b/charts/nextcloud/2.0.2/templates/_nginx-configuration.tpl similarity index 100% rename from charts/nextcloud/2.0.1/templates/_nginx-configuration.tpl rename to charts/nextcloud/2.0.2/templates/_nginx-configuration.tpl diff --git a/charts/nextcloud/2.0.1/templates/_nginx.tpl b/charts/nextcloud/2.0.2/templates/_nginx.tpl similarity index 100% rename from charts/nextcloud/2.0.1/templates/_nginx.tpl rename to charts/nextcloud/2.0.2/templates/_nginx.tpl diff --git a/charts/nextcloud/2.0.1/templates/_persistence.tpl b/charts/nextcloud/2.0.2/templates/_persistence.tpl similarity index 100% rename from charts/nextcloud/2.0.1/templates/_persistence.tpl rename to charts/nextcloud/2.0.2/templates/_persistence.tpl diff --git a/charts/nextcloud/2.0.1/templates/_portal.tpl b/charts/nextcloud/2.0.2/templates/_portal.tpl similarity index 100% rename from charts/nextcloud/2.0.1/templates/_portal.tpl rename to charts/nextcloud/2.0.2/templates/_portal.tpl diff --git a/charts/nextcloud/2.0.1/templates/_postgres.tpl b/charts/nextcloud/2.0.2/templates/_postgres.tpl similarity index 100% rename from charts/nextcloud/2.0.1/templates/_postgres.tpl rename to charts/nextcloud/2.0.2/templates/_postgres.tpl diff --git a/charts/nextcloud/2.0.1/templates/_redis.tpl b/charts/nextcloud/2.0.2/templates/_redis.tpl similarity index 100% rename from charts/nextcloud/2.0.1/templates/_redis.tpl rename to charts/nextcloud/2.0.2/templates/_redis.tpl diff --git a/charts/nextcloud/2.0.1/templates/_service.tpl b/charts/nextcloud/2.0.2/templates/_service.tpl similarity index 100% rename from charts/nextcloud/2.0.1/templates/_service.tpl rename to charts/nextcloud/2.0.2/templates/_service.tpl diff --git a/charts/nextcloud/2.0.1/templates/common.yaml b/charts/nextcloud/2.0.2/templates/common.yaml similarity index 100% rename from charts/nextcloud/2.0.1/templates/common.yaml rename to charts/nextcloud/2.0.2/templates/common.yaml diff --git a/charts/nextcloud/2.0.1/to_keep_versions.md b/charts/nextcloud/2.0.2/to_keep_versions.md similarity index 100% rename from charts/nextcloud/2.0.1/to_keep_versions.md rename to charts/nextcloud/2.0.2/to_keep_versions.md