Publish new changes in catalog

community/filebrowser/1.2.2/Chart.yaml → community/filebrowser/1.2.3/Chart.yaml

@@ -1,11 +1,12 @@
 name: filebrowser
-description: File Browser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files.
+description: File Browser provides a file managing interface within a specified directory
+  and it can be used to upload, delete, preview, rename and edit your files.
 annotations:
   title: File Browser
 type: application
-version: 1.2.2
+version: 1.2.3
 apiVersion: v2
-appVersion: 2.26.0
+appVersion: 2.27.0
 kubeVersion: '>=1.16.0-0'
 maintainers:
   - name: truenas

community/filebrowser/1.2.2/ix_values.yaml → community/filebrowser/1.2.3/ix_values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: filebrowser/filebrowser
   pullPolicy: IfNotPresent
-  tag: v2.26.0
+  tag: v2.27.0
 
 resources:
   limits:

community/firefly-iii/1.1.7/Chart.yaml → community/firefly-iii/1.1.8/Chart.yaml

@@ -3,9 +3,9 @@ description: Firefly III is a personal finances manager
 annotations:
   title: Firefly III
 type: application
-version: 1.1.7
+version: 1.1.8
 apiVersion: v2
-appVersion: 6.1.1
+appVersion: 6.1.4
 kubeVersion: '>=1.16.0-0'
 maintainers:
   - name: truenas

community/firefly-iii/1.1.7/ix_values.yaml → community/firefly-iii/1.1.8/ix_values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: fireflyiii/core
   pullPolicy: IfNotPresent
-  tag: version-6.1.1
+  tag: version-6.1.4
 
 importerImage:
   repository: fireflyiii/data-importer

community/metube/1.2.2/Chart.yaml → community/metube/1.2.3/Chart.yaml

@@ -4,9 +4,9 @@ description: MeTube is a web GUI for youtube-dl (using the yt-dlp fork) with pla
 annotations:
   title: MeTube
 type: application
-version: 1.2.2
+version: 1.2.3
 apiVersion: v2
-appVersion: '2023-12-31'
+appVersion: '2024-01-02'
 kubeVersion: '>=1.16.0-0'
 maintainers:
   - name: truenas

community/metube/1.2.2/ix_values.yaml → community/metube/1.2.3/ix_values.yaml

@@ -1,7 +1,7 @@
 image:
   repository: alexta69/metube
   pullPolicy: IfNotPresent
-  tag: '2023-12-31'
+  tag: '2024-01-02'
 
 resources:
   limits:

community/tiny-media-manager/1.1.9/ci/extra-values.yaml

@@ -1,17 +0,0 @@
-tmmConfig:
-  password: secret
-
-tmmNetwork:
-  webPort: 31000
-
-tmmStorage:
-  data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Namespace }}/data
-  additionalStorages:
-  - type: hostPath
-    hostPath: /mnt/{{ .Release.Namespace }}/tv-shows
-    mountPath: /tv-shows
-  - type: hostPath
-    hostPath: /mnt/{{ .Release.Namespace }}/movies
-    mountPath: /movies

community/tiny-media-manager/1.1.9/templates/_persistence.tpl

@@ -1,44 +0,0 @@
-{{- define "tmm.persistence" -}}
-persistence:
-  data:
-    enabled: true
-    type: {{ .Values.tmmStorage.data.type }}
-    datasetName: {{ .Values.tmmStorage.data.datasetName | default "" }}
-    hostPath: {{ .Values.tmmStorage.data.hostPath | default "" }}
-    targetSelector:
-      tmm:
-        tmm:
-          mountPath: /data
-  tmp:
-    enabled: true
-    type: emptyDir
-    targetSelector:
-      tmm:
-        tmm:
-          mountPath: /tmp
-  {{- range $idx, $storage := .Values.tmmStorage.additionalStorages }}
-  {{ printf "tmm-%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:
-      tmm:
-        tmm:
-          mountPath: {{ $storage.mountPath }}
-  {{- end }}
-{{- end -}}

community/tiny-media-manager/1.1.9/Chart.yaml → community/tiny-media-manager/1.2.0/Chart.yaml

@@ -3,7 +3,7 @@ description: tinyMediaManager is a media management tool written in Java/Swing.
 annotations:
   title: tinyMediaManager
 type: application
-version: 1.1.9
+version: 1.2.0
 apiVersion: v2
 appVersion: 5.0.0
 kubeVersion: '>=1.16.0-0'

community/tiny-media-manager/1.1.9/ci/basic-values.yaml → community/tiny-media-manager/1.2.0/ci/basic-values.yaml

@@ -10,5 +10,4 @@ tmmID:
 
 tmmStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Namespace }}/data
+    type: pvc

community/tiny-media-manager/1.2.0/ci/extra-values.yaml

@@ -0,0 +1,14 @@
+tmmConfig:
+  password: secret
+
+tmmNetwork:
+  webPort: 31000
+
+tmmStorage:
+  data:
+    type: pvc
+  additionalStorages:
+  - type: pvc
+    mountPath: /tv-shows
+  - type: pvc
+    mountPath: /movies

community/tiny-media-manager/1.1.9/ci/hostNet-values.yaml → community/tiny-media-manager/1.2.0/ci/hostNet-values.yaml

@@ -7,5 +7,4 @@ tmmNetwork:
 
 tmmStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Namespace }}/data
+    type: pvc

community/tiny-media-manager/1.1.9/ix_values.yaml → community/tiny-media-manager/1.2.0/ix_values.yaml

@@ -20,7 +20,8 @@ tmmID:
   group: 568
 
 tmmStorage:
-  config:
+  data:
     type: ixVolume
-    datasetName: data
+    ixVolumeConfig:
+      datasetName: data
   additionalStorages: []

community/tiny-media-manager/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 = 'tmmStorage'
+    storages = ['data']
+
+    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/tiny-media-manager/1.1.9/questions.yaml → community/tiny-media-manager/1.2.0/questions.yaml

@@ -122,23 +122,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: "data"
                   $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: "data"
+                    - 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 tinyMediaManager.
@@ -169,74 +210,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

community/tiny-media-manager/1.2.0/templates/_persistence.tpl

@@ -0,0 +1,38 @@
+{{- define "tmm.persistence" -}}
+persistence:
+  data:
+    enabled: true
+    {{- include "tmm.storage.ci.migration" (dict "storage" .Values.tmmStorage.data) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.tmmStorage.data) | nindent 4 }}
+    targetSelector:
+      tmm:
+        tmm:
+          mountPath: /data
+  tmp:
+    enabled: true
+    type: emptyDir
+    targetSelector:
+      tmm:
+        tmm:
+          mountPath: /tmp
+  {{- range $idx, $storage := .Values.tmmStorage.additionalStorages }}
+  {{ printf "tmm-%v" (int $idx) }}:
+    enabled: true
+    {{- include "tmm.storage.ci.migration" (dict "storage" $storage) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }}
+    targetSelector:
+      tmm:
+        tmm:
+          mountPath: {{ $storage.mountPath }}
+  {{- end }}
+{{- end -}}
+
+{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}}
+{{- define "tmm.storage.ci.migration" -}}
+  {{- $storage := .storage -}}
+
+  {{- if $storage.hostPath -}}
+    {{- $_ := set $storage "hostPathConfig" dict -}}
+    {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}}
+  {{- end -}}
+{{- end -}}

community/unifi-controller/1.2.6/Chart.yaml → community/unifi-controller/1.3.0/Chart.yaml

@@ -3,7 +3,7 @@ description: Unifi Controller is a network management controller for Unifi Equip
 annotations:
   title: Unifi Controller
 type: application
-version: 1.2.6
+version: 1.3.0
 apiVersion: v2
 appVersion: 8.0.24
 kubeVersion: '>=1.16.0-0'

community/unifi-controller/1.2.6/ix_values.yaml → community/unifi-controller/1.3.0/ix_values.yaml

@@ -25,5 +25,6 @@ unifiNetwork:
 unifiStorage:
   data:
     type: ixVolume
-    datasetName: data
+    ixVolumeConfig:
+      datasetName: data
   additionalStorages: []

community/unifi-controller/1.3.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 = 'unifiStorage'
+    storages = ['data']
+
+    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/unifi-controller/1.2.6/questions.yaml → community/unifi-controller/1.3.0/questions.yaml

@@ -158,23 +158,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: "data"
                   $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: "data"
+                    - 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 Unifi Controller.
@@ -205,74 +246,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

community/unifi-controller/1.2.6/templates/_persistence.tpl → community/unifi-controller/1.3.0/templates/_persistence.tpl

@@ -2,15 +2,16 @@
 persistence:
   data:
     enabled: true
-    type: {{ .Values.unifiStorage.data.type }}
-    datasetName: {{ .Values.unifiStorage.data.datasetName | default "" }}
-    hostPath: {{ .Values.unifiStorage.data.hostPath | default "" }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.unifiStorage.data) | nindent 4 }}
     targetSelector:
       unifi:
         unifi:
           mountPath: /usr/lib/unifi/data
+        {{- if and (eq .Values.unifiStorage.data.type "ixVolume")
+                  (not (.Values.unifiStorage.data.ixVolumeConfig | default dict).aclEnable) }}
         01-permissions:
           mountPath: /mnt/directories/unifi
+        {{- end }}
         02-migrate:
           mountPath: /usr/lib/unifi/data
   cert:
@@ -38,30 +39,16 @@ persistence:
           mountPath: /tmp
   {{- range $idx, $storage := .Values.unifiStorage.additionalStorages }}
   {{ printf "unifi-%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 "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }}
     targetSelector:
       unifi:
         unifi:
           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.unifiNetwork.certificateID }}

community/unifi-controller/1.2.6/templates/_unifi.tpl → community/unifi-controller/1.3.0/templates/_unifi.tpl

@@ -48,7 +48,7 @@ workload:
                                                         "UID" 999
                                                         "GID" 999
                                                         "mode" "check"
-                                                        "type" "init") | nindent 8 }}
+                                                        "type" "install") | nindent 8 }}
         {{- $migrate := false -}}
         {{- if (hasKey .Values.global "ixChartContext") -}}
           {{- if (hasKey .Values.global.ixChartContext "upgradeMetadata") -}}

community/unifi-protect-backup/1.1.9/ci/extra-values.yaml

@@ -1,20 +0,0 @@
-upbConfig:
-  unifiProtectUsername: 'user'
-  unifiProtectPassword: 'pass'
-  unifiProtectAddress: '192.168.1.100'
-  rcloneDestination: 'gdrive:unifi-protect-backup'
-
-upbStorage:
-  config:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Namespace }}/config
-  data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Namespace }}/data
-  additionalStorages:
-  - type: hostPath
-    hostPath: /mnt/{{ .Release.Namespace }}/data1
-    mountPath: /data1
-  - type: hostPath
-    hostPath: /mnt/{{ .Release.Namespace }}/data2
-    mountPath: /data2

community/unifi-protect-backup/1.1.9/templates/_persistence.tpl

@@ -1,59 +0,0 @@
-{{- define "upb.persistence" -}}
-persistence:
-  config:
-    enabled: true
-    type: {{ .Values.upbStorage.config.type }}
-    datasetName: {{ .Values.upbStorage.config.datasetName | default "" }}
-    hostPath: {{ .Values.upbStorage.config.hostPath | default "" }}
-    targetSelector:
-      unifi-protect:
-        unifi-protect:
-          mountPath: /config
-        01-permissions:
-          mountPath: /mnt/directories/config
-  data:
-    enabled: true
-    type: {{ .Values.upbStorage.data.type }}
-    datasetName: {{ .Values.upbStorage.data.datasetName | default "" }}
-    hostPath: {{ .Values.upbStorage.data.hostPath | default "" }}
-    targetSelector:
-      unifi-protect:
-        unifi-protect:
-          mountPath: /data
-        01-permissions:
-          mountPath: /mnt/directories/data
-  tmp:
-    enabled: true
-    type: emptyDir
-    targetSelector:
-      unifi-protect:
-        unifi-protect:
-          mountPath: /tmp
-  {{- range $idx, $storage := .Values.upbStorage.additionalStorages }}
-  {{ printf "upb-%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:
-      unifi-protect:
-        unifi-protect:
-          mountPath: {{ $storage.mountPath }}
-        01-permissions:
-          mountPath: /mnt/directories{{ $storage.mountPath }}
-  {{- end }}
-{{- end -}}

community/unifi-protect-backup/1.1.9/Chart.yaml → community/unifi-protect-backup/1.2.0/Chart.yaml

@@ -3,7 +3,7 @@ description: Unifi Protect Backup is a python based tool for backing up UniFi Pr
 annotations:
   title: Unifi Protect Backup
 type: application
-version: 1.1.9
+version: 1.2.0
 apiVersion: v2
 appVersion: 0.10.3
 kubeVersion: '>=1.16.0-0'