diff --git a/community/freshrss/1.0.3/Chart.lock b/community/freshrss/1.0.3/Chart.lock deleted file mode 100644 index 5c734e0f04..0000000000 --- a/community/freshrss/1.0.3/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../common - version: 1.2.2 -digest: sha256:fb077cb81f6acecd5c9e6adc22a18e156f780cd78f27198cdb47810f95364b56 -generated: "2023-11-09T15:39:58.500714946+02:00" diff --git a/community/freshrss/1.0.3/charts/common-1.2.2.tgz b/community/freshrss/1.0.3/charts/common-1.2.2.tgz deleted file mode 100644 index 601ec14959..0000000000 Binary files a/community/freshrss/1.0.3/charts/common-1.2.2.tgz and /dev/null differ diff --git a/community/freshrss/1.0.3/questions.yaml b/community/freshrss/1.0.3/questions.yaml deleted file mode 100644 index 3de45f323e..0000000000 --- a/community/freshrss/1.0.3/questions.yaml +++ /dev/null @@ -1,417 +0,0 @@ -groups: - - name: FreshRSS Configuration - description: Configure FreshRSS - - name: Network Configuration - description: Configure Network for FreshRSS - - name: Storage Configuration - description: Configure Storage for FreshRSS - - name: Resources Configuration - description: Configure Resources for FreshRSS - -portals: - web_portal: - protocols: - - "$kubernetes-resource_configmap_portal_protocol" - host: - - "$kubernetes-resource_configmap_portal_host" - ports: - - "$kubernetes-resource_configmap_portal_port" - path: "$kubernetes-resource_configmap_portal_path" - -questions: - - variable: TZ - group: FreshRSS Configuration - label: Timezone - schema: - type: string - default: Etc/UTC - required: true - $ref: - - definitions/timezone - - - variable: freshrssConfig - label: "" - group: FreshRSS Configuration - schema: - type: dict - attrs: - - variable: defaultAdmin - label: Default Admin Username - description: The default admin username for FreshRSS. - schema: - type: string - default: "" - required: true - immutable: true - - variable: defaultAdminPass - label: Default Admin Password - description: The default admin password for FreshRSS. - schema: - type: string - default: "" - required: true - immutable: true - private: true - - variable: enableCron - label: Enable Cron - description: Enable cron for FreshRSS. - schema: - type: boolean - default: false - - variable: cronSchedule - label: Cron Schedule - description: | - The cron schedule for FreshRSS.
- Default: */20 * * * * (every 20 minutes) - schema: - type: string - default: "*/20 * * * *" - show_if: [["enableCron", "=", true]] - required: true - - variable: additionalEnvs - label: Additional Environment Variables - description: Configure additional environment variables for FreshRSS. - 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: freshrssNetwork - label: "" - group: Network Configuration - schema: - type: dict - attrs: - - variable: webPort - label: Web Port - description: The port for the FreshRSS Web UI. - schema: - type: int - default: 31000 - min: 9000 - max: 65535 - required: true - - variable: hostNetwork - label: Host Network - description: | - Bind to the host network. It's recommended to keep this disabled.
- schema: - type: boolean - default: false - - - variable: freshrssStorage - label: "" - group: Storage Configuration - schema: - type: dict - attrs: - - variable: data - label: FreshRSS Data Storage - description: The path to store FreshRSS Data. - schema: - type: dict - attrs: - - variable: type - label: Type - description: | - ixVolume: Is dataset created automatically by the system.
- Host Path: Is a path that already exists on the system. - schema: - type: string - required: true - immutable: true - default: "ixVolume" - enum: - - value: "hostPath" - description: Host Path (Path that already exists on the system) - - value: "ixVolume" - description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name - schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: "data" - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - immutable: true - required: true - - variable: extensions - label: FreshRSS Extensions Storage - description: The path to store FreshRSS Extensions. - schema: - type: dict - attrs: - - variable: type - label: Type - description: | - ixVolume: Is dataset created automatically by the system.
- Host Path: Is a path that already exists on the system. - schema: - type: string - required: true - immutable: true - default: "ixVolume" - enum: - - value: "hostPath" - description: Host Path (Path that already exists on the system) - - value: "ixVolume" - description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name - schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: "extensions" - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - immutable: true - required: true - - variable: pgData - label: Postgres Data Storage - description: The path to store Postgres Data. - schema: - type: dict - attrs: - - variable: type - label: Type - description: | - ixVolume: Is dataset created automatically by the system.
- Host Path: Is a path that already exists on the system. - schema: - type: string - required: true - immutable: true - default: "ixVolume" - enum: - - value: "hostPath" - description: Host Path (Path that already exists on the system) - - value: "ixVolume" - description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name - schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: "pgData" - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - immutable: true - required: true - - variable: pgBackup - label: Postgres Backup Storage - description: The path to store Postgres Backup. - schema: - type: dict - attrs: - - variable: type - label: Type - description: | - ixVolume: Is dataset created automatically by the system.
- Host Path: Is a path that already exists on the system. - schema: - type: string - required: true - immutable: true - default: "ixVolume" - enum: - - value: "hostPath" - description: Host Path (Path that already exists on the system) - - value: "ixVolume" - description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name - schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: "pgBackup" - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - immutable: true - required: true - - variable: additionalStorages - label: Additional Storage - description: Additional storage for FreshRSS. - schema: - type: list - default: [] - items: - - variable: storageEntry - label: Storage Entry - schema: - type: dict - attrs: - - variable: type - label: Type - description: | - ixVolume: Is dataset created automatically by the system.
- Host Path: Is a path that already exists on the system.
- SMB Share: Is a SMB share that is mounted to a persistent volume claim. - schema: - type: string - required: true - immutable: true - default: "ixVolume" - enum: - - value: "hostPath" - description: Host Path (Path that already exists on the system) - - value: "ixVolume" - description: ixVolume (Dataset created automatically by the system) - - value: "smb-pv-pvc" - description: SMB Share (Mounts a persistent volume claim to a SMB share) - - variable: mountPath - label: Mount Path - description: The path inside the container to mount the storage. - schema: - type: path - required: true - - variable: hostPath - label: Host Path - description: The host path to use for storage. - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - required: true - - variable: datasetName - label: Dataset Name - description: The name of the dataset to use for storage. - schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true - immutable: true - default: "storage_entry" - $ref: - - "normalize/ixVolume" - - variable: server - label: Server - description: The server for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - - variable: share - label: Share - description: The share name for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - - variable: domain - label: Domain (Optional) - description: The domain for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - - variable: username - label: Username - description: The username for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - - variable: password - label: Password - description: The password for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - private: true - - variable: size - label: Size (in Gi) - description: The size of the volume quota. - schema: - type: int - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - min: 1 - default: 1 - - - variable: resources - group: Resources Configuration - label: "" - schema: - type: dict - attrs: - - variable: limits - label: Limits - schema: - type: dict - attrs: - - variable: cpu - label: CPU - description: CPU limit for FreshRSS. - schema: - type: string - max_length: 6 - valid_chars: '^(0\.[1-9]|[1-9][0-9]*)(\.[0-9]|m?)$' - valid_chars_error: | - Valid CPU limit formats are
- - Plain Integer - eg. 1
- - Float - eg. 0.5
- - Milicpu - eg. 500m - default: "4000m" - required: true - - variable: memory - label: Memory - description: Memory limit for FreshRSS. - schema: - type: string - max_length: 12 - 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
- - Suffixed with Ei/Pi/Ti/Gi/Mi/Ki - eg. 1Gi
- - Plain Integer in bytes - eg. 1024
- - Exponent - eg. 134e6 - default: "8Gi" - required: true diff --git a/community/freshrss/1.1.0/Chart.lock b/community/freshrss/1.1.0/Chart.lock new file mode 100644 index 0000000000..7c1a78cf6a --- /dev/null +++ b/community/freshrss/1.1.0/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../common + version: 1.2.3 +digest: sha256:e6ff49b06bf5d4d159e505ae6d153f36cd46170bb519caf90462cd5caebfd0fb +generated: "2023-11-21T15:36:05.236830847+02:00" diff --git a/community/freshrss/1.0.3/Chart.yaml b/community/freshrss/1.1.0/Chart.yaml similarity index 95% rename from community/freshrss/1.0.3/Chart.yaml rename to community/freshrss/1.1.0/Chart.yaml index b2cd546fa0..74a47a742c 100644 --- a/community/freshrss/1.0.3/Chart.yaml +++ b/community/freshrss/1.1.0/Chart.yaml @@ -3,7 +3,7 @@ description: FreshRSS is a free, self-hostable news aggregator annotations: title: FreshRSS type: application -version: 1.0.3 +version: 1.1.0 apiVersion: v2 appVersion: 1.22.1 kubeVersion: '>=1.16.0-0' @@ -14,7 +14,7 @@ maintainers: dependencies: - name: common repository: file://../../../common - version: 1.2.2 + version: 1.2.3 home: https://freshrss.org/ icon: https://media.sys.truenas.net/apps/freshrss/icons/icon.png sources: diff --git a/community/freshrss/1.0.3/README.md b/community/freshrss/1.1.0/README.md similarity index 100% rename from community/freshrss/1.0.3/README.md rename to community/freshrss/1.1.0/README.md diff --git a/community/freshrss/1.0.3/app-readme.md b/community/freshrss/1.1.0/app-readme.md similarity index 100% rename from community/freshrss/1.0.3/app-readme.md rename to community/freshrss/1.1.0/app-readme.md diff --git a/community/freshrss/1.1.0/charts/common-1.2.3.tgz b/community/freshrss/1.1.0/charts/common-1.2.3.tgz new file mode 100644 index 0000000000..b20cfa5a7b Binary files /dev/null and b/community/freshrss/1.1.0/charts/common-1.2.3.tgz differ diff --git a/community/freshrss/1.0.3/ci/basic-values.yaml b/community/freshrss/1.1.0/ci/basic-values.yaml similarity index 100% rename from community/freshrss/1.0.3/ci/basic-values.yaml rename to community/freshrss/1.1.0/ci/basic-values.yaml diff --git a/community/freshrss/1.0.3/ci/extra-values.yaml b/community/freshrss/1.1.0/ci/extra-values.yaml similarity index 100% rename from community/freshrss/1.0.3/ci/extra-values.yaml rename to community/freshrss/1.1.0/ci/extra-values.yaml diff --git a/community/freshrss/1.0.3/ci/hostNet-values.yaml b/community/freshrss/1.1.0/ci/hostNet-values.yaml similarity index 100% rename from community/freshrss/1.0.3/ci/hostNet-values.yaml rename to community/freshrss/1.1.0/ci/hostNet-values.yaml diff --git a/community/freshrss/1.0.3/ix_values.yaml b/community/freshrss/1.1.0/ix_values.yaml similarity index 84% rename from community/freshrss/1.0.3/ix_values.yaml rename to community/freshrss/1.1.0/ix_values.yaml index e7820e35a6..69b68b3c3b 100644 --- a/community/freshrss/1.0.3/ix_values.yaml +++ b/community/freshrss/1.1.0/ix_values.yaml @@ -23,17 +23,21 @@ freshrssNetwork: freshrssStorage: data: type: ixVolume - datasetName: data + ixVolumeConfig: + datasetName: data extensions: type: ixVolume - datasetName: extensions + ixVolumeConfig: + datasetName: extensions additionalStorages: [] pgData: type: ixVolume - datasetName: pgData + ixVolumeConfig: + datasetName: pgData pgBackup: type: ixVolume - datasetName: pgBackup + ixVolumeConfig: + datasetName: pgBackup notes: custom: | diff --git a/community/freshrss/1.0.3/metadata.yaml b/community/freshrss/1.1.0/metadata.yaml similarity index 100% rename from community/freshrss/1.0.3/metadata.yaml rename to community/freshrss/1.1.0/metadata.yaml diff --git a/community/freshrss/1.1.0/migrations/migrate b/community/freshrss/1.1.0/migrations/migrate new file mode 100755 index 0000000000..0069c6bf38 --- /dev/null +++ b/community/freshrss/1.1.0/migrations/migrate @@ -0,0 +1,73 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def storage_migrate(storage): + delete_keys = [] + if storage['type'] == 'hostPath': + # Check if the key exists, if not we have already migrated + if not storage.get('hostPath'): + return storage + + storage['hostPathConfig'] = {'hostPath': storage['hostPath']} + delete_keys.append('hostPath') + + elif storage['type'] == 'ixVolume': + # Check if the key exists, if not we have already migrated + if not storage.get('datasetName'): + return storage + + storage['ixVolumeConfig'] = {'datasetName': storage['datasetName']} + delete_keys.append('datasetName') + + elif storage['type'] == 'smb-pv-pvc': + # Check if the key exists, if not we have already migrated + if not storage.get('server'): + return storage + + storage['smbConfig'] = { + 'server': storage['server'], + 'share': storage['share'], + 'domain': storage['domain'], + 'username': storage['username'], + 'password': storage['password'], + 'size': storage['size'], + } + delete_keys.extend(['server', 'share', 'domain', 'username', 'password', 'size']) + + for key in delete_keys: + storage.pop(key, None) + + return storage + + +def migrate(values): + storage_key = 'freshrssStorage' + storages = ['data', 'extensions', 'pgData', 'pgBackup'] + + for storage in storages: + check_val = values.get(storage_key, {}).get(storage, {}) + if not isinstance(check_val, dict) or not check_val: + raise Exception(f'Storage section {storage} is malformed') + + values[storage_key][storage] = storage_migrate(check_val) + + additionalStorages = values.get(storage_key, {}).get('additionalStorages', []) + for idx, storage in enumerate(additionalStorages): + if not isinstance(storage, dict) or not storage: + raise Exception(f'Item {idx} in additionalStorages is malformed') + + values[storage_key]['additionalStorages'][idx] = storage_migrate(storage) + + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/community/freshrss/1.1.0/questions.yaml b/community/freshrss/1.1.0/questions.yaml new file mode 100644 index 0000000000..65e60dff8a --- /dev/null +++ b/community/freshrss/1.1.0/questions.yaml @@ -0,0 +1,643 @@ +groups: + - name: FreshRSS Configuration + description: Configure FreshRSS + - name: Network Configuration + description: Configure Network for FreshRSS + - name: Storage Configuration + description: Configure Storage for FreshRSS + - name: Resources Configuration + description: Configure Resources for FreshRSS + +portals: + web_portal: + protocols: + - "$kubernetes-resource_configmap_portal_protocol" + host: + - "$kubernetes-resource_configmap_portal_host" + ports: + - "$kubernetes-resource_configmap_portal_port" + path: "$kubernetes-resource_configmap_portal_path" + +questions: + - variable: TZ + group: FreshRSS Configuration + label: Timezone + schema: + type: string + default: Etc/UTC + required: true + $ref: + - definitions/timezone + + - variable: freshrssConfig + label: "" + group: FreshRSS Configuration + schema: + type: dict + attrs: + - variable: defaultAdmin + label: Default Admin Username + description: The default admin username for FreshRSS. + schema: + type: string + default: "" + required: true + immutable: true + - variable: defaultAdminPass + label: Default Admin Password + description: The default admin password for FreshRSS. + schema: + type: string + default: "" + required: true + immutable: true + private: true + - variable: enableCron + label: Enable Cron + description: Enable cron for FreshRSS. + schema: + type: boolean + default: false + - variable: cronSchedule + label: Cron Schedule + description: | + The cron schedule for FreshRSS.
+ Default: */20 * * * * (every 20 minutes) + schema: + type: string + default: "*/20 * * * *" + show_if: [["enableCron", "=", true]] + required: true + - variable: additionalEnvs + label: Additional Environment Variables + description: Configure additional environment variables for FreshRSS. + 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: freshrssNetwork + label: "" + group: Network Configuration + schema: + type: dict + attrs: + - variable: webPort + label: Web Port + description: The port for the FreshRSS Web UI. + schema: + type: int + default: 31000 + min: 9000 + max: 65535 + required: true + - variable: hostNetwork + label: Host Network + description: | + Bind to the host network. It's recommended to keep this disabled.
+ schema: + type: boolean + default: false + + - variable: freshrssStorage + label: "" + group: Storage Configuration + schema: + type: dict + attrs: + - variable: data + label: FreshRSS Data Storage + description: The path to store FreshRSS Data. + schema: + type: dict + attrs: + - variable: type + label: Type + description: | + ixVolume: Is dataset created automatically by the system.
+ Host Path: Is a path that already exists on the system. + schema: + type: string + required: true + immutable: true + default: "ixVolume" + enum: + - value: "hostPath" + description: Host Path (Path that already exists on the system) + - value: "ixVolume" + description: ixVolume (Dataset created automatically by the system) + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. + schema: + type: dict + show_if: [["type", "=", "ixVolume"]] + $ref: + - "normalize/ixVolume" + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + hidden: true + default: "data" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: hostPathConfig + schema: + type: dict + show_if: [["type", "=", "hostPath"]] + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true + + - variable: extensions + label: FreshRSS Extensions Storage + description: The path to store FreshRSS Extensions. + schema: + type: dict + attrs: + - variable: type + label: Type + description: | + ixVolume: Is dataset created automatically by the system.
+ Host Path: Is a path that already exists on the system. + schema: + type: string + required: true + immutable: true + default: "ixVolume" + enum: + - value: "hostPath" + description: Host Path (Path that already exists on the system) + - value: "ixVolume" + description: ixVolume (Dataset created automatically by the system) + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. + schema: + type: dict + show_if: [["type", "=", "ixVolume"]] + $ref: + - "normalize/ixVolume" + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + hidden: true + default: "extensions" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: hostPathConfig + schema: + type: dict + show_if: [["type", "=", "hostPath"]] + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true + + - variable: pgData + label: Postgres Data Storage + description: The path to store Postgres Data. + schema: + type: dict + attrs: + - variable: type + label: Type + description: | + ixVolume: Is dataset created automatically by the system.
+ Host Path: Is a path that already exists on the system. + schema: + type: string + required: true + immutable: true + default: "ixVolume" + enum: + - value: "hostPath" + description: Host Path (Path that already exists on the system) + - value: "ixVolume" + description: ixVolume (Dataset created automatically by the system) + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. + schema: + type: dict + # Nothing to show for the user + hidden: true + show_if: [["type", "=", "ixVolume"]] + $ref: + - "normalize/ixVolume" + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + # Postgres does a CHMOD at startup + # Which fails with ACL + hidden: true + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + hidden: true + default: "pgData" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: hostPathConfig + schema: + type: dict + show_if: [["type", "=", "hostPath"]] + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + # Postgres does a CHMOD at startup + # Which fails with ACL + hidden: true + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true + + - variable: pgBackup + label: Postgres Backup Storage + description: The path to store Postgres Backup. + schema: + type: dict + attrs: + - variable: type + label: Type + description: | + ixVolume: Is dataset created automatically by the system.
+ Host Path: Is a path that already exists on the system. + schema: + type: string + required: true + immutable: true + default: "ixVolume" + enum: + - value: "hostPath" + description: Host Path (Path that already exists on the system) + - value: "ixVolume" + description: ixVolume (Dataset created automatically by the system) + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. + schema: + type: dict + # Nothing to show for the user + hidden: true + show_if: [["type", "=", "ixVolume"]] + $ref: + - "normalize/ixVolume" + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + # Postgres does a CHMOD at startup + # Which fails with ACL + hidden: true + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + hidden: true + default: "pgBackup" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: hostPathConfig + schema: + type: dict + show_if: [["type", "=", "hostPath"]] + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + # Postgres does a CHMOD at startup + # Which fails with ACL + hidden: true + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true + + - variable: additionalStorages + label: Additional Storage + description: Additional storage for FreshRSS. + schema: + type: list + default: [] + items: + - variable: storageEntry + label: Storage Entry + schema: + type: dict + attrs: + - variable: type + label: Type + description: | + ixVolume: Is dataset created automatically by the system.
+ Host Path: Is a path that already exists on the system.
+ SMB Share: Is a SMB share that is mounted to a persistent volume claim. + schema: + type: string + required: true + immutable: true + default: "ixVolume" + enum: + - value: "hostPath" + description: Host Path (Path that already exists on the system) + - value: "ixVolume" + description: ixVolume (Dataset created automatically by the system) + - value: "smb-pv-pvc" + description: SMB Share (Mounts a persistent volume claim to a SMB share) + - variable: readOnly + label: Read Only + description: Mount the volume as read only. + schema: + type: boolean + default: false + - variable: mountPath + label: Mount Path + description: The path inside the container to mount the storage. + schema: + type: path + required: true + - variable: hostPathConfig + label: hostPathConfig + schema: + type: dict + show_if: [["type", "=", "hostPath"]] + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + immutable: true + required: true + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. + schema: + type: dict + show_if: [["type", "=", "ixVolume"]] + $ref: + - "normalize/ixVolume" + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + default: "storage_entry" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: smbConfig + label: SMB Share Configuration + description: The configuration for the SMB Share. + schema: + type: dict + show_if: [["type", "=", "smb-pv-pvc"]] + attrs: + - variable: server + label: Server + description: The server for the SMB share. + schema: + type: string + required: true + - variable: share + label: Share + description: The share name for the SMB share. + schema: + type: string + required: true + - variable: domain + label: Domain (Optional) + description: The domain for the SMB share. + schema: + type: string + - variable: username + label: Username + description: The username for the SMB share. + schema: + type: string + required: true + - variable: password + label: Password + description: The password for the SMB share. + schema: + type: string + required: true + private: true + - variable: size + label: Size (in Gi) + description: The size of the volume quota. + schema: + type: int + required: true + min: 1 + default: 1 + + - variable: resources + group: Resources Configuration + label: "" + schema: + type: dict + attrs: + - variable: limits + label: Limits + schema: + type: dict + attrs: + - variable: cpu + label: CPU + description: CPU limit for FreshRSS. + schema: + type: string + max_length: 6 + valid_chars: '^(0\.[1-9]|[1-9][0-9]*)(\.[0-9]|m?)$' + valid_chars_error: | + Valid CPU limit formats are
+ - Plain Integer - eg. 1
+ - Float - eg. 0.5
+ - Milicpu - eg. 500m + default: "4000m" + required: true + - variable: memory + label: Memory + description: Memory limit for FreshRSS. + schema: + type: string + max_length: 12 + 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
+ - Suffixed with Ei/Pi/Ti/Gi/Mi/Ki - eg. 1Gi
+ - Plain Integer in bytes - eg. 1024
+ - Exponent - eg. 134e6 + default: "8Gi" + required: true diff --git a/community/freshrss/1.0.3/templates/NOTES.txt b/community/freshrss/1.1.0/templates/NOTES.txt similarity index 100% rename from community/freshrss/1.0.3/templates/NOTES.txt rename to community/freshrss/1.1.0/templates/NOTES.txt diff --git a/community/freshrss/1.0.3/templates/_configuration.tpl b/community/freshrss/1.1.0/templates/_configuration.tpl similarity index 100% rename from community/freshrss/1.0.3/templates/_configuration.tpl rename to community/freshrss/1.1.0/templates/_configuration.tpl diff --git a/community/freshrss/1.0.3/templates/_cron.tpl b/community/freshrss/1.1.0/templates/_cron.tpl similarity index 100% rename from community/freshrss/1.0.3/templates/_cron.tpl rename to community/freshrss/1.1.0/templates/_cron.tpl diff --git a/community/freshrss/1.0.3/templates/_freshrss.tpl b/community/freshrss/1.1.0/templates/_freshrss.tpl similarity index 100% rename from community/freshrss/1.0.3/templates/_freshrss.tpl rename to community/freshrss/1.1.0/templates/_freshrss.tpl diff --git a/community/freshrss/1.0.3/templates/_persistence.tpl b/community/freshrss/1.1.0/templates/_persistence.tpl similarity index 52% rename from community/freshrss/1.0.3/templates/_persistence.tpl rename to community/freshrss/1.1.0/templates/_persistence.tpl index 83b8b07ae6..f750a8b99d 100644 --- a/community/freshrss/1.0.3/templates/_persistence.tpl +++ b/community/freshrss/1.1.0/templates/_persistence.tpl @@ -2,9 +2,7 @@ persistence: data: enabled: true - type: {{ .Values.freshrssStorage.data.type }} - datasetName: {{ .Values.freshrssStorage.data.datasetName | default "" }} - hostPath: {{ .Values.freshrssStorage.data.hostPath | default "" }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.freshrssStorage.data) | nindent 4 }} targetSelector: freshrss: freshrss: @@ -14,9 +12,7 @@ persistence: mountPath: /var/www/FreshRSS/data extensions: enabled: true - type: {{ .Values.freshrssStorage.extensions.type }} - datasetName: {{ .Values.freshrssStorage.extensions.datasetName | default "" }} - hostPath: {{ .Values.freshrssStorage.extensions.hostPath | default "" }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.freshrssStorage.extensions) | nindent 4 }} targetSelector: freshrss: freshrss: @@ -35,25 +31,9 @@ persistence: freshrss: mountPath: /tmp {{- range $idx, $storage := .Values.freshrssStorage.additionalStorages }} - {{ printf "freshrss-%v" (int $idx) }}: - {{- $size := "" -}} - {{- if $storage.size -}} - {{- $size = (printf "%vGi" $storage.size) -}} - {{- end }} + {{ printf "freshrss-%v:" (int $idx) }} enabled: true - type: {{ $storage.type }} - datasetName: {{ $storage.datasetName | default "" }} - hostPath: {{ $storage.hostPath | default "" }} - server: {{ $storage.server | default "" }} - share: {{ $storage.share | default "" }} - domain: {{ $storage.domain | default "" }} - username: {{ $storage.username | default "" }} - password: {{ $storage.password | default "" }} - size: {{ $size }} - {{- if eq $storage.type "smb-pv-pvc" }} - mountOptions: - - key: noperm - {{- end }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} targetSelector: freshrss: freshrss: @@ -63,7 +43,6 @@ persistence: mountPath: {{ $storage.mountPath }} {{- end }} - {{- include "ix.v1.common.app.postgresPersistence" (dict "pgData" .Values.freshrssStorage.pgData "pgBackup" .Values.freshrssStorage.pgBackup diff --git a/community/freshrss/1.0.3/templates/_portal.tpl b/community/freshrss/1.1.0/templates/_portal.tpl similarity index 100% rename from community/freshrss/1.0.3/templates/_portal.tpl rename to community/freshrss/1.1.0/templates/_portal.tpl diff --git a/community/freshrss/1.0.3/templates/_postgres.tpl b/community/freshrss/1.1.0/templates/_postgres.tpl similarity index 100% rename from community/freshrss/1.0.3/templates/_postgres.tpl rename to community/freshrss/1.1.0/templates/_postgres.tpl diff --git a/community/freshrss/1.0.3/templates/_service.tpl b/community/freshrss/1.1.0/templates/_service.tpl similarity index 100% rename from community/freshrss/1.0.3/templates/_service.tpl rename to community/freshrss/1.1.0/templates/_service.tpl diff --git a/community/freshrss/1.0.3/templates/common.yaml b/community/freshrss/1.1.0/templates/common.yaml similarity index 100% rename from community/freshrss/1.0.3/templates/common.yaml rename to community/freshrss/1.1.0/templates/common.yaml