From f96dc42ade84de74ddf3843cd12892d7b376e988 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Thu, 28 Dec 2023 12:10:58 +0200 Subject: [PATCH] Omada - migrate storage section (adds acl) (#1963) * update values * update template * add migration * update ui * bump version and common --- .../community/omada-controller/Chart.lock | 2 +- .../community/omada-controller/Chart.yaml | 2 +- .../omada-controller/ci/basic-values.yaml | 6 +- .../omada-controller/ci/hostNet-values.yaml | 6 +- .../omada-controller/ci/https-values.yaml | 6 +- .../omada-controller/migrations/migrate | 73 +++++ .../community/omada-controller/questions.yaml | 279 +++++++++++++----- .../templates/_persistence.tpl | 43 +-- .../community/omada-controller/values.yaml | 6 +- 9 files changed, 304 insertions(+), 119 deletions(-) create mode 100755 library/ix-dev/community/omada-controller/migrations/migrate diff --git a/library/ix-dev/community/omada-controller/Chart.lock b/library/ix-dev/community/omada-controller/Chart.lock index 857d0c7ab4..e826711139 100644 --- a/library/ix-dev/community/omada-controller/Chart.lock +++ b/library/ix-dev/community/omada-controller/Chart.lock @@ -3,4 +3,4 @@ dependencies: repository: file://../../../common version: 1.2.6 digest: sha256:956cef64e364b567d2e5327a00e60b68f3ef765e003d6c35afc143bb81ecc26b -generated: "2023-12-27T13:14:56.440579187+02:00" +generated: "2023-12-27T17:19:44.388361755+02:00" diff --git a/library/ix-dev/community/omada-controller/Chart.yaml b/library/ix-dev/community/omada-controller/Chart.yaml index d7723cda86..e7b76d5392 100644 --- a/library/ix-dev/community/omada-controller/Chart.yaml +++ b/library/ix-dev/community/omada-controller/Chart.yaml @@ -3,7 +3,7 @@ description: Omada Controller (TP-Link) is a network management controller for T annotations: title: Omada Controller type: application -version: 1.1.7 +version: 1.2.0 apiVersion: v2 appVersion: '5.13' kubeVersion: '>=1.16.0-0' diff --git a/library/ix-dev/community/omada-controller/ci/basic-values.yaml b/library/ix-dev/community/omada-controller/ci/basic-values.yaml index bfcb596086..840c5528a2 100644 --- a/library/ix-dev/community/omada-controller/ci/basic-values.yaml +++ b/library/ix-dev/community/omada-controller/ci/basic-values.yaml @@ -1,10 +1,8 @@ omadaStorage: data: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data + type: pvc logs: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/logs + type: pvc omadaID: user: 1001 diff --git a/library/ix-dev/community/omada-controller/ci/hostNet-values.yaml b/library/ix-dev/community/omada-controller/ci/hostNet-values.yaml index 7843698e57..8528140c75 100644 --- a/library/ix-dev/community/omada-controller/ci/hostNet-values.yaml +++ b/library/ix-dev/community/omada-controller/ci/hostNet-values.yaml @@ -1,10 +1,8 @@ omadaStorage: data: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data + type: pvc logs: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/logs + type: pvc omadaNetwork: hostNetwork: true diff --git a/library/ix-dev/community/omada-controller/ci/https-values.yaml b/library/ix-dev/community/omada-controller/ci/https-values.yaml index 0cea41f7ea..932c53f41c 100644 --- a/library/ix-dev/community/omada-controller/ci/https-values.yaml +++ b/library/ix-dev/community/omada-controller/ci/https-values.yaml @@ -1,10 +1,8 @@ omadaStorage: data: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data + type: pvc logs: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/logs + type: pvc # CI has a lower port rage of 30000 omadaNetwork: diff --git a/library/ix-dev/community/omada-controller/migrations/migrate b/library/ix-dev/community/omada-controller/migrations/migrate new file mode 100755 index 0000000000..18425c437d --- /dev/null +++ b/library/ix-dev/community/omada-controller/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 = 'omadaStorage' + storages = ['data', 'logs'] + + 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/omada-controller/questions.yaml b/library/ix-dev/community/omada-controller/questions.yaml index b5a0826698..7d132c9821 100644 --- a/library/ix-dev/community/omada-controller/questions.yaml +++ b/library/ix-dev/community/omada-controller/questions.yaml @@ -223,23 +223,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: logs label: Omada Controller Logs Storage description: The path to store Omada Controller Logs. @@ -261,23 +302,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: "logs" $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: "logs" + - 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 Omada Controller. @@ -308,74 +390,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/omada-controller/templates/_persistence.tpl b/library/ix-dev/community/omada-controller/templates/_persistence.tpl index fea8e65911..7ffc1d1681 100644 --- a/library/ix-dev/community/omada-controller/templates/_persistence.tpl +++ b/library/ix-dev/community/omada-controller/templates/_persistence.tpl @@ -2,26 +2,20 @@ persistence: data: enabled: true - type: {{ .Values.omadaStorage.data.type }} - datasetName: {{ .Values.omadaStorage.data.datasetName | default "" }} - hostPath: {{ .Values.omadaStorage.data.hostPath | default "" }} + {{- include "omada.storage.ci.migration" (dict "storage" .Values.omadaStorage.data) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.omadaStorage.data) | nindent 4 }} targetSelector: omada: omada: mountPath: /opt/tplink/EAPController/data - 01-permissions: - mountPath: /mnt/directories/data logs: enabled: true - type: {{ .Values.omadaStorage.logs.type }} - datasetName: {{ .Values.omadaStorage.logs.datasetName | default "" }} - hostPath: {{ .Values.omadaStorage.logs.hostPath | default "" }} + {{- include "omada.storage.ci.migration" (dict "storage" .Values.omadaStorage.logs) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.omadaStorage.logs) | nindent 4 }} targetSelector: omada: omada: mountPath: /opt/tplink/EAPController/logs - 01-permissions: - mountPath: /mnt/directories/logs tmp: enabled: true type: emptyDir @@ -31,24 +25,9 @@ persistence: mountPath: /tmp {{- range $idx, $storage := .Values.omadaStorage.additionalStorages }} {{ printf "omada-%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 "omada.storage.ci.migration" (dict "storage" $storage) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} targetSelector: omada: omada: @@ -80,3 +59,13 @@ scaleCertificate: id: {{ .Values.omadaNetwork.certificateID }} {{- end -}} {{- end -}} + +{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}} +{{- define "omada.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/omada-controller/values.yaml b/library/ix-dev/community/omada-controller/values.yaml index 34ca3abd3c..4f6198aa88 100644 --- a/library/ix-dev/community/omada-controller/values.yaml +++ b/library/ix-dev/community/omada-controller/values.yaml @@ -32,8 +32,10 @@ omadaNetwork: omadaStorage: data: type: ixVolume - datasetName: data + ixVolumeConfig: + datasetName: data logs: type: ixVolume - datasetName: logs + ixVolumeConfig: + datasetName: logs additionalStorages: []