Publish new changes in catalog

community/piwigo/1.1.8/ci/basic-values.yaml

@@ -1,26 +0,0 @@
-piwiNetwork:
-  webPort: 31000
-
-piwiConfig:
-  language: en_GB
-  adminName: admin
-  adminMail: admin@example.com
-  adminPass: admin
-
-piwiID:
-  user: 1000
-  group: 1000
-
-piwiStorage:
-  config:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/config
-  gallery:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/gallery
-  mariadbData:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/mariadbData
-  mariadbBackup:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/mariadbBackup

community/piwigo/1.1.8/templates/_persistance.tpl

@@ -1,82 +0,0 @@
-{{- define "piwigo.persistence" -}}
-persistence:
-  config:
-    enabled: true
-    type: {{ .Values.piwiStorage.config.type }}
-    datasetName: {{ .Values.piwiStorage.config.datasetName | default "" }}
-    hostPath: {{ .Values.piwiStorage.config.hostPath | default "" }}
-    targetSelector:
-      piwigo:
-        piwigo:
-          mountPath: /config
-  gallery:
-    enabled: true
-    type: {{ .Values.piwiStorage.gallery.type }}
-    datasetName: {{ .Values.piwiStorage.gallery.datasetName | default "" }}
-    hostPath: {{ .Values.piwiStorage.gallery.hostPath | default "" }}
-    targetSelector:
-      piwigo:
-        piwigo:
-          mountPath: /gallery
-  tmp:
-    enabled: true
-    type: emptyDir
-    targetSelector:
-      piwigo:
-        piwigo:
-          mountPath: /tmp
-  {{- range $idx, $storage := .Values.piwiStorage.additionalStorages }}
-  {{ printf "piwi-%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:
-      piwigo:
-        piwigo:
-          mountPath: {{ $storage.mountPath }}
-  {{- end }}
-
-  mariadbdata:
-    enabled: true
-    type: {{ .Values.piwiStorage.mariadbData.type }}
-    datasetName: {{ .Values.piwiStorage.mariadbData.datasetName | default "" }}
-    hostPath: {{ .Values.piwiStorage.mariadbData.hostPath | default "" }}
-    targetSelector:
-      # MariaDB pod
-      mariadb:
-        # MariaDB container
-        mariadb:
-          mountPath: /var/lib/mysql
-        # MariaDB - Permissions container
-        permissions:
-          mountPath: /mnt/directories/mariadb_data
-  mariadbbackup:
-    enabled: true
-    type: {{ .Values.piwiStorage.mariadbBackup.type }}
-    datasetName: {{ .Values.piwiStorage.mariadbBackup.datasetName | default "" }}
-    hostPath: {{ .Values.piwiStorage.mariadbBackup.hostPath | default "" }}
-    targetSelector:
-      # MariaDB backup pod
-      mariadbbackup:
-        # MariaDB backup container
-        mariadbbackup:
-          mountPath: /mariadb_backup
-        # MariaDB - Permissions container
-        permissions:
-          mountPath: /mnt/directories/mariadb_backup
-{{- end -}}

community/piwigo/1.1.8/Chart.yaml → community/piwigo/1.2.0/Chart.yaml

@@ -4,7 +4,7 @@ description: Piwigo is a photo gallery software for the web that comes with powe
 annotations:
   title: Piwigo
 type: application
-version: 1.1.8
+version: 1.2.0
 apiVersion: v2
 appVersion: 14.1.0
 kubeVersion: '>=1.16.0-0'

community/piwigo/1.2.0/ci/basic-values.yaml

@@ -0,0 +1,25 @@
+piwiNetwork:
+  webPort: 31000
+
+piwiConfig:
+  language: en_GB
+  adminName: admin
+  adminMail: admin@example.com
+  adminPass: admin
+
+piwiID:
+  user: 1000
+  group: 1000
+
+piwiStorage:
+  config:
+    type: pvc
+  gallery:
+    type: pvc
+  mariadbData:
+    type: pvc
+  mariadbBackup:
+    type: emptyDir
+    emptyDirConfig:
+      medium: ""
+      size: ""

community/piwigo/1.1.8/ix_values.yaml → community/piwigo/1.2.0/ix_values.yaml

@@ -25,14 +25,18 @@ piwiID:
 piwiStorage:
   config:
     type: ixVolume
-    datasetName: config
+    ixVolumeConfig:
+      datasetName: config
   gallery:
     type: ixVolume
-    datasetName: gallery
+    ixVolumeConfig:
+      datasetName: gallery
   mariadbData:
     type: ixVolume
-    datasetName: mariadbData
+    ixVolumeConfig:
+      datasetName: mariadbData
   mariadbBackup:
     type: ixVolume
-    datasetName: mariadbBackup
+    ixVolumeConfig:
+      datasetName: mariadbBackup
   additionalStorages: []

community/piwigo/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 = 'piwiStorage'
+    storages = ['config', 'gallery', 'mariadbData', 'mariadbBackup']
+
+    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()))))

community/piwigo/1.1.8/questions.yaml → community/piwigo/1.2.0/questions.yaml

@@ -302,23 +302,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: gallery
           label: Piwigo Gallery Storage
           description: The path to store Piwigo gallery.
@@ -340,23 +381,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: gallery
                   $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: "gallery"
+                    - 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: mariadbData
           label: Piwigo MariaDB Data Storage
           description: The path to store Piwigo MariaDB Data.
@@ -378,23 +460,72 @@ 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
-                  show_if: [["type", "=", "ixVolume"]]
-                  required: true
+                  type: dict
+                  # Nothing to show for the user
                   hidden: true
-                  immutable: true
-                  default: mariadbData
+                  show_if: [["type", "=", "ixVolume"]]
                   $ref:
                     - "normalize/ixVolume"
-              - variable: hostPath
-                label: Host Path
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        # MariaDB 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: mariadbData
+                    - 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
+                        # MariaDB 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]]
+                        required: true
+
         - variable: mariadbBackup
           label: Piwigo MariaDB Backup Storage
           description: The path to store Piwigo MariaDB Backup.
@@ -416,23 +547,72 @@ 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
-                  show_if: [["type", "=", "ixVolume"]]
-                  required: true
+                  type: dict
+                  # Nothing to show for the user
                   hidden: true
-                  immutable: true
-                  default: mariadbBackup
+                  show_if: [["type", "=", "ixVolume"]]
                   $ref:
                     - "normalize/ixVolume"
-              - variable: hostPath
-                label: Host Path
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        # MariaDB 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: mariadbBackup
+                    - 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
+                        # MariaDB 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]]
+                        required: true
+
         - variable: additionalStorages
           label: Additional Storage
           description: Additional storage for Piwigo.
@@ -463,74 +643,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.
-                      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.
+                        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
-                        show_if: [["type", "=", "smb-pv-pvc"]]
-                        required: true
-                    - variable: password
-                      label: Password
-                      description: The password for the SMB share.
-                      schema:
-                        type: string
+                        type: dict
                         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
     label: ""

community/piwigo/1.2.0/templates/_persistance.tpl

@@ -0,0 +1,73 @@
+{{- define "piwigo.persistence" -}}
+persistence:
+  config:
+    enabled: true
+    {{- include "piwi.storage.ci.migration" (dict "storage" .Values.piwiStorage.config) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.piwiStorage.config) | nindent 4 }}
+    targetSelector:
+      piwigo:
+        piwigo:
+          mountPath: /config
+  gallery:
+    enabled: true
+    {{- include "piwi.storage.ci.migration" (dict "storage" .Values.piwiStorage.gallery) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.piwiStorage.gallery) | nindent 4 }}
+    targetSelector:
+      piwigo:
+        piwigo:
+          mountPath: /gallery
+  tmp:
+    enabled: true
+    type: emptyDir
+    targetSelector:
+      piwigo:
+        piwigo:
+          mountPath: /tmp
+  {{- range $idx, $storage := .Values.piwiStorage.additionalStorages }}
+  {{ printf "piwi-%v" (int $idx) }}:
+    enabled: true
+    {{- include "piwi.storage.ci.migration" (dict "storage" $storage) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }}
+    targetSelector:
+      piwigo:
+        piwigo:
+          mountPath: {{ $storage.mountPath }}
+  {{- end }}
+
+  mariadbdata:
+    enabled: true
+    {{- include "piwi.storage.ci.migration" (dict "storage" .Values.piwiStorage.mariadbData) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.piwiStorage.mariadbData) | nindent 4 }}
+    targetSelector:
+      # MariaDB pod
+      mariadb:
+        # MariaDB container
+        mariadb:
+          mountPath: /var/lib/mysql
+        # MariaDB - Permissions container
+        permissions:
+          mountPath: /mnt/directories/mariadb_data
+  mariadbbackup:
+    enabled: true
+    {{- include "piwi.storage.ci.migration" (dict "storage" .Values.piwiStorage.mariadbBackup) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.piwiStorage.mariadbBackup) | nindent 4 }}
+    targetSelector:
+      # MariaDB backup pod
+      mariadbbackup:
+        # MariaDB backup container
+        mariadbbackup:
+          mountPath: /mariadb_backup
+        # MariaDB - Permissions container
+        permissions:
+          mountPath: /mnt/directories/mariadb_backup
+{{- end -}}
+
+{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}}
+{{- define "piwi.storage.ci.migration" -}}
+  {{- $storage := .storage -}}
+
+  {{- if $storage.hostPath -}}
+    {{- $_ := set $storage "hostPathConfig" dict -}}
+    {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}}
+  {{- end -}}
+{{- end -}}

community/tdarr/1.1.7/ci/no-internal-node-values.yaml

@@ -1,16 +0,0 @@
-tdarrConfig:
-  nodeName: ''
-  internalNode: false
-tdarrStorage:
-  server:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/server
-  configs:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/configs
-  logs:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/logs
-  transcodes:
-    type: emptyDir
-    size: 1Gi

community/tdarr/1.1.7/migrations/migrate

@@ -1,29 +0,0 @@
-#!/usr/bin/python3
-import json
-import os
-import sys
-
-
-def migrate(values):
-    storageKey = 'tdarrStorage'
-    storages = ['server', 'configs', 'logs', 'transcodes']
-
-
-    for storage in storages:
-        check_val = values.get(storageKey, {}).get(storage, {})
-        if not isinstance(check_val, dict) or not check_val or check_val.get('type', 'hostPath') == 'hostPath':
-            continue
-
-        values[storageKey][storage] = {key: value for key, value in check_val.items() if key != 'hostPath'}
-
-
-    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()))))

community/tdarr/1.1.7/questions.yaml

@@ -1,458 +0,0 @@
-groups:
-  - name: Tdarr Configuration
-    description: Configure Tdarr
-  - name: User and Group Configuration
-    description: Configure User and Group for Tdarr
-  - name: Network Configuration
-    description: Configure Network for Tdarr
-  - name: Storage Configuration
-    description: Configure Storage for Tdarr
-  - name: Resources Configuration
-    description: Configure Resources for Tdarr
-
-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: Tdarr Configuration
-    label: Timezone
-    schema:
-      type: string
-      default: Etc/UTC
-      required: true
-      $ref:
-        - definitions/timezone
-
-  - variable: tdarrConfig
-    label: ""
-    group: Tdarr Configuration
-    schema:
-      type: dict
-      attrs:
-        - variable: internalNode
-          label: Internal Node
-          description: |
-            If disabled, Tdarr will run only the server and webUI.</br>
-            If enabled, Tdarr will also start an internal node in the same container.
-          schema:
-            type: boolean
-            default: true
-        - variable: nodeName
-          label: Node Name
-          description: The name of the Tdarr Node.
-          schema:
-            type: string
-            default: "Tdarr"
-            show_if: [["internalNode", "=", true]]
-            required: true
-        - variable: additionalEnvs
-          label: Additional Environment Variables
-          description: Configure additional environment variables for Tdarr.
-          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: tdarrID
-    label: ""
-    group: User and Group Configuration
-    schema:
-      type: dict
-      attrs:
-        - variable: user
-          label: User ID
-          description: The user id that Tdarr files will be owned by.
-          schema:
-            type: int
-            min: 2
-            default: 568
-            required: true
-        - variable: group
-          label: Group ID
-          description: The group id that Tdarr files will be owned by.
-          schema:
-            type: int
-            min: 2
-            default: 568
-            required: true
-
-  - variable: tdarrNetwork
-    label: ""
-    group: Network Configuration
-    schema:
-      type: dict
-      attrs:
-        - variable: webPort
-          label: Web Port
-          description: The port for the Tdarr Web UI.
-          schema:
-            type: int
-            default: 30028
-            min: 9000
-            max: 65535
-            required: true
-        - variable: serverPort
-          label: Server Port
-          description: The port for the Tdarr Server.
-          schema:
-            type: int
-            default: 30029
-            min: 9000
-            max: 65535
-            required: true
-
-  - variable: tdarrStorage
-    label: ""
-    group: Storage Configuration
-    schema:
-      type: dict
-      attrs:
-        - variable: server
-          label: Tdarr Server Storage
-          description: The path to store Tdarr Server Data.
-          schema:
-            type: dict
-            attrs:
-              - variable: type
-                label: Type
-                description: |
-                  ixVolume: Is dataset created automatically by the system.</br>
-                  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: "server"
-                  $ref:
-                    - "normalize/ixVolume"
-              - variable: hostPath
-                label: Host Path
-                schema:
-                  type: hostpath
-                  show_if: [["type", "=", "hostPath"]]
-                  required: true
-        - variable: configs
-          label: Tdarr Config Storage
-          description: The path to store Tdarr Configuration.
-          schema:
-            type: dict
-            attrs:
-              - variable: type
-                label: Type
-                description: |
-                  ixVolume: Is dataset created automatically by the system.</br>
-                  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: "configs"
-                  $ref:
-                    - "normalize/ixVolume"
-              - variable: hostPath
-                label: Host Path
-                schema:
-                  type: hostpath
-                  show_if: [["type", "=", "hostPath"]]
-                  required: true
-        - variable: logs
-          label: Tdarr Logs Storage
-          description: The path to store Tdarr Logs.
-          schema:
-            type: dict
-            attrs:
-              - variable: type
-                label: Type
-                description: |
-                  ixVolume: Is dataset created automatically by the system.</br>
-                  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: "logs"
-                  $ref:
-                    - "normalize/ixVolume"
-              - variable: hostPath
-                label: Host Path
-                schema:
-                  type: hostpath
-                  show_if: [["type", "=", "hostPath"]]
-                  required: true
-        - variable: transcodes
-          label: Tdarr Transcodes Storage
-          description: The path to store Tdarr Transcodes.
-          schema:
-            type: dict
-            attrs:
-              - variable: type
-                label: Type
-                description: |
-                  ixVolume: Is dataset created automatically by the system.</br>
-                  Host Path: Is a path that already exists on the system.</br>
-                  emptyDir: Is a temporary directory that will be created on the disk or in memory.
-                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: "emptyDir"
-                      description: emptyDir (Temporary directory created on the disk or in memory)
-              - variable: datasetName
-                label: Dataset Name
-                schema:
-                  type: string
-                  show_if: [["type", "=", "ixVolume"]]
-                  required: true
-                  hidden: true
-                  immutable: true
-                  default: "transcodes"
-                  $ref:
-                    - "normalize/ixVolume"
-              - variable: hostPath
-                label: Host Path
-                schema:
-                  type: hostpath
-                  show_if: [["type", "=", "hostPath"]]
-                  required: true
-              - variable: medium
-                label: emptyDir Medium
-                description: |
-                  Disk: Creates a temporary directory on the disk.</br>
-                  Memory: Creates a temporary directory in memory.
-                schema:
-                  type: string
-                  show_if: [["type", "=", "emptyDir"]]
-                  default: ""
-                  enum:
-                    - value: ""
-                      description: Disk (Temporary directory created on the disk)
-                    - value: "Memory"
-                      description: Memory (Temporary directory created in memory)
-              - variable: size
-                label: emptyDir Size Limit
-                description: |
-                  The maximum size of the temporary directory.</br>
-                  For example: 2Gi
-                schema:
-                  type: string
-                  show_if: [["type", "=", "emptyDir"]]
-                  default: "2Gi"
-        - variable: additionalStorages
-          label: Additional Storage
-          description: Additional storage for Tdarr.
-          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.</br>
-                        Host Path: Is a path that already exists on the system.</br>
-                        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 Tdarr.
-                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</br>
-                    - Plain Integer - eg. 1</br>
-                    - Float - eg. 0.5</br>
-                    - Milicpu - eg. 500m
-                  default: "4000m"
-                  required: true
-              - variable: memory
-                label: Memory
-                description: Memory limit for Tdarr.
-                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</br>
-                    - Suffixed with E/P/T/G/M/K - eg. 1G</br>
-                    - Suffixed with Ei/Pi/Ti/Gi/Mi/Ki - eg. 1Gi</br>
-                    - Plain Integer in bytes - eg. 1024</br>
-                    - Exponent - eg. 134e6
-                  default: "8Gi"
-                  required: true
-
-  - variable: tdarrGPU
-    group: Resources Configuration
-    label: GPU Configuration
-    schema:
-      type: dict
-      $ref:
-        - "definitions/gpuConfiguration"
-      attrs: []

community/tdarr/1.1.7/Chart.yaml → community/tdarr/1.2.0/Chart.yaml

@@ -3,7 +3,7 @@ description: Tdarr is a Distributed Transcoding System
 annotations:
   title: Tdarr
 type: application
-version: 1.1.7
+version: 1.2.0
 apiVersion: v2
 appVersion: '2.17.01'
 kubeVersion: '>=1.16.0-0'

community/tdarr/1.1.7/ci/basic-values.yaml → community/tdarr/1.2.0/ci/basic-values.yaml

@@ -5,18 +5,16 @@ tdarrID:
   group: 1001
 tdarrStorage:
   server:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/server
+    type: pvc
   configs:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/configs
+    type: pvc
   logs:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/logs
+    type: pvc
   transcodes:
     type: emptyDir
-    medium: Memory
-    size: 1Gi
+    emptyDirConfig:
+      medium: Memory
+      size: 1
 # Make sure installation don't fail when 0 GPU are assigned
 tdarrGPU:
   nvidia.com/gpu: 0

community/tdarr/1.2.0/ci/no-internal-node-values.yaml

@@ -0,0 +1,15 @@
+tdarrConfig:
+  nodeName: ''
+  internalNode: false
+tdarrStorage:
+  server:
+    type: pvc
+  configs:
+    type: pvc
+  logs:
+    type: pvc
+  transcodes:
+    type: emptyDir
+    emptyDirConfig:
+      size: 1
+      medium: ""

community/tdarr/1.1.7/ix_values.yaml → community/tdarr/1.2.0/ix_values.yaml

@@ -22,16 +22,18 @@ tdarrID:
 tdarrStorage:
   server:
     type: ixVolume
-    datasetName: server
+    ixVolumeConfig:
+      datasetName: server
   configs:
     type: ixVolume
-    datasetName: configs
+    ixVolumeConfig:
+      datasetName: configs
   logs:
     type: ixVolume
-    datasetName: logs
+    ixVolumeConfig:
+      datasetName: logs
   transcodes:
     type: ixVolume
-    datasetName: transcodes
-    medium: ''
-    size: ''
+    ixVolumeConfig:
+      datasetName: transcodes
   additionalStorages: []

community/tdarr/1.2.0/migrations/migrate

@@ -0,0 +1,93 @@
+#!/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')
+
+        # Clean up for some older versions.
+        if storage.get('hostPath'):
+            delete_keys.append('hostPath')
+
+    elif storage['type'] == 'emptyDir':
+        # Check if the key exists, if not we have already migrated
+        if not 'medium' in storage.keys():
+            return storage
+
+        if storage['size'] and (not storage['size'].endswith('Gi')):
+            raise Exception('In order to proceed with the update, ' \
+                            'please change the size for the storage using ' \
+                            '"emptyDir" in the format xGi. eg. "2Gi"')
+
+        storage['emptyDirConfig'] = {
+            'medium': storage['medium'],
+            'size': int(storage['size'].replace('Gi', '')) if storage['size'] else None,
+        }
+        delete_keys.extend(['medium', 'size'])
+
+    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 = 'tdarrStorage'
+    storages = ['server', 'configs', 'logs', 'transcodes']
+
+    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()))))

community/tdarr/1.2.0/questions.yaml

@@ -0,0 +1,672 @@
+groups:
+  - name: Tdarr Configuration
+    description: Configure Tdarr
+  - name: User and Group Configuration
+    description: Configure User and Group for Tdarr
+  - name: Network Configuration
+    description: Configure Network for Tdarr
+  - name: Storage Configuration
+    description: Configure Storage for Tdarr
+  - name: Resources Configuration
+    description: Configure Resources for Tdarr
+
+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: Tdarr Configuration
+    label: Timezone
+    schema:
+      type: string
+      default: Etc/UTC
+      required: true
+      $ref:
+        - definitions/timezone
+
+  - variable: tdarrConfig
+    label: ""
+    group: Tdarr Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: internalNode
+          label: Internal Node
+          description: |
+            If disabled, Tdarr will run only the server and webUI.</br>
+            If enabled, Tdarr will also start an internal node in the same container.
+          schema:
+            type: boolean
+            default: true
+        - variable: nodeName
+          label: Node Name
+          description: The name of the Tdarr Node.
+          schema:
+            type: string
+            default: "Tdarr"
+            show_if: [["internalNode", "=", true]]
+            required: true
+        - variable: additionalEnvs
+          label: Additional Environment Variables
+          description: Configure additional environment variables for Tdarr.
+          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: tdarrID
+    label: ""
+    group: User and Group Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: user
+          label: User ID
+          description: The user id that Tdarr files will be owned by.
+          schema:
+            type: int
+            min: 2
+            default: 568
+            required: true
+        - variable: group
+          label: Group ID
+          description: The group id that Tdarr files will be owned by.
+          schema:
+            type: int
+            min: 2
+            default: 568
+            required: true
+
+  - variable: tdarrNetwork
+    label: ""
+    group: Network Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: webPort
+          label: Web Port
+          description: The port for the Tdarr Web UI.
+          schema:
+            type: int
+            default: 30028
+            min: 9000
+            max: 65535
+            required: true
+        - variable: serverPort
+          label: Server Port
+          description: The port for the Tdarr Server.
+          schema:
+            type: int
+            default: 30029
+            min: 9000
+            max: 65535
+            required: true
+
+  - variable: tdarrStorage
+    label: ""
+    group: Storage Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: server
+          label: Tdarr Server Storage
+          description: The path to store Tdarr Server Data.
+          schema:
+            type: dict
+            attrs:
+              - variable: type
+                label: Type
+                description: |
+                  ixVolume: Is dataset created automatically by the system.</br>
+                  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: "server"
+                    - 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: configs
+          label: Tdarr Config Storage
+          description: The path to store Tdarr Configuration.
+          schema:
+            type: dict
+            attrs:
+              - variable: type
+                label: Type
+                description: |
+                  ixVolume: Is dataset created automatically by the system.</br>
+                  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: "configs"
+                    - 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: logs
+          label: Tdarr Logs Storage
+          description: The path to store Tdarr Logs.
+          schema:
+            type: dict
+            attrs:
+              - variable: type
+                label: Type
+                description: |
+                  ixVolume: Is dataset created automatically by the system.</br>
+                  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: "logs"
+                    - 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: transcodes
+          label: Tdarr Transcodes Storage
+          description: The path to store Tdarr Transcodes.
+          schema:
+            type: dict
+            attrs:
+              - variable: type
+                label: Type
+                description: |
+                  ixVolume: Is dataset created automatically by the system.</br>
+                  Host Path: Is a path that already exists on the system.</br>
+                  emptyDir: Is a temporary directory that will be created on the disk or in memory.
+                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: "emptyDir"
+                      description: emptyDir (Temporary directory created on the disk or in memory)
+              - 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: "transcodes"
+                    - variable: aclEntries
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+              - variable: emptyDirConfig
+                label: emptyDir Configuration
+                schema:
+                  type: dict
+                  show_if: [["type", "=", "emptyDir"]]
+                  attrs:
+                    - variable: medium
+                      label: emptyDir Medium
+                      description: |
+                        Disk: Creates a temporary directory on the disk.</br>
+                        Memory: Creates a temporary directory in memory.
+                      schema:
+                        type: string
+                        default: ""
+                        enum:
+                          - value: ""
+                            description: Disk (Temporary directory created on the disk)
+                          - value: "Memory"
+                            description: Memory (Temporary directory created in memory)
+                    - variable: size
+                      label: emptyDir Size Limit (in Gi)
+                      description: |
+                        The maximum size (in Gi) of the temporary directory.</br>
+                        For example: 2
+                      schema:
+                        type: int
+                        "null": true
+                        default: 2
+              - 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 Tdarr.
+          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.</br>
+                        Host Path: Is a path that already exists on the system.</br>
+                        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 Tdarr.
+                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</br>
+                    - Plain Integer - eg. 1</br>
+                    - Float - eg. 0.5</br>
+                    - Milicpu - eg. 500m
+                  default: "4000m"
+                  required: true
+              - variable: memory
+                label: Memory
+                description: Memory limit for Tdarr.
+                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</br>
+                    - Suffixed with E/P/T/G/M/K - eg. 1G</br>
+                    - Suffixed with Ei/Pi/Ti/Gi/Mi/Ki - eg. 1Gi</br>
+                    - Plain Integer in bytes - eg. 1024</br>
+                    - Exponent - eg. 134e6
+                  default: "8Gi"
+                  required: true
+
+  - variable: tdarrGPU
+    group: Resources Configuration
+    label: GPU Configuration
+    schema:
+      type: dict
+      $ref:
+        - "definitions/gpuConfiguration"
+      attrs: []

community/tdarr/1.1.7/templates/_tdarr.tpl → community/tdarr/1.2.0/templates/_tdarr.tpl

@@ -81,63 +81,41 @@ service:
 persistence:
   server:
     enabled: true
-    type: {{ .Values.tdarrStorage.server.type }}
-    datasetName: {{ .Values.tdarrStorage.server.datasetName | default "" }}
-    hostPath: {{ .Values.tdarrStorage.server.hostPath | default "" }}
+    {{- include "tdarr.storage.ci.migration" (dict "storage" .Values.tdarrStorage.server) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.tdarrStorage.server) | nindent 4 }}
     targetSelector:
       tdarr:
         tdarr:
           mountPath: /app/server
   configs:
     enabled: true
-    type: {{ .Values.tdarrStorage.configs.type }}
-    datasetName: {{ .Values.tdarrStorage.configs.datasetName | default "" }}
-    hostPath: {{ .Values.tdarrStorage.configs.hostPath | default "" }}
+    {{- include "tdarr.storage.ci.migration" (dict "storage" .Values.tdarrStorage.configs) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.tdarrStorage.configs) | nindent 4 }}
     targetSelector:
       tdarr:
         tdarr:
           mountPath: /app/configs
   logs:
     enabled: true
-    type: {{ .Values.tdarrStorage.logs.type }}
-    datasetName: {{ .Values.tdarrStorage.logs.datasetName | default "" }}
-    hostPath: {{ .Values.tdarrStorage.logs.hostPath | default "" }}
+    {{- include "tdarr.storage.ci.migration" (dict "storage" .Values.tdarrStorage.logs) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.tdarrStorage.logs) | nindent 4 }}
     targetSelector:
       tdarr:
         tdarr:
           mountPath: /app/logs
   transcode:
     enabled: true
-    type: {{ .Values.tdarrStorage.transcodes.type }}
-    datasetName: {{ .Values.tdarrStorage.transcodes.datasetName | default "" }}
-    hostPath: {{ .Values.tdarrStorage.transcodes.hostPath | default "" }}
-    medium: {{ .Values.tdarrStorage.transcodes.medium | default "" }}
-    {{/* Size of the emptyDir */}}
-    size: {{ .Values.tdarrStorage.transcodes.size | default "" }}
+    {{- include "tdarr.storage.ci.migration" (dict "storage" .Values.tdarrStorage.transcodes) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.tdarrStorage.transcodes) | nindent 4 }}
     targetSelector:
       tdarr:
         tdarr:
           mountPath: /temp
   {{- range $idx, $storage := .Values.tdarrStorage.additionalStorages }}
   {{ printf "tdarr-%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 "tdarr.storage.ci.migration" (dict "storage" $storage) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }}
     targetSelector:
       tdarr:
         tdarr:
@@ -155,3 +133,19 @@ scaleGPU:
   {{ end }}
 {{ end }}
 {{- end -}}
+
+{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}}
+{{- define "tdarr.storage.ci.migration" -}}
+  {{- $storage := .storage -}}
+
+  {{- if $storage.hostPath -}}
+    {{- $_ := set $storage "hostPathConfig" dict -}}
+    {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}}
+  {{- end -}}
+
+  {{- if eq $storage.type "emptyDir" -}}
+    {{- if not $storage.emptyDirConfig -}}
+      {{- $_ := set $storage "emptyDirConfig" (dict "medium" "" "size" "") -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}