mirror of
https://github.com/truenas/charts.git
synced 2026-04-05 11:48:55 +08:00
Minecraft - migrate storage section (adds acl) (#1960)
* update values * update template * bump version and common * update ui * add migration * typo
This commit is contained in:
Stavros Kois
@@ -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"
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mcStorage:
|
||||
data:
|
||||
type: hostPath
|
||||
hostPath: /mnt/{{ .Release.Name }}/data
|
||||
type: pvc
|
||||
|
||||
mcConfig:
|
||||
imageSelector: j11j9Image
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mcStorage:
|
||||
data:
|
||||
type: hostPath
|
||||
hostPath: /mnt/{{ .Release.Name }}/data
|
||||
type: pvc
|
||||
|
||||
mcConfig:
|
||||
imageSelector: j11jdkImage
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mcStorage:
|
||||
data:
|
||||
type: hostPath
|
||||
hostPath: /mnt/{{ .Release.Name }}/data
|
||||
type: pvc
|
||||
|
||||
mcConfig:
|
||||
imageSelector: j11Image
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mcStorage:
|
||||
data:
|
||||
type: hostPath
|
||||
hostPath: /mnt/{{ .Release.Name }}/data
|
||||
type: pvc
|
||||
|
||||
mcConfig:
|
||||
imageSelector: j17alpineImage
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mcStorage:
|
||||
data:
|
||||
type: hostPath
|
||||
hostPath: /mnt/{{ .Release.Name }}/data
|
||||
type: pvc
|
||||
|
||||
mcConfig:
|
||||
imageSelector: j17gceImage
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mcStorage:
|
||||
data:
|
||||
type: hostPath
|
||||
hostPath: /mnt/{{ .Release.Name }}/data
|
||||
type: pvc
|
||||
|
||||
mcConfig:
|
||||
imageSelector: j17j9Image
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mcStorage:
|
||||
data:
|
||||
type: hostPath
|
||||
hostPath: /mnt/{{ .Release.Name }}/data
|
||||
type: pvc
|
||||
|
||||
mcConfig:
|
||||
imageSelector: j17jdkImage
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mcStorage:
|
||||
data:
|
||||
type: hostPath
|
||||
hostPath: /mnt/{{ .Release.Name }}/data
|
||||
type: pvc
|
||||
|
||||
mcConfig:
|
||||
imageSelector: j17Image
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mcStorage:
|
||||
data:
|
||||
type: hostPath
|
||||
hostPath: /mnt/{{ .Release.Name }}/data
|
||||
type: pvc
|
||||
|
||||
mcConfig:
|
||||
imageSelector: j19Image
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mcStorage:
|
||||
data:
|
||||
type: hostPath
|
||||
hostPath: /mnt/{{ .Release.Name }}/data
|
||||
type: pvc
|
||||
|
||||
mcConfig:
|
||||
imageSelector: j8gceImage
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mcStorage:
|
||||
data:
|
||||
type: hostPath
|
||||
hostPath: /mnt/{{ .Release.Name }}/data
|
||||
type: pvc
|
||||
|
||||
mcConfig:
|
||||
imageSelector: j8j9Image
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mcStorage:
|
||||
data:
|
||||
type: hostPath
|
||||
hostPath: /mnt/{{ .Release.Name }}/data
|
||||
type: pvc
|
||||
|
||||
mcConfig:
|
||||
imageSelector: j8jdkImage
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
mcStorage:
|
||||
data:
|
||||
type: hostPath
|
||||
hostPath: /mnt/{{ .Release.Name }}/data
|
||||
type: pvc
|
||||
|
||||
mcConfig:
|
||||
imageSelector: j8Image
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 -}}
|
||||
|
||||
@@ -100,5 +100,6 @@ mcNetwork:
|
||||
mcStorage:
|
||||
data:
|
||||
type: ixVolume
|
||||
datasetName: data
|
||||
ixVolumeConfig:
|
||||
datasetName: data
|
||||
additionalStorages: []
|
||||
|
||||
Reference in New Issue
Block a user