From f9f80965360c76e71ac82f471871c014b5ddd858 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Sun, 24 Dec 2023 21:05:21 +0000 Subject: [PATCH] Publish new changes in catalog --- community/homepage/1.1.8/ci/basic-values.yaml | 7 - .../homepage/1.1.8/templates/_persistence.tpl | 48 ---- .../homepage/{1.1.8 => 1.2.0}/Chart.lock | 0 .../homepage/{1.1.8 => 1.2.0}/Chart.yaml | 2 +- community/homepage/{1.1.8 => 1.2.0}/README.md | 0 .../homepage/{1.1.8 => 1.2.0}/app-readme.md | 0 .../{1.1.8 => 1.2.0}/charts/common-1.2.5.tgz | Bin community/homepage/1.2.0/ci/basic-values.yaml | 6 + .../{1.1.8 => 1.2.0}/ci/extra-values.yaml | 9 +- .../{1.1.8 => 1.2.0}/ci/hostNet-values.yaml | 3 +- .../homepage/{1.1.8 => 1.2.0}/ix_values.yaml | 3 +- .../homepage/{1.1.8 => 1.2.0}/metadata.yaml | 0 community/homepage/1.2.0/migrations/migrate | 73 ++++++ .../homepage/{1.1.8 => 1.2.0}/questions.yaml | 216 ++++++++++++------ .../{1.1.8 => 1.2.0}/templates/NOTES.txt | 0 .../{1.1.8 => 1.2.0}/templates/_homepage.tpl | 2 +- .../homepage/1.2.0/templates/_persistence.tpl | 47 ++++ .../{1.1.8 => 1.2.0}/templates/_portal.tpl | 0 .../{1.1.8 => 1.2.0}/templates/_rbac.tpl | 0 .../{1.1.8 => 1.2.0}/templates/_service.tpl | 0 .../{1.1.8 => 1.2.0}/templates/common.yaml | 0 21 files changed, 285 insertions(+), 131 deletions(-) delete mode 100644 community/homepage/1.1.8/ci/basic-values.yaml delete mode 100644 community/homepage/1.1.8/templates/_persistence.tpl rename community/homepage/{1.1.8 => 1.2.0}/Chart.lock (100%) rename community/homepage/{1.1.8 => 1.2.0}/Chart.yaml (97%) rename community/homepage/{1.1.8 => 1.2.0}/README.md (100%) rename community/homepage/{1.1.8 => 1.2.0}/app-readme.md (100%) rename community/homepage/{1.1.8 => 1.2.0}/charts/common-1.2.5.tgz (100%) create mode 100644 community/homepage/1.2.0/ci/basic-values.yaml rename community/homepage/{1.1.8 => 1.2.0}/ci/extra-values.yaml (57%) rename community/homepage/{1.1.8 => 1.2.0}/ci/hostNet-values.yaml (53%) rename community/homepage/{1.1.8 => 1.2.0}/ix_values.yaml (87%) rename community/homepage/{1.1.8 => 1.2.0}/metadata.yaml (100%) create mode 100755 community/homepage/1.2.0/migrations/migrate rename community/homepage/{1.1.8 => 1.2.0}/questions.yaml (54%) rename community/homepage/{1.1.8 => 1.2.0}/templates/NOTES.txt (100%) rename community/homepage/{1.1.8 => 1.2.0}/templates/_homepage.tpl (98%) create mode 100644 community/homepage/1.2.0/templates/_persistence.tpl rename community/homepage/{1.1.8 => 1.2.0}/templates/_portal.tpl (100%) rename community/homepage/{1.1.8 => 1.2.0}/templates/_rbac.tpl (100%) rename community/homepage/{1.1.8 => 1.2.0}/templates/_service.tpl (100%) rename community/homepage/{1.1.8 => 1.2.0}/templates/common.yaml (100%) diff --git a/community/homepage/1.1.8/ci/basic-values.yaml b/community/homepage/1.1.8/ci/basic-values.yaml deleted file mode 100644 index 129b0d45fc..0000000000 --- a/community/homepage/1.1.8/ci/basic-values.yaml +++ /dev/null @@ -1,7 +0,0 @@ -homepageNetwork: - webPort: 31000 - -homepageStorage: - config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config diff --git a/community/homepage/1.1.8/templates/_persistence.tpl b/community/homepage/1.1.8/templates/_persistence.tpl deleted file mode 100644 index c61fd61c7b..0000000000 --- a/community/homepage/1.1.8/templates/_persistence.tpl +++ /dev/null @@ -1,48 +0,0 @@ -{{- define "homepage.persistence" -}} -persistence: - config: - enabled: true - type: {{ .Values.homepageStorage.config.type }} - datasetName: {{ .Values.homepageStorage.config.datasetName | default "" }} - hostPath: {{ .Values.homepageStorage.config.hostPath | default "" }} - targetSelector: - homepage: - homepage: - mountPath: /app/config - 01-permissions: - mountPath: /mnt/directories/config - tmp: - enabled: true - type: emptyDir - targetSelector: - homepage: - homepage: - mountPath: /tmp - {{- range $idx, $storage := .Values.homepageStorage.additionalStorages }} - {{ printf "homepage-%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 }} - targetSelector: - homepage: - homepage: - mountPath: {{ $storage.mountPath }} - 01-permissions: - mountPath: /mnt/directories{{ $storage.mountPath }} - {{- end }} -{{- end -}} diff --git a/community/homepage/1.1.8/Chart.lock b/community/homepage/1.2.0/Chart.lock similarity index 100% rename from community/homepage/1.1.8/Chart.lock rename to community/homepage/1.2.0/Chart.lock diff --git a/community/homepage/1.1.8/Chart.yaml b/community/homepage/1.2.0/Chart.yaml similarity index 97% rename from community/homepage/1.1.8/Chart.yaml rename to community/homepage/1.2.0/Chart.yaml index f0755cae70..45163db105 100644 --- a/community/homepage/1.1.8/Chart.yaml +++ b/community/homepage/1.2.0/Chart.yaml @@ -3,7 +3,7 @@ description: Homepage is a modern, secure, highly customizable application dashb annotations: title: Homepage type: application -version: 1.1.8 +version: 1.2.0 apiVersion: v2 appVersion: 0.8.3 kubeVersion: '>=1.16.0-0' diff --git a/community/homepage/1.1.8/README.md b/community/homepage/1.2.0/README.md similarity index 100% rename from community/homepage/1.1.8/README.md rename to community/homepage/1.2.0/README.md diff --git a/community/homepage/1.1.8/app-readme.md b/community/homepage/1.2.0/app-readme.md similarity index 100% rename from community/homepage/1.1.8/app-readme.md rename to community/homepage/1.2.0/app-readme.md diff --git a/community/homepage/1.1.8/charts/common-1.2.5.tgz b/community/homepage/1.2.0/charts/common-1.2.5.tgz similarity index 100% rename from community/homepage/1.1.8/charts/common-1.2.5.tgz rename to community/homepage/1.2.0/charts/common-1.2.5.tgz diff --git a/community/homepage/1.2.0/ci/basic-values.yaml b/community/homepage/1.2.0/ci/basic-values.yaml new file mode 100644 index 0000000000..dcb8797549 --- /dev/null +++ b/community/homepage/1.2.0/ci/basic-values.yaml @@ -0,0 +1,6 @@ +homepageNetwork: + webPort: 31000 + +homepageStorage: + config: + type: pvc diff --git a/community/homepage/1.1.8/ci/extra-values.yaml b/community/homepage/1.2.0/ci/extra-values.yaml similarity index 57% rename from community/homepage/1.1.8/ci/extra-values.yaml rename to community/homepage/1.2.0/ci/extra-values.yaml index 9c1442600e..3f0aa8cabd 100644 --- a/community/homepage/1.1.8/ci/extra-values.yaml +++ b/community/homepage/1.2.0/ci/extra-values.yaml @@ -10,12 +10,9 @@ homepageNetwork: homepageStorage: config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config + type: pvc additionalStorages: - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data1 + - type: pvc mountPath: /data1 - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data2 + - type: pvc mountPath: /data2 diff --git a/community/homepage/1.1.8/ci/hostNet-values.yaml b/community/homepage/1.2.0/ci/hostNet-values.yaml similarity index 53% rename from community/homepage/1.1.8/ci/hostNet-values.yaml rename to community/homepage/1.2.0/ci/hostNet-values.yaml index f0c4e669b5..fff1c18e19 100644 --- a/community/homepage/1.1.8/ci/hostNet-values.yaml +++ b/community/homepage/1.2.0/ci/hostNet-values.yaml @@ -4,5 +4,4 @@ homepageNetwork: homepageStorage: config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config + type: pvc diff --git a/community/homepage/1.1.8/ix_values.yaml b/community/homepage/1.2.0/ix_values.yaml similarity index 87% rename from community/homepage/1.1.8/ix_values.yaml rename to community/homepage/1.2.0/ix_values.yaml index 9daa8d6a91..60d0ec6be0 100644 --- a/community/homepage/1.1.8/ix_values.yaml +++ b/community/homepage/1.2.0/ix_values.yaml @@ -18,5 +18,6 @@ homepageNetwork: homepageStorage: config: type: ixVolume - datasetName: config + ixVolumeConfig: + datasetName: config additionalStorages: [] diff --git a/community/homepage/1.1.8/metadata.yaml b/community/homepage/1.2.0/metadata.yaml similarity index 100% rename from community/homepage/1.1.8/metadata.yaml rename to community/homepage/1.2.0/metadata.yaml diff --git a/community/homepage/1.2.0/migrations/migrate b/community/homepage/1.2.0/migrations/migrate new file mode 100755 index 0000000000..d84638fce3 --- /dev/null +++ b/community/homepage/1.2.0/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 = 'homepageStorage' + storages = ['config'] + + 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/community/homepage/1.1.8/questions.yaml b/community/homepage/1.2.0/questions.yaml similarity index 54% rename from community/homepage/1.1.8/questions.yaml rename to community/homepage/1.2.0/questions.yaml index 455f32452c..2d39c51549 100644 --- a/community/homepage/1.1.8/questions.yaml +++ b/community/homepage/1.2.0/questions.yaml @@ -98,23 +98,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: "config" $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: "config" + - 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 Homepage. @@ -145,74 +186,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/community/homepage/1.1.8/templates/NOTES.txt b/community/homepage/1.2.0/templates/NOTES.txt similarity index 100% rename from community/homepage/1.1.8/templates/NOTES.txt rename to community/homepage/1.2.0/templates/NOTES.txt diff --git a/community/homepage/1.1.8/templates/_homepage.tpl b/community/homepage/1.2.0/templates/_homepage.tpl similarity index 98% rename from community/homepage/1.1.8/templates/_homepage.tpl rename to community/homepage/1.2.0/templates/_homepage.tpl index 68ddaa7139..6280aa4989 100644 --- a/community/homepage/1.1.8/templates/_homepage.tpl +++ b/community/homepage/1.2.0/templates/_homepage.tpl @@ -47,5 +47,5 @@ workload: "UID" 1000 "GID" 1000 "mode" "check" - "type" "init") | nindent 8 }} + "type" "install") | nindent 8 }} {{- end -}} diff --git a/community/homepage/1.2.0/templates/_persistence.tpl b/community/homepage/1.2.0/templates/_persistence.tpl new file mode 100644 index 0000000000..8719398ac1 --- /dev/null +++ b/community/homepage/1.2.0/templates/_persistence.tpl @@ -0,0 +1,47 @@ +{{- define "homepage.persistence" -}} +persistence: + config: + enabled: true + {{- include "homepage.storage.ci.migration" (dict "storage" .Values.homepageStorage.config) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.homepageStorage.config) | nindent 4 }} + targetSelector: + homepage: + homepage: + mountPath: /app/config + {{- if and (eq .Values.homepageStorage.config.type "ixVolume") + (not (.Values.homepageStorage.config.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories/config + {{- end }} + tmp: + enabled: true + type: emptyDir + targetSelector: + homepage: + homepage: + mountPath: /tmp + {{- range $idx, $storage := .Values.homepageStorage.additionalStorages }} + {{ printf "homepage-%v:" (int $idx) }} + enabled: true + {{- include "homepage.storage.ci.migration" (dict "storage" $storage) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} + targetSelector: + homepage: + homepage: + mountPath: {{ $storage.mountPath }} + {{- if and (eq $storage.type "ixVolume") (not ($storage.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories{{ $storage.mountPath }} + {{- end }} + {{- end }} +{{- end -}} + +{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}} +{{- define "homepage.storage.ci.migration" -}} + {{- $storage := .storage -}} + + {{- if $storage.hostPath -}} + {{- $_ := set $storage "hostPathConfig" dict -}} + {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}} + {{- end -}} +{{- end -}} diff --git a/community/homepage/1.1.8/templates/_portal.tpl b/community/homepage/1.2.0/templates/_portal.tpl similarity index 100% rename from community/homepage/1.1.8/templates/_portal.tpl rename to community/homepage/1.2.0/templates/_portal.tpl diff --git a/community/homepage/1.1.8/templates/_rbac.tpl b/community/homepage/1.2.0/templates/_rbac.tpl similarity index 100% rename from community/homepage/1.1.8/templates/_rbac.tpl rename to community/homepage/1.2.0/templates/_rbac.tpl diff --git a/community/homepage/1.1.8/templates/_service.tpl b/community/homepage/1.2.0/templates/_service.tpl similarity index 100% rename from community/homepage/1.1.8/templates/_service.tpl rename to community/homepage/1.2.0/templates/_service.tpl diff --git a/community/homepage/1.1.8/templates/common.yaml b/community/homepage/1.2.0/templates/common.yaml similarity index 100% rename from community/homepage/1.1.8/templates/common.yaml rename to community/homepage/1.2.0/templates/common.yaml