fix migration and helpers

truenas · Jul 23, 2024 · 8ece40f · 8ece40f
1 parent e1cd3d1
commit 8ece40f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ix-dev/charts/plex/migrations/migrate_from_kubernetes b/ix-dev/charts/plex/migrations/migrate_from_kubernetes
@@ -37,7 +37,7 @@ def migrate(values):
             "logs": migrate_storage_item(config["plexStorage"]["logs"]),
             "transcode": migrate_storage_item(config["plexStorage"]["transcode"]),
             "additional_storage": [
-                migrate_storage_item(item)
+                migrate_storage_item(item, include_read_only=True)
                 for item in config["plexStorage"]["additionalStorages"]
             ],
         },

diff --git a/ix-dev/charts/plex/migrations/migration_helpers/memory.py b/ix-dev/charts/plex/migrations/migration_helpers/memory.py
@@ -44,5 +44,6 @@ def transform_memory(memory):
 
     result = math.ceil(result)
     result = min(result, TOTAL_MEM)
+    # Convert to Megabytes
     result = result / 1024 / 1024
-    return f"{int(result)}M"
+    return int(result)
diff --git a/ix-dev/charts/plex/migrations/migration_helpers/storage.py b/ix-dev/charts/plex/migrations/migration_helpers/storage.py
@@ -1,4 +1,4 @@
-def migrate_storage_item(storage_item):
+def migrate_storage_item(storage_item, include_read_only=False):
     if not storage_item:
         raise ValueError("Expected [storage_item] to be set")
 
@@ -16,7 +16,8 @@ def migrate_storage_item(storage_item):
     if mount_path:
         result.update({"mount_path": mount_path})
 
-    result.update({"read_only": storage_item.get("readOnly", False)})
+    if include_read_only:
+        result.update({"read_only": storage_item.get("readOnly", False)})
     return result