From dd4ce06bfc4a02885fb5c9ff2456789adc3e4187 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Fri, 29 Dec 2023 12:35:55 +0000 Subject: [PATCH] Publish new changes in catalog --- community/logseq/1.1.6/ci/extra-values.yaml | 11 -- community/logseq/{1.1.6 => 1.2.0}/Chart.lock | 0 community/logseq/{1.1.6 => 1.2.0}/Chart.yaml | 2 +- community/logseq/{1.1.6 => 1.2.0}/README.md | 0 .../logseq/{1.1.6 => 1.2.0}/app-readme.md | 0 .../{1.1.6 => 1.2.0}/charts/common-1.2.6.tgz | Bin .../{1.1.6 => 1.2.0}/ci/basic-values.yaml | 0 community/logseq/1.2.0/ci/extra-values.yaml | 9 ++ .../{1.1.6 => 1.2.0}/ci/hostNet-values.yaml | 0 .../{1.1.6 => 1.2.0}/ci/https-values.yaml | 0 .../logseq/{1.1.6 => 1.2.0}/ix_values.yaml | 0 .../logseq/{1.1.6 => 1.2.0}/metadata.yaml | 0 community/logseq/1.2.0/migrations/migrate | 65 ++++++++ .../logseq/{1.1.6 => 1.2.0}/questions.yaml | 153 +++++++++++------- .../{1.1.6 => 1.2.0}/templates/NOTES.txt | 0 .../templates/_configuration.tpl | 0 .../{1.1.6 => 1.2.0}/templates/_logseq.tpl | 6 + .../templates/_persistence.tpl | 33 ++-- .../{1.1.6 => 1.2.0}/templates/_portal.tpl | 0 .../{1.1.6 => 1.2.0}/templates/_service.tpl | 0 .../{1.1.6 => 1.2.0}/templates/common.yaml | 0 .../upgrade_strategy_disabled | 0 22 files changed, 196 insertions(+), 83 deletions(-) delete mode 100644 community/logseq/1.1.6/ci/extra-values.yaml rename community/logseq/{1.1.6 => 1.2.0}/Chart.lock (100%) rename community/logseq/{1.1.6 => 1.2.0}/Chart.yaml (97%) rename community/logseq/{1.1.6 => 1.2.0}/README.md (100%) rename community/logseq/{1.1.6 => 1.2.0}/app-readme.md (100%) rename community/logseq/{1.1.6 => 1.2.0}/charts/common-1.2.6.tgz (100%) rename community/logseq/{1.1.6 => 1.2.0}/ci/basic-values.yaml (100%) create mode 100644 community/logseq/1.2.0/ci/extra-values.yaml rename community/logseq/{1.1.6 => 1.2.0}/ci/hostNet-values.yaml (100%) rename community/logseq/{1.1.6 => 1.2.0}/ci/https-values.yaml (100%) rename community/logseq/{1.1.6 => 1.2.0}/ix_values.yaml (100%) rename community/logseq/{1.1.6 => 1.2.0}/metadata.yaml (100%) create mode 100755 community/logseq/1.2.0/migrations/migrate rename community/logseq/{1.1.6 => 1.2.0}/questions.yaml (58%) rename community/logseq/{1.1.6 => 1.2.0}/templates/NOTES.txt (100%) rename community/logseq/{1.1.6 => 1.2.0}/templates/_configuration.tpl (100%) rename community/logseq/{1.1.6 => 1.2.0}/templates/_logseq.tpl (75%) rename community/logseq/{1.1.6 => 1.2.0}/templates/_persistence.tpl (66%) rename community/logseq/{1.1.6 => 1.2.0}/templates/_portal.tpl (100%) rename community/logseq/{1.1.6 => 1.2.0}/templates/_service.tpl (100%) rename community/logseq/{1.1.6 => 1.2.0}/templates/common.yaml (100%) rename community/logseq/{1.1.6 => 1.2.0}/upgrade_strategy_disabled (100%) diff --git a/community/logseq/1.1.6/ci/extra-values.yaml b/community/logseq/1.1.6/ci/extra-values.yaml deleted file mode 100644 index cae37c6a61..0000000000 --- a/community/logseq/1.1.6/ci/extra-values.yaml +++ /dev/null @@ -1,11 +0,0 @@ -logseqNetwork: - webPort: 31000 - -logseqStorage: - additionalStorages: - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data1 - mountPath: /data1 - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data2 - mountPath: /data2 diff --git a/community/logseq/1.1.6/Chart.lock b/community/logseq/1.2.0/Chart.lock similarity index 100% rename from community/logseq/1.1.6/Chart.lock rename to community/logseq/1.2.0/Chart.lock diff --git a/community/logseq/1.1.6/Chart.yaml b/community/logseq/1.2.0/Chart.yaml similarity index 97% rename from community/logseq/1.1.6/Chart.yaml rename to community/logseq/1.2.0/Chart.yaml index ae41830100..2aa809a71b 100644 --- a/community/logseq/1.1.6/Chart.yaml +++ b/community/logseq/1.2.0/Chart.yaml @@ -3,7 +3,7 @@ description: Logseq is a privacy-first, open-source platform for knowledge manag annotations: title: Logseq type: application -version: 1.1.6 +version: 1.2.0 apiVersion: v2 appVersion: latest kubeVersion: '>=1.16.0-0' diff --git a/community/logseq/1.1.6/README.md b/community/logseq/1.2.0/README.md similarity index 100% rename from community/logseq/1.1.6/README.md rename to community/logseq/1.2.0/README.md diff --git a/community/logseq/1.1.6/app-readme.md b/community/logseq/1.2.0/app-readme.md similarity index 100% rename from community/logseq/1.1.6/app-readme.md rename to community/logseq/1.2.0/app-readme.md diff --git a/community/logseq/1.1.6/charts/common-1.2.6.tgz b/community/logseq/1.2.0/charts/common-1.2.6.tgz similarity index 100% rename from community/logseq/1.1.6/charts/common-1.2.6.tgz rename to community/logseq/1.2.0/charts/common-1.2.6.tgz diff --git a/community/logseq/1.1.6/ci/basic-values.yaml b/community/logseq/1.2.0/ci/basic-values.yaml similarity index 100% rename from community/logseq/1.1.6/ci/basic-values.yaml rename to community/logseq/1.2.0/ci/basic-values.yaml diff --git a/community/logseq/1.2.0/ci/extra-values.yaml b/community/logseq/1.2.0/ci/extra-values.yaml new file mode 100644 index 0000000000..8552447be2 --- /dev/null +++ b/community/logseq/1.2.0/ci/extra-values.yaml @@ -0,0 +1,9 @@ +logseqNetwork: + webPort: 31000 + +logseqStorage: + additionalStorages: + - type: pvc + mountPath: /data1 + - type: pvc + mountPath: /data2 diff --git a/community/logseq/1.1.6/ci/hostNet-values.yaml b/community/logseq/1.2.0/ci/hostNet-values.yaml similarity index 100% rename from community/logseq/1.1.6/ci/hostNet-values.yaml rename to community/logseq/1.2.0/ci/hostNet-values.yaml diff --git a/community/logseq/1.1.6/ci/https-values.yaml b/community/logseq/1.2.0/ci/https-values.yaml similarity index 100% rename from community/logseq/1.1.6/ci/https-values.yaml rename to community/logseq/1.2.0/ci/https-values.yaml diff --git a/community/logseq/1.1.6/ix_values.yaml b/community/logseq/1.2.0/ix_values.yaml similarity index 100% rename from community/logseq/1.1.6/ix_values.yaml rename to community/logseq/1.2.0/ix_values.yaml diff --git a/community/logseq/1.1.6/metadata.yaml b/community/logseq/1.2.0/metadata.yaml similarity index 100% rename from community/logseq/1.1.6/metadata.yaml rename to community/logseq/1.2.0/metadata.yaml diff --git a/community/logseq/1.2.0/migrations/migrate b/community/logseq/1.2.0/migrations/migrate new file mode 100755 index 0000000000..b342bf42ce --- /dev/null +++ b/community/logseq/1.2.0/migrations/migrate @@ -0,0 +1,65 @@ +#!/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 = 'logseqStorage' + + 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/logseq/1.1.6/questions.yaml b/community/logseq/1.2.0/questions.yaml similarity index 58% rename from community/logseq/1.1.6/questions.yaml rename to community/logseq/1.2.0/questions.yaml index 94d932471d..45f49eff2e 100644 --- a/community/logseq/1.1.6/questions.yaml +++ b/community/logseq/1.2.0/questions.yaml @@ -140,74 +140,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/logseq/1.1.6/templates/NOTES.txt b/community/logseq/1.2.0/templates/NOTES.txt similarity index 100% rename from community/logseq/1.1.6/templates/NOTES.txt rename to community/logseq/1.2.0/templates/NOTES.txt diff --git a/community/logseq/1.1.6/templates/_configuration.tpl b/community/logseq/1.2.0/templates/_configuration.tpl similarity index 100% rename from community/logseq/1.1.6/templates/_configuration.tpl rename to community/logseq/1.2.0/templates/_configuration.tpl diff --git a/community/logseq/1.1.6/templates/_logseq.tpl b/community/logseq/1.2.0/templates/_logseq.tpl similarity index 75% rename from community/logseq/1.1.6/templates/_logseq.tpl rename to community/logseq/1.2.0/templates/_logseq.tpl index 449aabf88d..3bedeb71c4 100644 --- a/community/logseq/1.1.6/templates/_logseq.tpl +++ b/community/logseq/1.2.0/templates/_logseq.tpl @@ -42,4 +42,10 @@ workload: type: {{ $protocol }} port: {{ .Values.logseqNetwork.webPort }} path: /health + initContainers: + {{- include "ix.v1.common.app.permissions" (dict "containerName" "01-permissions" + "UID" .Values.logseqRunAs.user + "GID" .Values.logseqRunAs.group + "mode" "check" + "type" "install") | nindent 8 }} {{- end -}} diff --git a/community/logseq/1.1.6/templates/_persistence.tpl b/community/logseq/1.2.0/templates/_persistence.tpl similarity index 66% rename from community/logseq/1.1.6/templates/_persistence.tpl rename to community/logseq/1.2.0/templates/_persistence.tpl index b407a226bd..4a146859a6 100644 --- a/community/logseq/1.1.6/templates/_persistence.tpl +++ b/community/logseq/1.2.0/templates/_persistence.tpl @@ -34,28 +34,17 @@ persistence: mountPath: /var/run {{- range $idx, $storage := .Values.logseqStorage.additionalStorages }} {{ printf "logseq-%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 "logseq.storage.ci.migration" (dict "storage" $storage) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} targetSelector: logseq: logseq: mountPath: {{ $storage.mountPath }} + {{- if and (eq $storage.type "ixVolume") (not ($storage.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories{{ $storage.mountPath }} + {{- end }} {{- end -}} {{- if .Values.logseqNetwork.certificateID }} @@ -81,3 +70,13 @@ scaleCertificate: id: {{ .Values.logseqNetwork.certificateID }} {{- end -}} {{- end -}} + +{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}} +{{- define "logseq.storage.ci.migration" -}} + {{- $storage := .storage -}} + + {{- if $storage.hostPath -}} + {{- $_ := set $storage "hostPathConfig" dict -}} + {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}} + {{- end -}} +{{- end -}} diff --git a/community/logseq/1.1.6/templates/_portal.tpl b/community/logseq/1.2.0/templates/_portal.tpl similarity index 100% rename from community/logseq/1.1.6/templates/_portal.tpl rename to community/logseq/1.2.0/templates/_portal.tpl diff --git a/community/logseq/1.1.6/templates/_service.tpl b/community/logseq/1.2.0/templates/_service.tpl similarity index 100% rename from community/logseq/1.1.6/templates/_service.tpl rename to community/logseq/1.2.0/templates/_service.tpl diff --git a/community/logseq/1.1.6/templates/common.yaml b/community/logseq/1.2.0/templates/common.yaml similarity index 100% rename from community/logseq/1.1.6/templates/common.yaml rename to community/logseq/1.2.0/templates/common.yaml diff --git a/community/logseq/1.1.6/upgrade_strategy_disabled b/community/logseq/1.2.0/upgrade_strategy_disabled similarity index 100% rename from community/logseq/1.1.6/upgrade_strategy_disabled rename to community/logseq/1.2.0/upgrade_strategy_disabled