freshrss - migrate storage section (#1776)

* freshrss - migrate storage section * add migration script
truenas · Nov 21, 2023 · fa671d8 · fa671d8
1 parent 12f1951
commit fa671d8
Showing 8 changed files with 418 additions and 136 deletions.
diff --git a/library/ix-dev/community/freshrss/Chart.lock b/library/ix-dev/community/freshrss/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../../../common
-  version: 1.2.2
-digest: sha256:fb077cb81f6acecd5c9e6adc22a18e156f780cd78f27198cdb47810f95364b56
-generated: "2023-11-09T15:39:58.500714946+02:00"
+  version: 1.2.3
+digest: sha256:e6ff49b06bf5d4d159e505ae6d153f36cd46170bb519caf90462cd5caebfd0fb
+generated: "2023-11-21T15:36:05.236830847+02:00"
diff --git a/library/ix-dev/community/freshrss/Chart.yaml b/library/ix-dev/community/freshrss/Chart.yaml
@@ -3,7 +3,7 @@ description: FreshRSS is a free, self-hostable news aggregator
 annotations:
   title: FreshRSS
 type: application
-version: 1.0.3
+version: 1.1.0
 apiVersion: v2
 appVersion: 1.22.1
 kubeVersion: '>=1.16.0-0'
@@ -14,7 +14,7 @@ maintainers:
 dependencies:
   - name: common
     repository: file://../../../common
-    version: 1.2.2
+    version: 1.2.3
 home: https://freshrss.org/
 icon: https://media.sys.truenas.net/apps/freshrss/icons/icon.png
 sources:

diff --git a/library/ix-dev/community/freshrss/charts/common-1.2.2.tgz b/library/ix-dev/community/freshrss/charts/common-1.2.2.tgz
diff --git a/library/ix-dev/community/freshrss/charts/common-1.2.3.tgz b/library/ix-dev/community/freshrss/charts/common-1.2.3.tgz
diff --git a/library/ix-dev/community/freshrss/migrations/migrate b/library/ix-dev/community/freshrss/migrations/migrate
@@ -0,0 +1,73 @@
+#!/usr/bin/python3
+import json
+import os
+import sys
+
+
+def storage_migrate(storage):
+    delete_keys = []
+    if storage['type'] == 'hostPath':
+        # Check if the key exists, if not we have already migrated
+        if not storage.get('hostPath'):
+            return storage
+
+        storage['hostPathConfig'] = {'hostPath': storage['hostPath']}
+        delete_keys.append('hostPath')
+
+    elif storage['type'] == 'ixVolume':
+        # Check if the key exists, if not we have already migrated
+        if not storage.get('datasetName'):
+            return storage
+
+        storage['ixVolumeConfig'] = {'datasetName': storage['datasetName']}
+        delete_keys.append('datasetName')
+
+    elif storage['type'] == 'smb-pv-pvc':
+        # Check if the key exists, if not we have already migrated
+        if not storage.get('server'):
+            return storage
+
+        storage['smbConfig'] = {
+            'server': storage['server'],
+            'share': storage['share'],
+            'domain': storage['domain'],
+            'username': storage['username'],
+            'password': storage['password'],
+            'size': storage['size'],
+        }
+        delete_keys.extend(['server', 'share', 'domain', 'username', 'password', 'size'])
+
+    for key in delete_keys:
+        storage.pop(key, None)
+
+    return storage
+
+
+def migrate(values):
+    storage_key = 'freshrssStorage'
+    storages = ['data', 'extensions', 'pgData', 'pgBackup']
+
+    for storage in storages:
+        check_val = values.get(storage_key, {}).get(storage, {})
+        if not isinstance(check_val, dict) or not check_val:
+            raise Exception(f'Storage section {storage} is malformed')
+
+        values[storage_key][storage] = storage_migrate(check_val)
+
+    additionalStorages = values.get(storage_key, {}).get('additionalStorages', [])
+    for idx, storage in enumerate(additionalStorages):
+        if not isinstance(storage, dict) or not storage:
+            raise Exception(f'Item {idx} in additionalStorages is malformed')
+
+        values[storage_key]['additionalStorages'][idx] = storage_migrate(storage)
+
+    return values
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 2:
+        exit(1)
+
+    if os.path.exists(sys.argv[1]):
+        with open(sys.argv[1], 'r') as f:
+            print(json.dumps(migrate(json.loads(f.read()))))
diff --git a/library/ix-dev/community/freshrss/questions.yaml b/library/ix-dev/community/freshrss/questions.yaml
diff --git a/library/ix-dev/community/freshrss/templates/_persistence.tpl b/library/ix-dev/community/freshrss/templates/_persistence.tpl
@@ -2,9 +2,7 @@
 persistence:
   data:
     enabled: true
-    type: {{ .Values.freshrssStorage.data.type }}
-    datasetName: {{ .Values.freshrssStorage.data.datasetName | default "" }}
-    hostPath: {{ .Values.freshrssStorage.data.hostPath | default "" }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.freshrssStorage.data) | nindent 4 }}
     targetSelector:
       freshrss:
         freshrss:
@@ -14,9 +12,7 @@ persistence:
           mountPath: /var/www/FreshRSS/data
   extensions:
     enabled: true
-    type: {{ .Values.freshrssStorage.extensions.type }}
-    datasetName: {{ .Values.freshrssStorage.extensions.datasetName | default "" }}
-    hostPath: {{ .Values.freshrssStorage.extensions.hostPath | default "" }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.freshrssStorage.extensions) | nindent 4 }}
     targetSelector:
       freshrss:
         freshrss:
@@ -35,25 +31,9 @@ persistence:
         freshrss:
           mountPath: /tmp
   {{- range $idx, $storage := .Values.freshrssStorage.additionalStorages }}
-  {{ printf "freshrss-%v" (int $idx) }}:
-    {{- $size := "" -}}
-    {{- if $storage.size -}}
-      {{- $size = (printf "%vGi" $storage.size) -}}
-    {{- end }}
+  {{ printf "freshrss-%v:" (int $idx) }}
     enabled: true
-    type: {{ $storage.type }}
-    datasetName: {{ $storage.datasetName | default "" }}
-    hostPath: {{ $storage.hostPath | default "" }}
-    server: {{ $storage.server | default "" }}
-    share: {{ $storage.share | default "" }}
-    domain: {{ $storage.domain | default "" }}
-    username: {{ $storage.username | default "" }}
-    password: {{ $storage.password | default "" }}
-    size: {{ $size }}
-    {{- if eq $storage.type "smb-pv-pvc" }}
-    mountOptions:
-      - key: noperm
-    {{- end }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }}
     targetSelector:
       freshrss:
         freshrss:
@@ -63,7 +43,6 @@ persistence:
           mountPath: {{ $storage.mountPath }}
   {{- end }}
 
-
   {{- include "ix.v1.common.app.postgresPersistence"
       (dict "pgData" .Values.freshrssStorage.pgData
             "pgBackup" .Values.freshrssStorage.pgBackup

diff --git a/library/ix-dev/community/freshrss/values.yaml b/library/ix-dev/community/freshrss/values.yaml
@@ -23,17 +23,21 @@ freshrssNetwork:
 freshrssStorage:
   data:
     type: ixVolume
-    datasetName: data
+    ixVolumeConfig:
+      datasetName: data
   extensions:
     type: ixVolume
-    datasetName: extensions
+    ixVolumeConfig:
+      datasetName: extensions
   additionalStorages: []
   pgData:
     type: ixVolume
-    datasetName: pgData
+    ixVolumeConfig:
+      datasetName: pgData
   pgBackup:
     type: ixVolume
-    datasetName: pgBackup
+    ixVolumeConfig:
+      datasetName: pgBackup
 
 notes:
   custom: |