diff --git a/community/pgadmin/1.1.8/ci/extra-values.yaml b/community/pgadmin/1.1.8/ci/extra-values.yaml deleted file mode 100644 index d658cfd19e..0000000000 --- a/community/pgadmin/1.1.8/ci/extra-values.yaml +++ /dev/null @@ -1,18 +0,0 @@ -pgadminConfig: - adminEmail: some@email.com - adminPassword: somepassword - -pgadminNetwork: - webPort: 31000 - -pgadminStorage: - config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config - additionalStorages: - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/db1 - mountPath: /db1 - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/db2 - mountPath: /db2 diff --git a/community/pgadmin/1.1.8/Chart.lock b/community/pgadmin/1.2.0/Chart.lock similarity index 100% rename from community/pgadmin/1.1.8/Chart.lock rename to community/pgadmin/1.2.0/Chart.lock diff --git a/community/pgadmin/1.1.8/Chart.yaml b/community/pgadmin/1.2.0/Chart.yaml similarity index 97% rename from community/pgadmin/1.1.8/Chart.yaml rename to community/pgadmin/1.2.0/Chart.yaml index 2cedf4f38c..fe88e7cba7 100644 --- a/community/pgadmin/1.1.8/Chart.yaml +++ b/community/pgadmin/1.2.0/Chart.yaml @@ -3,7 +3,7 @@ description: pgAdmin is the most popular and feature rich Open Source administra annotations: title: pgAdmin type: application -version: 1.1.8 +version: 1.2.0 apiVersion: v2 appVersion: '8.1' kubeVersion: '>=1.16.0-0' diff --git a/community/pgadmin/1.1.8/README.md b/community/pgadmin/1.2.0/README.md similarity index 100% rename from community/pgadmin/1.1.8/README.md rename to community/pgadmin/1.2.0/README.md diff --git a/community/pgadmin/1.1.8/app-readme.md b/community/pgadmin/1.2.0/app-readme.md similarity index 100% rename from community/pgadmin/1.1.8/app-readme.md rename to community/pgadmin/1.2.0/app-readme.md diff --git a/community/pgadmin/1.1.8/charts/common-1.2.6.tgz b/community/pgadmin/1.2.0/charts/common-1.2.6.tgz similarity index 100% rename from community/pgadmin/1.1.8/charts/common-1.2.6.tgz rename to community/pgadmin/1.2.0/charts/common-1.2.6.tgz diff --git a/community/pgadmin/1.1.8/ci/basic-values.yaml b/community/pgadmin/1.2.0/ci/basic-values.yaml similarity index 65% rename from community/pgadmin/1.1.8/ci/basic-values.yaml rename to community/pgadmin/1.2.0/ci/basic-values.yaml index 63e5e0a201..70c6574f2f 100644 --- a/community/pgadmin/1.1.8/ci/basic-values.yaml +++ b/community/pgadmin/1.2.0/ci/basic-values.yaml @@ -7,5 +7,4 @@ pgadminConfig: pgadminStorage: config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config + type: pvc diff --git a/community/pgadmin/1.2.0/ci/extra-values.yaml b/community/pgadmin/1.2.0/ci/extra-values.yaml new file mode 100644 index 0000000000..ae3f21bd47 --- /dev/null +++ b/community/pgadmin/1.2.0/ci/extra-values.yaml @@ -0,0 +1,15 @@ +pgadminConfig: + adminEmail: some@email.com + adminPassword: somepassword + +pgadminNetwork: + webPort: 31000 + +pgadminStorage: + config: + type: pvc + additionalStorages: + - type: pvc + mountPath: /db1 + - type: pvc + mountPath: /db2 diff --git a/community/pgadmin/1.1.8/ci/hostnet-values.yaml b/community/pgadmin/1.2.0/ci/hostnet-values.yaml similarity index 68% rename from community/pgadmin/1.1.8/ci/hostnet-values.yaml rename to community/pgadmin/1.2.0/ci/hostnet-values.yaml index 2cffccf830..c35de1e417 100644 --- a/community/pgadmin/1.1.8/ci/hostnet-values.yaml +++ b/community/pgadmin/1.2.0/ci/hostnet-values.yaml @@ -8,5 +8,4 @@ pgadminConfig: pgadminStorage: config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config + type: pvc diff --git a/community/pgadmin/1.1.8/ci/https-values.yaml b/community/pgadmin/1.2.0/ci/https-values.yaml similarity index 98% rename from community/pgadmin/1.1.8/ci/https-values.yaml rename to community/pgadmin/1.2.0/ci/https-values.yaml index a7e49e0271..3489d2d6aa 100644 --- a/community/pgadmin/1.1.8/ci/https-values.yaml +++ b/community/pgadmin/1.2.0/ci/https-values.yaml @@ -5,8 +5,7 @@ pgadminNetwork: pgadminStorage: config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config + type: pvc pgadminConfig: adminEmail: some@email.com diff --git a/community/pgadmin/1.1.8/ix_values.yaml b/community/pgadmin/1.2.0/ix_values.yaml similarity index 88% rename from community/pgadmin/1.1.8/ix_values.yaml rename to community/pgadmin/1.2.0/ix_values.yaml index 23f3145a0a..a5994a4bac 100644 --- a/community/pgadmin/1.1.8/ix_values.yaml +++ b/community/pgadmin/1.2.0/ix_values.yaml @@ -21,5 +21,6 @@ pgadminNetwork: pgadminStorage: config: type: ixVolume - datasetName: config + ixVolumeConfig: + datasetName: config additionalStorages: [] diff --git a/community/pgadmin/1.1.8/metadata.yaml b/community/pgadmin/1.2.0/metadata.yaml similarity index 100% rename from community/pgadmin/1.1.8/metadata.yaml rename to community/pgadmin/1.2.0/metadata.yaml diff --git a/community/pgadmin/1.2.0/migrations/migrate b/community/pgadmin/1.2.0/migrations/migrate new file mode 100755 index 0000000000..77ea8cddd6 --- /dev/null +++ b/community/pgadmin/1.2.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 = 'pgadminStorage' + storages = ['config'] + + 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/pgadmin/1.1.8/questions.yaml b/community/pgadmin/1.2.0/questions.yaml similarity index 56% rename from community/pgadmin/1.1.8/questions.yaml rename to community/pgadmin/1.2.0/questions.yaml index ba91866349..3ac6c2c054 100644 --- a/community/pgadmin/1.1.8/questions.yaml +++ b/community/pgadmin/1.2.0/questions.yaml @@ -121,23 +121,64 @@ questions: 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 + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. schema: - type: string + type: dict show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: "config" $ref: - "normalize/ixVolume" - - variable: hostPath - label: Host Path + 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: "config" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: Host Path Configuration schema: - type: hostpath + type: dict show_if: [["type", "=", "hostPath"]] - required: true + 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]] + required: true + - variable: additionalStorages label: Additional Storage description: Additional storage for pgAdmin. @@ -168,74 +209,119 @@ questions: 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: hostPath - label: Host Path - description: The host path to use for storage. + - variable: hostPathConfig + label: Host Path Configuration schema: - type: hostpath + type: dict show_if: [["type", "=", "hostPath"]] - required: true - - variable: datasetName - label: Dataset Name - description: The name of the dataset to use for storage. + 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]] + required: true + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. schema: - type: string + type: dict 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. + 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: string + type: dict 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 + 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 diff --git a/community/pgadmin/1.1.8/templates/NOTES.txt b/community/pgadmin/1.2.0/templates/NOTES.txt similarity index 100% rename from community/pgadmin/1.1.8/templates/NOTES.txt rename to community/pgadmin/1.2.0/templates/NOTES.txt diff --git a/community/pgadmin/1.1.8/templates/_persistence.tpl b/community/pgadmin/1.2.0/templates/_persistence.tpl similarity index 53% rename from community/pgadmin/1.1.8/templates/_persistence.tpl rename to community/pgadmin/1.2.0/templates/_persistence.tpl index e0f53c97af..b303981e52 100644 --- a/community/pgadmin/1.1.8/templates/_persistence.tpl +++ b/community/pgadmin/1.2.0/templates/_persistence.tpl @@ -2,15 +2,17 @@ persistence: config: enabled: true - type: {{ .Values.pgadminStorage.config.type }} - datasetName: {{ .Values.pgadminStorage.config.datasetName | default "" }} - hostPath: {{ .Values.pgadminStorage.config.hostPath | default "" }} + {{- include "pgadmin.storage.ci.migration" (dict "storage" .Values.pgadminStorage.config) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.pgadminStorage.config) | nindent 4 }} targetSelector: pgadmin: pgadmin: mountPath: /var/lib/pgadmin + {{- if and (eq .Values.pgadminStorage.config.type "ixVolume") + (not (.Values.pgadminStorage.config.ixVolumeConfig | default dict).aclEnable) }} 01-permissions: mountPath: /mnt/directories/pgadmin + {{- end }} tmp: enabled: true type: emptyDir @@ -20,30 +22,17 @@ persistence: mountPath: /tmp {{- range $idx, $storage := .Values.pgadminStorage.additionalStorages }} {{ printf "pgadmin-%v" (int $idx) }}: - {{- $size := "" -}} - {{- if $storage.size -}} - {{- $size = (printf "%vGi" $storage.size) -}} - {{- end }} 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 "pgadmin.storage.ci.migration" (dict "storage" $storage) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} targetSelector: pgadmin: pgadmin: mountPath: {{ $storage.mountPath }} + {{- if and (eq $storage.type "ixVolume") (not ($storage.ixVolumeConfig | default dict).aclEnable) }} 01-permissions: mountPath: /mnt/directories{{ $storage.mountPath }} + {{- end }} {{- end }} {{- if .Values.pgadminNetwork.certificateID }} @@ -69,3 +58,13 @@ scaleCertificate: id: {{ .Values.pgadminNetwork.certificateID }} {{- end }} {{- end -}} + +{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}} +{{- define "pgadmin.storage.ci.migration" -}} + {{- $storage := .storage -}} + + {{- if $storage.hostPath -}} + {{- $_ := set $storage "hostPathConfig" dict -}} + {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}} + {{- end -}} +{{- end -}} diff --git a/community/pgadmin/1.1.8/templates/_pgadmin.tpl b/community/pgadmin/1.2.0/templates/_pgadmin.tpl similarity index 98% rename from community/pgadmin/1.1.8/templates/_pgadmin.tpl rename to community/pgadmin/1.2.0/templates/_pgadmin.tpl index 9126e8d053..93e1561b49 100644 --- a/community/pgadmin/1.1.8/templates/_pgadmin.tpl +++ b/community/pgadmin/1.2.0/templates/_pgadmin.tpl @@ -60,5 +60,5 @@ workload: "UID" 5050 "GID" 5050 "mode" "check" - "type" "init") | nindent 8 }} + "type" "install") | nindent 8 }} {{- end -}} diff --git a/community/pgadmin/1.1.8/templates/_portal.tpl b/community/pgadmin/1.2.0/templates/_portal.tpl similarity index 100% rename from community/pgadmin/1.1.8/templates/_portal.tpl rename to community/pgadmin/1.2.0/templates/_portal.tpl diff --git a/community/pgadmin/1.1.8/templates/_service.tpl b/community/pgadmin/1.2.0/templates/_service.tpl similarity index 100% rename from community/pgadmin/1.1.8/templates/_service.tpl rename to community/pgadmin/1.2.0/templates/_service.tpl diff --git a/community/pgadmin/1.1.8/templates/_validation.tpl b/community/pgadmin/1.2.0/templates/_validation.tpl similarity index 100% rename from community/pgadmin/1.1.8/templates/_validation.tpl rename to community/pgadmin/1.2.0/templates/_validation.tpl diff --git a/community/pgadmin/1.1.8/templates/common.yaml b/community/pgadmin/1.2.0/templates/common.yaml similarity index 100% rename from community/pgadmin/1.1.8/templates/common.yaml rename to community/pgadmin/1.2.0/templates/common.yaml diff --git a/community/pigallery2/1.1.7/questions.yaml b/community/pigallery2/1.1.7/questions.yaml deleted file mode 100644 index 83cef04cad..0000000000 --- a/community/pigallery2/1.1.7/questions.yaml +++ /dev/null @@ -1,402 +0,0 @@ -groups: - - name: PiGallery2 Configuration - description: Configure PiGallery2 - - name: User and Group Configuration - description: Configure User and Group for PiGallery2 - - name: Network Configuration - description: Configure Network for PiGallery2 - - name: Storage Configuration - description: Configure Storage for PiGallery2 - - name: Resources Configuration - description: Configure Resources for PiGallery2 - -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: pigalleryConfig - label: "" - group: PiGallery2 Configuration - schema: - type: dict - attrs: - - variable: applicationTitle - label: Application Title - description: The title of the PiGallery2 application. - schema: - type: string - default: "PiGallery 2" - required: true - - variable: additionalEnvs - label: Additional Environment Variables - description: Configure additional environment variables for PiGallery2. - 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: pigalleryRunAs - label: "" - group: User and Group Configuration - schema: - type: dict - attrs: - - variable: user - label: User ID - description: The user id that PiGallery2 will run as. - schema: - type: int - min: 2 - default: 568 - required: true - - variable: group - label: Group ID - description: The group id that PiGallery2 will run as. - schema: - type: int - min: 2 - default: 568 - required: true - - - variable: pigalleryNetwork - label: "" - group: Network Configuration - schema: - type: dict - attrs: - - variable: webPort - label: Web Port - description: The port for the PiGallery2 Web UI. - schema: - type: int - default: 30099 - 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: pigalleryStorage - label: "" - group: Storage Configuration - schema: - type: dict - attrs: - - variable: config - label: PiGallery2 Config Storage - description: The path to store PiGallery2 Configuration. - 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: "config" - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - required: true - - variable: db - label: PiGallery2 Database Storage - description: The path to store PiGallery2 Database. - 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: "db" - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - required: true - - variable: media - label: PiGallery2 Media Storage - description: The path to store PiGallery2 Media. - 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: "media" - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - required: true - - variable: thumbnails - label: PiGallery2 Thumbnails Storage - description: The path to store PiGallery2 Thumbnails. - 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: "thumbnails" - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - required: true - - variable: additionalStorages - label: Additional Storage - description: Additional storage for PiGallery2. - 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 - default: "ixVolume" - immutable: true - 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 PiGallery2. - 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 PiGallery2. - 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/pigallery2/1.1.7/templates/_persistence.tpl b/community/pigallery2/1.1.7/templates/_persistence.tpl deleted file mode 100644 index cb792a345e..0000000000 --- a/community/pigallery2/1.1.7/templates/_persistence.tpl +++ /dev/null @@ -1,74 +0,0 @@ -{{- define "pigallery.persistence" -}} -persistence: - config: - enabled: true - type: {{ .Values.pigalleryStorage.config.type }} - datasetName: {{ .Values.pigalleryStorage.config.datasetName | default "" }} - hostPath: {{ .Values.pigalleryStorage.config.hostPath | default "" }} - targetSelector: - pigallery: - pigallery: - mountPath: /app/data/config - 01-permissions: - mountPath: /mnt/directories/config - db: - enabled: true - type: {{ .Values.pigalleryStorage.db.type }} - datasetName: {{ .Values.pigalleryStorage.db.datasetName | default "" }} - hostPath: {{ .Values.pigalleryStorage.db.hostPath | default "" }} - targetSelector: - pigallery: - pigallery: - mountPath: /app/data/db - 01-permissions: - mountPath: /mnt/directories/db - media: - enabled: true - type: {{ .Values.pigalleryStorage.media.type }} - datasetName: {{ .Values.pigalleryStorage.media.datasetName | default "" }} - hostPath: {{ .Values.pigalleryStorage.media.hostPath | default "" }} - targetSelector: - pigallery: - pigallery: - mountPath: /app/data/media - 01-permissions: - mountPath: /mnt/directories/media - thumbnails: - enabled: true - type: {{ .Values.pigalleryStorage.thumbnails.type }} - datasetName: {{ .Values.pigalleryStorage.thumbnails.datasetName | default "" }} - hostPath: {{ .Values.pigalleryStorage.thumbnails.hostPath | default "" }} - targetSelector: - pigallery: - pigallery: - mountPath: /app/data/thumbnails - 01-permissions: - mountPath: /mnt/directories/thumbnails - {{- range $idx, $storage := .Values.pigalleryStorage.additionalStorages }} - {{ printf "pigallery-%v" (int $idx) }}: - {{- $size := "" -}} - {{- if $storage.size -}} - {{- $size = (printf "%vGi" $storage.size) -}} - {{- end }} - 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 }} - targetSelector: - pigallery: - pigallery: - mountPath: {{ $storage.mountPath }} - 01-permissions: - mountPath: /mnt/directories{{ $storage.mountPath }} - {{- end }} -{{- end -}} diff --git a/community/pigallery2/1.1.7/Chart.lock b/community/pigallery2/1.2.0/Chart.lock similarity index 100% rename from community/pigallery2/1.1.7/Chart.lock rename to community/pigallery2/1.2.0/Chart.lock diff --git a/community/pigallery2/1.1.7/Chart.yaml b/community/pigallery2/1.2.0/Chart.yaml similarity index 98% rename from community/pigallery2/1.1.7/Chart.yaml rename to community/pigallery2/1.2.0/Chart.yaml index 0ab3aa9454..bb4c749133 100644 --- a/community/pigallery2/1.1.7/Chart.yaml +++ b/community/pigallery2/1.2.0/Chart.yaml @@ -3,7 +3,7 @@ description: PiGallery2 is a fast directory-first photo gallery website, with ri annotations: title: PiGallery2 type: application -version: 1.1.7 +version: 1.2.0 apiVersion: v2 appVersion: 2.0.0 kubeVersion: '>=1.16.0-0' diff --git a/community/pigallery2/1.1.7/README.md b/community/pigallery2/1.2.0/README.md similarity index 100% rename from community/pigallery2/1.1.7/README.md rename to community/pigallery2/1.2.0/README.md diff --git a/community/pigallery2/1.1.7/app-readme.md b/community/pigallery2/1.2.0/app-readme.md similarity index 100% rename from community/pigallery2/1.1.7/app-readme.md rename to community/pigallery2/1.2.0/app-readme.md diff --git a/community/pigallery2/1.1.7/charts/common-1.2.6.tgz b/community/pigallery2/1.2.0/charts/common-1.2.6.tgz similarity index 100% rename from community/pigallery2/1.1.7/charts/common-1.2.6.tgz rename to community/pigallery2/1.2.0/charts/common-1.2.6.tgz diff --git a/community/pigallery2/1.1.7/ci/basic-values.yaml b/community/pigallery2/1.2.0/ci/basic-values.yaml similarity index 100% rename from community/pigallery2/1.1.7/ci/basic-values.yaml rename to community/pigallery2/1.2.0/ci/basic-values.yaml diff --git a/community/pigallery2/1.1.7/ci/extra-values.yaml b/community/pigallery2/1.2.0/ci/extra-values.yaml similarity index 100% rename from community/pigallery2/1.1.7/ci/extra-values.yaml rename to community/pigallery2/1.2.0/ci/extra-values.yaml diff --git a/community/pigallery2/1.1.7/ci/hostNet-values.yaml b/community/pigallery2/1.2.0/ci/hostNet-values.yaml similarity index 100% rename from community/pigallery2/1.1.7/ci/hostNet-values.yaml rename to community/pigallery2/1.2.0/ci/hostNet-values.yaml diff --git a/community/pigallery2/1.1.7/ix_values.yaml b/community/pigallery2/1.2.0/ix_values.yaml similarity index 75% rename from community/pigallery2/1.1.7/ix_values.yaml rename to community/pigallery2/1.2.0/ix_values.yaml index f300217a31..7b6e5e6f56 100644 --- a/community/pigallery2/1.1.7/ix_values.yaml +++ b/community/pigallery2/1.2.0/ix_values.yaml @@ -23,16 +23,20 @@ pigalleryRunAs: pigalleryStorage: config: type: ixVolume - datasetName: config + ixVolumeConfig: + datasetName: config db: type: ixVolume - datasetName: db + ixVolumeConfig: + datasetName: db media: type: ixVolume - datasetName: media + ixVolumeConfig: + datasetName: media thumbnails: type: ixVolume - datasetName: thumbnails + ixVolumeConfig: + datasetName: thumbnails additionalStorages: [] notes: diff --git a/community/pigallery2/1.1.7/metadata.yaml b/community/pigallery2/1.2.0/metadata.yaml similarity index 100% rename from community/pigallery2/1.1.7/metadata.yaml rename to community/pigallery2/1.2.0/metadata.yaml diff --git a/community/pigallery2/1.2.0/migrations/migrate b/community/pigallery2/1.2.0/migrations/migrate new file mode 100755 index 0000000000..a7aa39e50f --- /dev/null +++ b/community/pigallery2/1.2.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 = 'pigalleryStorage' + storages = ['config', 'db', 'media', 'thumbnails'] + + 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/pigallery2/1.2.0/questions.yaml b/community/pigallery2/1.2.0/questions.yaml new file mode 100644 index 0000000000..ff08a36ccb --- /dev/null +++ b/community/pigallery2/1.2.0/questions.yaml @@ -0,0 +1,611 @@ +groups: + - name: PiGallery2 Configuration + description: Configure PiGallery2 + - name: User and Group Configuration + description: Configure User and Group for PiGallery2 + - name: Network Configuration + description: Configure Network for PiGallery2 + - name: Storage Configuration + description: Configure Storage for PiGallery2 + - name: Resources Configuration + description: Configure Resources for PiGallery2 + +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: pigalleryConfig + label: "" + group: PiGallery2 Configuration + schema: + type: dict + attrs: + - variable: applicationTitle + label: Application Title + description: The title of the PiGallery2 application. + schema: + type: string + default: "PiGallery 2" + required: true + - variable: additionalEnvs + label: Additional Environment Variables + description: Configure additional environment variables for PiGallery2. + 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: pigalleryRunAs + label: "" + group: User and Group Configuration + schema: + type: dict + attrs: + - variable: user + label: User ID + description: The user id that PiGallery2 will run as. + schema: + type: int + min: 2 + default: 568 + required: true + - variable: group + label: Group ID + description: The group id that PiGallery2 will run as. + schema: + type: int + min: 2 + default: 568 + required: true + + - variable: pigalleryNetwork + label: "" + group: Network Configuration + schema: + type: dict + attrs: + - variable: webPort + label: Web Port + description: The port for the PiGallery2 Web UI. + schema: + type: int + default: 30099 + 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: pigalleryStorage + label: "" + group: Storage Configuration + schema: + type: dict + attrs: + - variable: config + label: PiGallery2 Config Storage + description: The path to store PiGallery2 Configuration. + 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: "config" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: Host Path Configuration + 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]] + required: true + + - variable: db + label: PiGallery2 Database Storage + description: The path to store PiGallery2 Database. + 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: "db" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: Host Path Configuration + 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]] + required: true + + - variable: media + label: PiGallery2 Media Storage + description: The path to store PiGallery2 Media. + 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: "media" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: Host Path Configuration + 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]] + required: true + + - variable: thumbnails + label: PiGallery2 Thumbnails Storage + description: The path to store PiGallery2 Thumbnails. + 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: "thumbnails" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: Host Path Configuration + 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]] + required: true + + - variable: additionalStorages + label: Additional Storage + description: Additional storage for PiGallery2. + 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 + default: "ixVolume" + immutable: true + 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: Host Path Configuration + 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]] + 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 PiGallery2. + 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 PiGallery2. + 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/pigallery2/1.1.7/templates/NOTES.txt b/community/pigallery2/1.2.0/templates/NOTES.txt similarity index 100% rename from community/pigallery2/1.1.7/templates/NOTES.txt rename to community/pigallery2/1.2.0/templates/NOTES.txt diff --git a/community/pigallery2/1.1.7/templates/_configuration.tpl b/community/pigallery2/1.2.0/templates/_configuration.tpl similarity index 100% rename from community/pigallery2/1.1.7/templates/_configuration.tpl rename to community/pigallery2/1.2.0/templates/_configuration.tpl diff --git a/community/pigallery2/1.2.0/templates/_persistence.tpl b/community/pigallery2/1.2.0/templates/_persistence.tpl new file mode 100644 index 0000000000..75597a7cc8 --- /dev/null +++ b/community/pigallery2/1.2.0/templates/_persistence.tpl @@ -0,0 +1,64 @@ +{{- define "pigallery.persistence" -}} +persistence: + config: + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.pigalleryStorage.config) | nindent 4 }} + targetSelector: + pigallery: + pigallery: + mountPath: /app/data/config + {{- if and (eq .Values.pigalleryStorage.config.type "ixVolume") + (not (.Values.pigalleryStorage.config.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories/config + {{- end }} + db: + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.pigalleryStorage.db) | nindent 4 }} + targetSelector: + pigallery: + pigallery: + mountPath: /app/data/db + {{- if and (eq .Values.pigalleryStorage.db.type "ixVolume") + (not (.Values.pigalleryStorage.db.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories/db + {{- end }} + media: + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.pigalleryStorage.media) | nindent 4 }} + targetSelector: + pigallery: + pigallery: + mountPath: /app/data/media + {{- if and (eq .Values.pigalleryStorage.media.type "ixVolume") + (not (.Values.pigalleryStorage.media.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories/media + {{- end }} + thumbnails: + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.pigalleryStorage.thumbnails) | nindent 4 }} + targetSelector: + pigallery: + pigallery: + mountPath: /app/data/thumbnails + {{- if and (eq .Values.pigalleryStorage.thumbnails.type "ixVolume") + (not (.Values.pigalleryStorage.thumbnails.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories/thumbnails + {{- end }} + {{- range $idx, $storage := .Values.pigalleryStorage.additionalStorages }} + {{ printf "pigallery-%v" (int $idx) }}: + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} + targetSelector: + pigallery: + pigallery: + mountPath: {{ $storage.mountPath }} + {{- if and (eq $storage.type "ixVolume") (not ($storage.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories{{ $storage.mountPath }} + {{- end }} + {{- end }} +{{- end -}} diff --git a/community/pigallery2/1.1.7/templates/_pigallery2.tpl b/community/pigallery2/1.2.0/templates/_pigallery2.tpl similarity index 98% rename from community/pigallery2/1.1.7/templates/_pigallery2.tpl rename to community/pigallery2/1.2.0/templates/_pigallery2.tpl index f9f2ceafed..c44f2153ec 100644 --- a/community/pigallery2/1.1.7/templates/_pigallery2.tpl +++ b/community/pigallery2/1.2.0/templates/_pigallery2.tpl @@ -45,5 +45,5 @@ workload: "UID" .Values.pigalleryRunAs.user "GID" .Values.pigalleryRunAs.group "mode" "check" - "type" "init") | nindent 8 }} + "type" "install") | nindent 8 }} {{- end -}} diff --git a/community/pigallery2/1.1.7/templates/_portal.tpl b/community/pigallery2/1.2.0/templates/_portal.tpl similarity index 100% rename from community/pigallery2/1.1.7/templates/_portal.tpl rename to community/pigallery2/1.2.0/templates/_portal.tpl diff --git a/community/pigallery2/1.1.7/templates/_service.tpl b/community/pigallery2/1.2.0/templates/_service.tpl similarity index 100% rename from community/pigallery2/1.1.7/templates/_service.tpl rename to community/pigallery2/1.2.0/templates/_service.tpl diff --git a/community/pigallery2/1.1.7/templates/common.yaml b/community/pigallery2/1.2.0/templates/common.yaml similarity index 100% rename from community/pigallery2/1.1.7/templates/common.yaml rename to community/pigallery2/1.2.0/templates/common.yaml