From 359b96f32e3133aab55d5cd614f24c1e9ac847f1 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Fri, 3 May 2024 09:19:49 +0000 Subject: [PATCH] Publish new changes in catalog --- charts/nextcloud/{2.0.0 => 2.0.1}/.helmignore | 0 charts/nextcloud/{2.0.0 => 2.0.1}/Chart.lock | 0 charts/nextcloud/{2.0.0 => 2.0.1}/Chart.yaml | 2 +- charts/nextcloud/{2.0.0 => 2.0.1}/README.md | 0 .../nextcloud/{2.0.0 => 2.0.1}/app-readme.md | 0 .../{2.0.0 => 2.0.1}/charts/common-1.2.9.tgz | Bin .../{2.0.0 => 2.0.1}/ci/basic-values.yaml | 0 .../{2.0.0 => 2.0.1}/ci/https-values.yaml | 0 .../{2.0.0 => 2.0.1}/ci/no-cron.yaml | 0 .../{2.0.0 => 2.0.1}/ci/nocmd-values.yaml | 0 .../{2.0.0 => 2.0.1}/ci/onedata-values.yaml | 0 .../nextcloud/{2.0.0 => 2.0.1}/ix_values.yaml | 0 .../nextcloud/{2.0.0 => 2.0.1}/metadata.yaml | 0 .../{2.0.0 => 2.0.1}/migrations/migrate | 9 +++-- .../nextcloud/{2.0.0 => 2.0.1}/questions.yaml | 34 +++++++++++++----- .../{2.0.0 => 2.0.1}/templates/NOTES.txt | 0 .../templates/_configuration.tpl | 0 .../{2.0.0 => 2.0.1}/templates/_cron.tpl | 0 .../{2.0.0 => 2.0.1}/templates/_migration.tpl | 0 .../templates/_nextcloud-configs.tpl | 0 .../{2.0.0 => 2.0.1}/templates/_nextcloud.tpl | 0 .../templates/_nginx-configuration.tpl | 0 .../{2.0.0 => 2.0.1}/templates/_nginx.tpl | 0 .../templates/_persistence.tpl | 0 .../{2.0.0 => 2.0.1}/templates/_portal.tpl | 0 .../{2.0.0 => 2.0.1}/templates/_postgres.tpl | 0 .../{2.0.0 => 2.0.1}/templates/_redis.tpl | 0 .../{2.0.0 => 2.0.1}/templates/_service.tpl | 0 .../{2.0.0 => 2.0.1}/templates/common.yaml | 0 .../{2.0.0 => 2.0.1}/to_keep_versions.md | 0 30 files changed, 34 insertions(+), 11 deletions(-) rename charts/nextcloud/{2.0.0 => 2.0.1}/.helmignore (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/Chart.lock (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/Chart.yaml (97%) rename charts/nextcloud/{2.0.0 => 2.0.1}/README.md (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/app-readme.md (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/charts/common-1.2.9.tgz (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/ci/basic-values.yaml (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/ci/https-values.yaml (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/ci/no-cron.yaml (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/ci/nocmd-values.yaml (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/ci/onedata-values.yaml (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/ix_values.yaml (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/metadata.yaml (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/migrations/migrate (91%) rename charts/nextcloud/{2.0.0 => 2.0.1}/questions.yaml (97%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/NOTES.txt (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/_configuration.tpl (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/_cron.tpl (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/_migration.tpl (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/_nextcloud-configs.tpl (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/_nextcloud.tpl (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/_nginx-configuration.tpl (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/_nginx.tpl (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/_persistence.tpl (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/_portal.tpl (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/_postgres.tpl (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/_redis.tpl (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/_service.tpl (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/templates/common.yaml (100%) rename charts/nextcloud/{2.0.0 => 2.0.1}/to_keep_versions.md (100%) diff --git a/charts/nextcloud/2.0.0/.helmignore b/charts/nextcloud/2.0.1/.helmignore similarity index 100% rename from charts/nextcloud/2.0.0/.helmignore rename to charts/nextcloud/2.0.1/.helmignore diff --git a/charts/nextcloud/2.0.0/Chart.lock b/charts/nextcloud/2.0.1/Chart.lock similarity index 100% rename from charts/nextcloud/2.0.0/Chart.lock rename to charts/nextcloud/2.0.1/Chart.lock diff --git a/charts/nextcloud/2.0.0/Chart.yaml b/charts/nextcloud/2.0.1/Chart.yaml similarity index 97% rename from charts/nextcloud/2.0.0/Chart.yaml rename to charts/nextcloud/2.0.1/Chart.yaml index 9ec572e274..9a7af2ffcd 100644 --- a/charts/nextcloud/2.0.0/Chart.yaml +++ b/charts/nextcloud/2.0.1/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.0 +version: 2.0.1 apiVersion: v2 appVersion: 29.0.0 kubeVersion: '>=1.16.0-0' diff --git a/charts/nextcloud/2.0.0/README.md b/charts/nextcloud/2.0.1/README.md similarity index 100% rename from charts/nextcloud/2.0.0/README.md rename to charts/nextcloud/2.0.1/README.md diff --git a/charts/nextcloud/2.0.0/app-readme.md b/charts/nextcloud/2.0.1/app-readme.md similarity index 100% rename from charts/nextcloud/2.0.0/app-readme.md rename to charts/nextcloud/2.0.1/app-readme.md diff --git a/charts/nextcloud/2.0.0/charts/common-1.2.9.tgz b/charts/nextcloud/2.0.1/charts/common-1.2.9.tgz similarity index 100% rename from charts/nextcloud/2.0.0/charts/common-1.2.9.tgz rename to charts/nextcloud/2.0.1/charts/common-1.2.9.tgz diff --git a/charts/nextcloud/2.0.0/ci/basic-values.yaml b/charts/nextcloud/2.0.1/ci/basic-values.yaml similarity index 100% rename from charts/nextcloud/2.0.0/ci/basic-values.yaml rename to charts/nextcloud/2.0.1/ci/basic-values.yaml diff --git a/charts/nextcloud/2.0.0/ci/https-values.yaml b/charts/nextcloud/2.0.1/ci/https-values.yaml similarity index 100% rename from charts/nextcloud/2.0.0/ci/https-values.yaml rename to charts/nextcloud/2.0.1/ci/https-values.yaml diff --git a/charts/nextcloud/2.0.0/ci/no-cron.yaml b/charts/nextcloud/2.0.1/ci/no-cron.yaml similarity index 100% rename from charts/nextcloud/2.0.0/ci/no-cron.yaml rename to charts/nextcloud/2.0.1/ci/no-cron.yaml diff --git a/charts/nextcloud/2.0.0/ci/nocmd-values.yaml b/charts/nextcloud/2.0.1/ci/nocmd-values.yaml similarity index 100% rename from charts/nextcloud/2.0.0/ci/nocmd-values.yaml rename to charts/nextcloud/2.0.1/ci/nocmd-values.yaml diff --git a/charts/nextcloud/2.0.0/ci/onedata-values.yaml b/charts/nextcloud/2.0.1/ci/onedata-values.yaml similarity index 100% rename from charts/nextcloud/2.0.0/ci/onedata-values.yaml rename to charts/nextcloud/2.0.1/ci/onedata-values.yaml diff --git a/charts/nextcloud/2.0.0/ix_values.yaml b/charts/nextcloud/2.0.1/ix_values.yaml similarity index 100% rename from charts/nextcloud/2.0.0/ix_values.yaml rename to charts/nextcloud/2.0.1/ix_values.yaml diff --git a/charts/nextcloud/2.0.0/metadata.yaml b/charts/nextcloud/2.0.1/metadata.yaml similarity index 100% rename from charts/nextcloud/2.0.0/metadata.yaml rename to charts/nextcloud/2.0.1/metadata.yaml diff --git a/charts/nextcloud/2.0.0/migrations/migrate b/charts/nextcloud/2.0.1/migrations/migrate similarity index 91% rename from charts/nextcloud/2.0.0/migrations/migrate rename to charts/nextcloud/2.0.1/migrations/migrate index c6d6371655..db4fd9cfb9 100755 --- a/charts/nextcloud/2.0.0/migrations/migrate +++ b/charts/nextcloud/2.0.1/migrations/migrate @@ -25,8 +25,6 @@ def migrate_common_lib(values): ] values.update({ - 'shouldShowStorageToggle': True, - 'isDataInTheSameVolume': True, # Migrate Network 'ncNetwork': { 'webPort': values['service']['nodePort'], @@ -72,6 +70,8 @@ def migrate_common_lib(values): }, # Migrate Storage 'ncStorage': { + 'shouldShowStorageToggle': True, + 'isDataInTheSameVolume': True, 'pgData': migrate_volume(values['postgresAppVolumeMounts']['postgres-data']), 'pgBackup': migrate_volume(values['postgresAppVolumeMounts']['postgres-backup']), 'data': migrate_volume(values['appVolumeMounts']['nextcloud-data']), @@ -93,6 +93,11 @@ def migrate_common_lib(values): return values def migrate(values): + if 'isDataInTheSameVolume' 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(): return values diff --git a/charts/nextcloud/2.0.0/questions.yaml b/charts/nextcloud/2.0.1/questions.yaml similarity index 97% rename from charts/nextcloud/2.0.0/questions.yaml rename to charts/nextcloud/2.0.1/questions.yaml index 029226a72e..8929a49912 100644 --- a/charts/nextcloud/2.0.0/questions.yaml +++ b/charts/nextcloud/2.0.1/questions.yaml @@ -40,6 +40,7 @@ questions: schema: type: string default: "" + private: true required: true - variable: host label: Host @@ -127,6 +128,28 @@ questions: show_if: [["enabled", "=", true]] default: "*/15 * * * *" required: true + - variable: additionalEnvs + label: Additional Environment Variables + description: Configure additional environment variables for Nextcloud. + schema: + type: list + default: [] + items: + - variable: env + label: Environment Variable + schema: + type: dict + attrs: + - variable: name + label: Name + schema: + type: string + required: true + - variable: value + label: Value + schema: + type: string + required: true - variable: podOptions label: "" @@ -171,7 +194,7 @@ questions: description: The port for the Nextcloud Web UI. schema: type: int - default: 9001 + default: 20810 min: 9000 max: 65535 required: true @@ -258,7 +281,6 @@ questions: schema: type: string required: true - immutable: true default: ixVolume enum: - value: hostPath @@ -336,7 +358,6 @@ questions: schema: type: string required: true - immutable: true default: ixVolume enum: - value: hostPath @@ -366,7 +387,7 @@ questions: required: true immutable: true hidden: true - default: "html" + default: "data" - variable: aclEntries label: ACL Configuration schema: @@ -415,7 +436,6 @@ questions: schema: type: string required: true - immutable: true default: ixVolume enum: - value: hostPath @@ -501,7 +521,6 @@ questions: schema: type: string required: true - immutable: true default: ixVolume enum: - value: hostPath @@ -596,7 +615,6 @@ questions: type: string required: true default: "ixVolume" - immutable: true enum: - value: "hostPath" description: Host Path (Path that already exists on the system) @@ -749,7 +767,7 @@ questions: schema: type: string max_length: 12 - valid_chars: "^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$" + valid_chars: '^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$' valid_chars_error: | Valid Memory limit formats are
- Suffixed with E/P/T/G/M/K - eg. 1G
diff --git a/charts/nextcloud/2.0.0/templates/NOTES.txt b/charts/nextcloud/2.0.1/templates/NOTES.txt similarity index 100% rename from charts/nextcloud/2.0.0/templates/NOTES.txt rename to charts/nextcloud/2.0.1/templates/NOTES.txt diff --git a/charts/nextcloud/2.0.0/templates/_configuration.tpl b/charts/nextcloud/2.0.1/templates/_configuration.tpl similarity index 100% rename from charts/nextcloud/2.0.0/templates/_configuration.tpl rename to charts/nextcloud/2.0.1/templates/_configuration.tpl diff --git a/charts/nextcloud/2.0.0/templates/_cron.tpl b/charts/nextcloud/2.0.1/templates/_cron.tpl similarity index 100% rename from charts/nextcloud/2.0.0/templates/_cron.tpl rename to charts/nextcloud/2.0.1/templates/_cron.tpl diff --git a/charts/nextcloud/2.0.0/templates/_migration.tpl b/charts/nextcloud/2.0.1/templates/_migration.tpl similarity index 100% rename from charts/nextcloud/2.0.0/templates/_migration.tpl rename to charts/nextcloud/2.0.1/templates/_migration.tpl diff --git a/charts/nextcloud/2.0.0/templates/_nextcloud-configs.tpl b/charts/nextcloud/2.0.1/templates/_nextcloud-configs.tpl similarity index 100% rename from charts/nextcloud/2.0.0/templates/_nextcloud-configs.tpl rename to charts/nextcloud/2.0.1/templates/_nextcloud-configs.tpl diff --git a/charts/nextcloud/2.0.0/templates/_nextcloud.tpl b/charts/nextcloud/2.0.1/templates/_nextcloud.tpl similarity index 100% rename from charts/nextcloud/2.0.0/templates/_nextcloud.tpl rename to charts/nextcloud/2.0.1/templates/_nextcloud.tpl diff --git a/charts/nextcloud/2.0.0/templates/_nginx-configuration.tpl b/charts/nextcloud/2.0.1/templates/_nginx-configuration.tpl similarity index 100% rename from charts/nextcloud/2.0.0/templates/_nginx-configuration.tpl rename to charts/nextcloud/2.0.1/templates/_nginx-configuration.tpl diff --git a/charts/nextcloud/2.0.0/templates/_nginx.tpl b/charts/nextcloud/2.0.1/templates/_nginx.tpl similarity index 100% rename from charts/nextcloud/2.0.0/templates/_nginx.tpl rename to charts/nextcloud/2.0.1/templates/_nginx.tpl diff --git a/charts/nextcloud/2.0.0/templates/_persistence.tpl b/charts/nextcloud/2.0.1/templates/_persistence.tpl similarity index 100% rename from charts/nextcloud/2.0.0/templates/_persistence.tpl rename to charts/nextcloud/2.0.1/templates/_persistence.tpl diff --git a/charts/nextcloud/2.0.0/templates/_portal.tpl b/charts/nextcloud/2.0.1/templates/_portal.tpl similarity index 100% rename from charts/nextcloud/2.0.0/templates/_portal.tpl rename to charts/nextcloud/2.0.1/templates/_portal.tpl diff --git a/charts/nextcloud/2.0.0/templates/_postgres.tpl b/charts/nextcloud/2.0.1/templates/_postgres.tpl similarity index 100% rename from charts/nextcloud/2.0.0/templates/_postgres.tpl rename to charts/nextcloud/2.0.1/templates/_postgres.tpl diff --git a/charts/nextcloud/2.0.0/templates/_redis.tpl b/charts/nextcloud/2.0.1/templates/_redis.tpl similarity index 100% rename from charts/nextcloud/2.0.0/templates/_redis.tpl rename to charts/nextcloud/2.0.1/templates/_redis.tpl diff --git a/charts/nextcloud/2.0.0/templates/_service.tpl b/charts/nextcloud/2.0.1/templates/_service.tpl similarity index 100% rename from charts/nextcloud/2.0.0/templates/_service.tpl rename to charts/nextcloud/2.0.1/templates/_service.tpl diff --git a/charts/nextcloud/2.0.0/templates/common.yaml b/charts/nextcloud/2.0.1/templates/common.yaml similarity index 100% rename from charts/nextcloud/2.0.0/templates/common.yaml rename to charts/nextcloud/2.0.1/templates/common.yaml diff --git a/charts/nextcloud/2.0.0/to_keep_versions.md b/charts/nextcloud/2.0.1/to_keep_versions.md similarity index 100% rename from charts/nextcloud/2.0.0/to_keep_versions.md rename to charts/nextcloud/2.0.1/to_keep_versions.md