浏览代码

Publish new changes in catalog

sonicaj 1 年之前
父节点
当前提交
9c865eed54
共有 29 个文件被更改,包括 490 次插入241 次删除
  1. 二进制
      community/castopod/1.1.8/charts/common-1.2.5.tgz
  2. 0 17
      community/castopod/1.1.8/ci/2fa-values.yaml
  3. 0 16
      community/castopod/1.1.8/ci/basic-values.yaml
  4. 0 23
      community/castopod/1.1.8/ci/extra-values.yaml
  5. 0 18
      community/castopod/1.1.8/ci/https-redirect-values.yaml
  6. 0 76
      community/castopod/1.1.8/templates/_persistance.tpl
  7. 0 0
      community/castopod/1.2.0/Chart.lock
  8. 1 1
      community/castopod/1.2.0/Chart.yaml
  9. 0 0
      community/castopod/1.2.0/README.md
  10. 0 0
      community/castopod/1.2.0/app-readme.md
  11. 二进制
      community/castopod/1.2.0/charts/common-1.2.5.tgz
  12. 17 0
      community/castopod/1.2.0/ci/2fa-values.yaml
  13. 16 0
      community/castopod/1.2.0/ci/basic-values.yaml
  14. 21 0
      community/castopod/1.2.0/ci/extra-values.yaml
  15. 18 0
      community/castopod/1.2.0/ci/https-redirect-values.yaml
  16. 6 3
      community/castopod/1.2.0/ix_values.yaml
  17. 0 0
      community/castopod/1.2.0/metadata.yaml
  18. 73 0
      community/castopod/1.2.0/migrations/migrate
  19. 270 87
      community/castopod/1.2.0/questions.yaml
  20. 0 0
      community/castopod/1.2.0/templates/NOTES.txt
  21. 0 0
      community/castopod/1.2.0/templates/_castopod.tpl
  22. 0 0
      community/castopod/1.2.0/templates/_configuration.tpl
  23. 0 0
      community/castopod/1.2.0/templates/_mariadb.tpl
  24. 68 0
      community/castopod/1.2.0/templates/_persistance.tpl
  25. 0 0
      community/castopod/1.2.0/templates/_portal.tpl
  26. 0 0
      community/castopod/1.2.0/templates/_redis.tpl
  27. 0 0
      community/castopod/1.2.0/templates/_service.tpl
  28. 0 0
      community/castopod/1.2.0/templates/_web.tpl
  29. 0 0
      community/castopod/1.2.0/templates/common.yaml

二进制
community/castopod/1.1.8/charts/common-1.2.5.tgz


+ 0 - 17
community/castopod/1.1.8/ci/2fa-values.yaml

@@ -1,17 +0,0 @@
-castopodConfig:
-  baseUrl: http://localhost:31000
-  enable2fa: true
-
-castopodNetwork:
-  webPort: 31000
-
-castopodStorage:
-  data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
-  mariadbData:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/mariadbData
-  mariadbBackup:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/mariadbBackup

+ 0 - 16
community/castopod/1.1.8/ci/basic-values.yaml

@@ -1,16 +0,0 @@
-castopodConfig:
-  baseUrl: http://localhost:31000
-
-castopodNetwork:
-  webPort: 31000
-
-castopodStorage:
-  data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
-  mariadbData:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/mariadbData
-  mariadbBackup:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/mariadbBackup

+ 0 - 23
community/castopod/1.1.8/ci/extra-values.yaml

@@ -1,23 +0,0 @@
-castopodConfig:
-  baseUrl: http://localhost:31000
-
-castopodNetwork:
-  webPort: 31000
-
-castopodStorage:
-  data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
-  mariadbData:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/mariadbData
-  mariadbBackup:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/mariadbBackup
-  additionalStorages:
-  - type: hostPath
-    hostPath: /mnt/{{ .Release.Namespace }}/data1
-    mountPath: /data1
-  - type: hostPath
-    hostPath: /mnt/{{ .Release.Namespace }}/data2
-    mountPath: /data2

+ 0 - 18
community/castopod/1.1.8/ci/https-redirect-values.yaml

@@ -1,18 +0,0 @@
-castopodConfig:
-  baseUrl: http://localhost:31000
-  disableHttpsRedirect: false
-  enable2fa: true
-
-castopodNetwork:
-  webPort: 31000
-
-castopodStorage:
-  data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
-  mariadbData:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/mariadbData
-  mariadbBackup:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/mariadbBackup

+ 0 - 76
community/castopod/1.1.8/templates/_persistance.tpl

@@ -1,76 +0,0 @@
-{{- define "castopod.persistence" -}}
-persistence:
-  data:
-    enabled: true
-    type: {{ .Values.castopodStorage.data.type }}
-    datasetName: {{ .Values.castopodStorage.data.datasetName | default "" }}
-    hostPath: {{ .Values.castopodStorage.data.hostPath | default "" }}
-    targetSelector:
-      castopod:
-        castopod:
-          mountPath: /var/www/castopod/public/media
-      web:
-        web:
-          mountPath: /var/www/html/media
-  tmp:
-    enabled: true
-    type: emptyDir
-    targetSelector:
-      castopod:
-        castopod:
-          mountPath: /tmp
-  {{- range $idx, $storage := .Values.castopodStorage.additionalStorages }}
-  {{ printf "castopod-%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:
-      castopod:
-        castopod:
-          mountPath: {{ $storage.mountPath }}
-  {{- end }}
-
-  mariadbdata:
-    enabled: true
-    type: {{ .Values.castopodStorage.mariadbData.type }}
-    datasetName: {{ .Values.castopodStorage.mariadbData.datasetName | default "" }}
-    hostPath: {{ .Values.castopodStorage.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.castopodStorage.mariadbBackup.type }}
-    datasetName: {{ .Values.castopodStorage.mariadbBackup.datasetName | default "" }}
-    hostPath: {{ .Values.castopodStorage.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 -}}

+ 0 - 0
community/castopod/1.1.8/Chart.lock → community/castopod/1.2.0/Chart.lock


+ 1 - 1
community/castopod/1.1.8/Chart.yaml → community/castopod/1.2.0/Chart.yaml

@@ -3,7 +3,7 @@ description: Castopod is an open-source hosting platform made for podcasters who
 annotations:
   title: Castopod
 type: application
-version: 1.1.8
+version: 1.2.0
 apiVersion: v2
 appVersion: 1.7.2
 kubeVersion: '>=1.16.0-0'

+ 0 - 0
community/castopod/1.1.8/README.md → community/castopod/1.2.0/README.md


+ 0 - 0
community/castopod/1.1.8/app-readme.md → community/castopod/1.2.0/app-readme.md


二进制
community/castopod/1.2.0/charts/common-1.2.5.tgz


+ 17 - 0
community/castopod/1.2.0/ci/2fa-values.yaml

@@ -0,0 +1,17 @@
+castopodConfig:
+  baseUrl: http://localhost:31000
+  enable2fa: true
+
+castopodNetwork:
+  webPort: 31000
+
+castopodStorage:
+  data:
+    type: pvc
+  mariadbData:
+    type: pvc
+  mariadbBackup:
+    type: emptyDir
+    emptyDirConfig:
+      medium: ""
+      size: ""

+ 16 - 0
community/castopod/1.2.0/ci/basic-values.yaml

@@ -0,0 +1,16 @@
+castopodConfig:
+  baseUrl: http://localhost:31000
+
+castopodNetwork:
+  webPort: 31000
+
+castopodStorage:
+  data:
+    type: pvc
+  mariadbData:
+    type: pvc
+  mariadbBackup:
+    type: emptyDir
+    emptyDirConfig:
+      medium: ""
+      size: ""

+ 21 - 0
community/castopod/1.2.0/ci/extra-values.yaml

@@ -0,0 +1,21 @@
+castopodConfig:
+  baseUrl: http://localhost:31000
+
+castopodNetwork:
+  webPort: 31000
+
+castopodStorage:
+  data:
+    type: pvc
+  mariadbData:
+    type: pvc
+  mariadbBackup:
+    type: emptyDir
+    emptyDirConfig:
+      medium: ""
+      size: ""
+  additionalStorages:
+  - type: pvc
+    mountPath: /data1
+  - type: pvc
+    mountPath: /data2

+ 18 - 0
community/castopod/1.2.0/ci/https-redirect-values.yaml

@@ -0,0 +1,18 @@
+castopodConfig:
+  baseUrl: http://localhost:31000
+  disableHttpsRedirect: false
+  enable2fa: true
+
+castopodNetwork:
+  webPort: 31000
+
+castopodStorage:
+  data:
+    type: pvc
+  mariadbData:
+    type: pvc
+  mariadbBackup:
+    type: emptyDir
+    emptyDirConfig:
+      medium: ""
+      size: ""

+ 6 - 3
community/castopod/1.1.8/ix_values.yaml → community/castopod/1.2.0/ix_values.yaml

@@ -27,11 +27,14 @@ castopodNetwork:
 castopodStorage:
   data:
     type: ixVolume
-    datasetName: data
+    ixVolumeConfig:
+      datasetName: data
   mariadbData:
     type: ixVolume
-    datasetName: mariadbData
+    ixVolumeConfig:
+      datasetName: mariadbData
   mariadbBackup:
     type: ixVolume
-    datasetName: mariadbBackup
+    ixVolumeConfig:
+      datasetName: mariadbBackup
   additionalStorages: []

+ 0 - 0
community/castopod/1.1.8/metadata.yaml → community/castopod/1.2.0/metadata.yaml


+ 73 - 0
community/castopod/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 = 'castopodStorage'
+    storages = ['data', '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()))))

+ 270 - 87
community/castopod/1.1.8/questions.yaml → community/castopod/1.2.0/questions.yaml

@@ -146,23 +146,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: mariadbData
           label: Castopod MariaDB Data Storage
           description: The path to store Castopod MariaDB Data.
@@ -184,23 +225,71 @@ 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: Castopod MariaDB Backup Storage
           description: The path to store Castopod MariaDB Backup.
@@ -222,23 +311,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 Castopod.
@@ -269,74 +407,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
     label: ""

+ 0 - 0
community/castopod/1.1.8/templates/NOTES.txt → community/castopod/1.2.0/templates/NOTES.txt


+ 0 - 0
community/castopod/1.1.8/templates/_castopod.tpl → community/castopod/1.2.0/templates/_castopod.tpl


+ 0 - 0
community/castopod/1.1.8/templates/_configuration.tpl → community/castopod/1.2.0/templates/_configuration.tpl


+ 0 - 0
community/castopod/1.1.8/templates/_mariadb.tpl → community/castopod/1.2.0/templates/_mariadb.tpl


+ 68 - 0
community/castopod/1.2.0/templates/_persistance.tpl

@@ -0,0 +1,68 @@
+{{- define "castopod.persistence" -}}
+persistence:
+  data:
+    enabled: true
+    {{- include "castopod.storage.ci.migration" (dict "storage" .Values.castopodStorage.data) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.castopodStorage.data) | nindent 4 }}
+    targetSelector:
+      castopod:
+        castopod:
+          mountPath: /var/www/castopod/public/media
+      web:
+        web:
+          mountPath: /var/www/html/media
+  tmp:
+    enabled: true
+    type: emptyDir
+    targetSelector:
+      castopod:
+        castopod:
+          mountPath: /tmp
+  {{- range $idx, $storage := .Values.castopodStorage.additionalStorages }}
+  {{ printf "castopod-%v" (int $idx) }}:
+    enabled: true
+    {{- include "castopod.storage.ci.migration" (dict "storage" $storage) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }}
+    targetSelector:
+      castopod:
+        castopod:
+          mountPath: {{ $storage.mountPath }}
+  {{- end }}
+
+  mariadbdata:
+    enabled: true
+    {{- include "castopod.storage.ci.migration" (dict "storage" .Values.castopodStorage.mariadbData) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.castopodStorage.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 "castopod.storage.ci.migration" (dict "storage" .Values.castopodStorage.mariadbBackup) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.castopodStorage.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 "castopod.storage.ci.migration" -}}
+  {{- $storage := .storage -}}
+
+  {{- if $storage.hostPath -}}
+    {{- $_ := set $storage "hostPathConfig" dict -}}
+    {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}}
+  {{- end -}}
+{{- end -}}

+ 0 - 0
community/castopod/1.1.8/templates/_portal.tpl → community/castopod/1.2.0/templates/_portal.tpl


+ 0 - 0
community/castopod/1.1.8/templates/_redis.tpl → community/castopod/1.2.0/templates/_redis.tpl


+ 0 - 0
community/castopod/1.1.8/templates/_service.tpl → community/castopod/1.2.0/templates/_service.tpl


+ 0 - 0
community/castopod/1.1.8/templates/_web.tpl → community/castopod/1.2.0/templates/_web.tpl


+ 0 - 0
community/castopod/1.1.8/templates/common.yaml → community/castopod/1.2.0/templates/common.yaml