From 75000ccb0e4ec3f455f0c0774274f28e5eb90b8a Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Thu, 28 Dec 2023 14:45:30 +0200
Subject: [PATCH] Minecraft - migrate storage section (adds acl) (#1960)

* update values

* update template

* bump version and common

* update ui

* add migration

* typo
---
 library/ix-dev/community/minecraft/Chart.lock |   2 +-
 library/ix-dev/community/minecraft/Chart.yaml |   2 +-
 .../ci/java11-j9-vanilla-values.yaml          |   3 +-
 .../ci/java11-jdk-vanilla-values.yaml         |   3 +-
 .../minecraft/ci/java11-vanilla-values.yaml   |   3 +-
 .../ci/java17-alpine-vanilla-values.yaml      |   3 +-
 .../ci/java17-gce-vanilla-values.yaml         |   3 +-
 .../ci/java17-j9-vanilla-values.yaml          |   3 +-
 .../ci/java17-jdk-vanilla-values.yaml         |   3 +-
 .../minecraft/ci/java17-vanilla-values.yaml   |   3 +-
 .../minecraft/ci/java19-vanilla-values.yaml   |   3 +-
 .../ci/java8-gce-vanilla-values.yaml          |   3 +-
 .../minecraft/ci/java8-j9-vanilla-values.yaml |   3 +-
 .../ci/java8-jdk-vanilla-values.yaml          |   3 +-
 .../minecraft/ci/java8-vanilla-values.yaml    |   3 +-
 .../community/minecraft/migrations/migrate    |  40 +++-
 .../ix-dev/community/minecraft/questions.yaml | 216 ++++++++++++------
 .../minecraft/templates/_minecraft.tpl        |  34 ++-
 .../ix-dev/community/minecraft/values.yaml    |   3 +-
 19 files changed, 215 insertions(+), 121 deletions(-)

diff --git a/library/ix-dev/community/minecraft/Chart.lock b/library/ix-dev/community/minecraft/Chart.lock
index e471c8933d..e8a054cc99 100644
--- a/library/ix-dev/community/minecraft/Chart.lock
+++ b/library/ix-dev/community/minecraft/Chart.lock
@@ -3,4 +3,4 @@ dependencies:
   repository: file://../../../common
   version: 1.2.6
 digest: sha256:956cef64e364b567d2e5327a00e60b68f3ef765e003d6c35afc143bb81ecc26b
-generated: "2023-12-27T13:13:57.342276092+02:00"
+generated: "2023-12-27T14:51:29.604803794+02:00"
diff --git a/library/ix-dev/community/minecraft/Chart.yaml b/library/ix-dev/community/minecraft/Chart.yaml
index 297caa722b..16a40aa0d4 100644
--- a/library/ix-dev/community/minecraft/Chart.yaml
+++ b/library/ix-dev/community/minecraft/Chart.yaml
@@ -3,7 +3,7 @@ description: Minecraft is a sandbox game
 annotations:
   title: Minecraft
 type: application
-version: 1.1.12
+version: 1.2.0
 apiVersion: v2
 appVersion: 2023.12.2
 kubeVersion: '>=1.16.0-0'
diff --git a/library/ix-dev/community/minecraft/ci/java11-j9-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java11-j9-vanilla-values.yaml
index 97b90f4323..0d3fb3fd86 100644
--- a/library/ix-dev/community/minecraft/ci/java11-j9-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java11-j9-vanilla-values.yaml
@@ -1,7 +1,6 @@
 mcStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
 
 mcConfig:
   imageSelector: j11j9Image
diff --git a/library/ix-dev/community/minecraft/ci/java11-jdk-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java11-jdk-vanilla-values.yaml
index 9e896e09c7..bf95aaf4be 100644
--- a/library/ix-dev/community/minecraft/ci/java11-jdk-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java11-jdk-vanilla-values.yaml
@@ -1,7 +1,6 @@
 mcStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
 
 mcConfig:
   imageSelector: j11jdkImage
diff --git a/library/ix-dev/community/minecraft/ci/java11-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java11-vanilla-values.yaml
index 1276ee6396..3e4b420983 100644
--- a/library/ix-dev/community/minecraft/ci/java11-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java11-vanilla-values.yaml
@@ -1,7 +1,6 @@
 mcStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
 
 mcConfig:
   imageSelector: j11Image
diff --git a/library/ix-dev/community/minecraft/ci/java17-alpine-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java17-alpine-vanilla-values.yaml
index 409ffca067..4a7a1e0628 100644
--- a/library/ix-dev/community/minecraft/ci/java17-alpine-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java17-alpine-vanilla-values.yaml
@@ -1,7 +1,6 @@
 mcStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
 
 mcConfig:
   imageSelector: j17alpineImage
diff --git a/library/ix-dev/community/minecraft/ci/java17-gce-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java17-gce-vanilla-values.yaml
index 00a714f2e7..2b0c894941 100644
--- a/library/ix-dev/community/minecraft/ci/java17-gce-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java17-gce-vanilla-values.yaml
@@ -1,7 +1,6 @@
 mcStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
 
 mcConfig:
   imageSelector: j17gceImage
diff --git a/library/ix-dev/community/minecraft/ci/java17-j9-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java17-j9-vanilla-values.yaml
index 4afafbd103..afdd1628f4 100644
--- a/library/ix-dev/community/minecraft/ci/java17-j9-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java17-j9-vanilla-values.yaml
@@ -1,7 +1,6 @@
 mcStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
 
 mcConfig:
   imageSelector: j17j9Image
diff --git a/library/ix-dev/community/minecraft/ci/java17-jdk-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java17-jdk-vanilla-values.yaml
index c492641b95..b16af57e30 100644
--- a/library/ix-dev/community/minecraft/ci/java17-jdk-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java17-jdk-vanilla-values.yaml
@@ -1,7 +1,6 @@
 mcStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
 
 mcConfig:
   imageSelector: j17jdkImage
diff --git a/library/ix-dev/community/minecraft/ci/java17-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java17-vanilla-values.yaml
index 83a78dfc4f..e58967841c 100644
--- a/library/ix-dev/community/minecraft/ci/java17-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java17-vanilla-values.yaml
@@ -1,7 +1,6 @@
 mcStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
 
 mcConfig:
   imageSelector: j17Image
diff --git a/library/ix-dev/community/minecraft/ci/java19-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java19-vanilla-values.yaml
index 57bf24dcff..649c857e5d 100644
--- a/library/ix-dev/community/minecraft/ci/java19-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java19-vanilla-values.yaml
@@ -1,7 +1,6 @@
 mcStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
 
 mcConfig:
   imageSelector: j19Image
diff --git a/library/ix-dev/community/minecraft/ci/java8-gce-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java8-gce-vanilla-values.yaml
index 0720055c9d..572cf86c47 100644
--- a/library/ix-dev/community/minecraft/ci/java8-gce-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java8-gce-vanilla-values.yaml
@@ -1,7 +1,6 @@
 mcStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
 
 mcConfig:
   imageSelector: j8gceImage
diff --git a/library/ix-dev/community/minecraft/ci/java8-j9-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java8-j9-vanilla-values.yaml
index 88f87e9906..b3aab9577f 100644
--- a/library/ix-dev/community/minecraft/ci/java8-j9-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java8-j9-vanilla-values.yaml
@@ -1,7 +1,6 @@
 mcStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
 
 mcConfig:
   imageSelector: j8j9Image
diff --git a/library/ix-dev/community/minecraft/ci/java8-jdk-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java8-jdk-vanilla-values.yaml
index 7411c27ee2..807ba72e20 100644
--- a/library/ix-dev/community/minecraft/ci/java8-jdk-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java8-jdk-vanilla-values.yaml
@@ -1,7 +1,6 @@
 mcStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
 
 mcConfig:
   imageSelector: j8jdkImage
diff --git a/library/ix-dev/community/minecraft/ci/java8-vanilla-values.yaml b/library/ix-dev/community/minecraft/ci/java8-vanilla-values.yaml
index a620ca759c..c6d2b6525e 100644
--- a/library/ix-dev/community/minecraft/ci/java8-vanilla-values.yaml
+++ b/library/ix-dev/community/minecraft/ci/java8-vanilla-values.yaml
@@ -1,7 +1,6 @@
 mcStorage:
   data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
+    type: pvc
 
 mcConfig:
   imageSelector: j8Image
diff --git a/library/ix-dev/community/minecraft/migrations/migrate b/library/ix-dev/community/minecraft/migrations/migrate
index ee8ecdfeec..c4c42955a4 100755
--- a/library/ix-dev/community/minecraft/migrations/migrate
+++ b/library/ix-dev/community/minecraft/migrations/migrate
@@ -4,18 +4,44 @@ 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')
+
+    for key in delete_keys:
+        storage.pop(key, None)
+
+    return storage
+
+
 def migrate(values):
-    storageKey = 'mcStorage'
+    storage_key = 'mcStorage'
     storages = ['data']
 
-
     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'}
+        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)
 
     return values
 
diff --git a/library/ix-dev/community/minecraft/questions.yaml b/library/ix-dev/community/minecraft/questions.yaml
index e5f14046d7..e440bd8c1c 100644
--- a/library/ix-dev/community/minecraft/questions.yaml
+++ b/library/ix-dev/community/minecraft/questions.yaml
@@ -545,23 +545,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 Minecraft.
@@ -592,74 +633,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
diff --git a/library/ix-dev/community/minecraft/templates/_minecraft.tpl b/library/ix-dev/community/minecraft/templates/_minecraft.tpl
index f523cafa50..a0e567c4b7 100644
--- a/library/ix-dev/community/minecraft/templates/_minecraft.tpl
+++ b/library/ix-dev/community/minecraft/templates/_minecraft.tpl
@@ -77,36 +77,30 @@ service:
 persistence:
   data:
     enabled: true
-    type: {{ .Values.mcStorage.data.type }}
-    datasetName: {{ .Values.mcStorage.data.datasetName | default "" }}
-    hostPath: {{ .Values.mcStorage.data.hostPath | default "" }}
+    {{- include "minecraft.storage.ci.migration" (dict "storage" .Values.mcStorage.data) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.mcStorage.data) | nindent 4 }}
     targetSelector:
       minecraft:
         minecraft:
           mountPath: /data
   {{- range $idx, $storage := .Values.mcStorage.additionalStorages }}
   {{ printf "mc-%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 "minecraft.storage.ci.migration" (dict "storage" $storage) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }}
     targetSelector:
       minecraft:
         minecraft:
           mountPath: {{ $storage.mountPath }}
   {{- end }}
 {{- end -}}
+
+{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}}
+{{- define "minecraft.storage.ci.migration" -}}
+  {{- $storage := .storage -}}
+
+  {{- if $storage.hostPath -}}
+    {{- $_ := set $storage "hostPathConfig" dict -}}
+    {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}}
+  {{- end -}}
+{{- end -}}
diff --git a/library/ix-dev/community/minecraft/values.yaml b/library/ix-dev/community/minecraft/values.yaml
index 7cac9ec746..bfe9ac28a1 100644
--- a/library/ix-dev/community/minecraft/values.yaml
+++ b/library/ix-dev/community/minecraft/values.yaml
@@ -100,5 +100,6 @@ mcNetwork:
 mcStorage:
   data:
     type: ixVolume
-    datasetName: data
+    ixVolumeConfig:
+      datasetName: data
   additionalStorages: []