diff --git a/community/joplin/1.0.7/Chart.lock b/community/joplin/1.0.7/Chart.lock deleted file mode 100644 index bfe9368b25..0000000000 --- a/community/joplin/1.0.7/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../common - version: 1.2.2 -digest: sha256:fb077cb81f6acecd5c9e6adc22a18e156f780cd78f27198cdb47810f95364b56 -generated: "2023-11-09T15:41:00.117017049+02:00" diff --git a/community/joplin/1.0.7/charts/common-1.2.2.tgz b/community/joplin/1.0.7/charts/common-1.2.2.tgz deleted file mode 100644 index 5ad7e721d5..0000000000 Binary files a/community/joplin/1.0.7/charts/common-1.2.2.tgz and /dev/null differ diff --git a/community/joplin/1.0.7/ci/basic-values.yaml b/community/joplin/1.0.7/ci/basic-values.yaml deleted file mode 100644 index d537894cbc..0000000000 --- a/community/joplin/1.0.7/ci/basic-values.yaml +++ /dev/null @@ -1,10 +0,0 @@ -joplinNetwork: - webPort: 31000 - -joplinStorage: - pgData: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/pgData - pgBackup: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/pgBackup diff --git a/community/joplin/1.0.7/ci/hostNet-values.yaml b/community/joplin/1.0.7/ci/hostNet-values.yaml deleted file mode 100644 index c14b819c0e..0000000000 --- a/community/joplin/1.0.7/ci/hostNet-values.yaml +++ /dev/null @@ -1,11 +0,0 @@ -joplinNetwork: - webPort: 31000 - hostNetwork: true - -joplinStorage: - pgData: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/pgData - pgBackup: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/pgBackup diff --git a/community/joplin/1.0.7/questions.yaml b/community/joplin/1.0.7/questions.yaml deleted file mode 100644 index 380c3b5263..0000000000 --- a/community/joplin/1.0.7/questions.yaml +++ /dev/null @@ -1,209 +0,0 @@ -groups: - - name: Joplin Configuration - description: Configure Joplin - - name: Network Configuration - description: Configure Network for Joplin - - name: Storage Configuration - description: Configure Storage for Joplin - - name: Resources Configuration - description: Configure Resources for Joplin - -portals: - web_portal: - protocols: - - "$kubernetes-resource_configmap_portal_protocol" - host: - - "$kubernetes-resource_configmap_portal_host" - ports: - - "$kubernetes-resource_configmap_portal_port" - path: "$kubernetes-resource_configmap_portal_path" - -questions: - - variable: joplinConfig - label: "" - group: Joplin Configuration - schema: - type: dict - attrs: - - variable: baseUrl - label: Base URL - description: | - The base URL for Joplin.
- Examples:
- https://joplin.example.com - http://192.168.1.100:30062 - schema: - type: uri - default: "" - required: true - - variable: additionalEnvs - label: Additional Environment Variables - description: Configure additional environment variables for Joplin. - schema: - type: list - default: [] - items: - - variable: env - label: Environment Variable - schema: - type: dict - attrs: - - variable: name - label: Name - schema: - type: string - required: true - - variable: value - label: Value - schema: - type: string - required: true - - - variable: joplinNetwork - label: "" - group: Network Configuration - schema: - type: dict - attrs: - - variable: webPort - label: Web Port - description: The port for the Joplin Web UI. - schema: - type: int - default: 30062 - min: 9000 - max: 65535 - required: true - - variable: hostNetwork - label: Host Network - description: | - Bind to the host network. It's recommended to keep this disabled.
- schema: - type: boolean - default: false - - - variable: joplinStorage - label: "" - group: Storage Configuration - schema: - type: dict - attrs: - - variable: pgData - label: Joplin Postgres Data Storage - description: The path to store Joplin Postgres Data. - schema: - type: dict - attrs: - - variable: type - label: Type - description: | - ixVolume: Is dataset created automatically by the system.
- Host Path: Is a path that already exists on the system. - schema: - type: string - required: true - immutable: true - default: ixVolume - enum: - - value: hostPath - 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 - schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: pgData - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - immutable: true - required: true - - variable: pgBackup - label: Joplin Postgres Backup Storage - description: The path to store Joplin Postgres Backup. - schema: - type: dict - attrs: - - variable: type - label: Type - description: | - ixVolume: Is dataset created automatically by the system.
- Host Path: Is a path that already exists on the system. - schema: - type: string - required: true - immutable: true - default: ixVolume - enum: - - value: hostPath - 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 - schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: pgBackup - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - immutable: true - required: true - - - variable: resources - group: Resources Configuration - label: "" - schema: - type: dict - attrs: - - variable: limits - label: Limits - schema: - type: dict - attrs: - - variable: cpu - label: CPU - description: CPU limit for Joplin. - schema: - type: string - max_length: 6 - valid_chars: '^(0\.[1-9]|[1-9][0-9]*)(\.[0-9]|m?)$' - valid_chars_error: | - Valid CPU limit formats are
- - Plain Integer - eg. 1
- - Float - eg. 0.5
- - Milicpu - eg. 500m - default: "4000m" - required: true - - variable: memory - label: Memory - description: Memory limit for Joplin. - schema: - type: string - max_length: 12 - valid_chars: '^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$' - valid_chars_error: | - Valid Memory limit formats are
- - Suffixed with E/P/T/G/M/K - eg. 1G
- - Suffixed with Ei/Pi/Ti/Gi/Mi/Ki - eg. 1Gi
- - Plain Integer in bytes - eg. 1024
- - Exponent - eg. 134e6 - default: "8Gi" - required: true diff --git a/community/joplin/1.0.7/templates/_persistence.tpl b/community/joplin/1.0.7/templates/_persistence.tpl deleted file mode 100644 index af5369ee6e..0000000000 --- a/community/joplin/1.0.7/templates/_persistence.tpl +++ /dev/null @@ -1,7 +0,0 @@ -{{- define "joplin.persistence" -}} -persistence: - {{- include "ix.v1.common.app.postgresPersistence" - (dict "pgData" .Values.joplinStorage.pgData - "pgBackup" .Values.joplinStorage.pgBackup - ) | nindent 2 }} -{{- end -}} diff --git a/community/joplin/1.1.0/Chart.lock b/community/joplin/1.1.0/Chart.lock new file mode 100644 index 0000000000..f9ef3d784b --- /dev/null +++ b/community/joplin/1.1.0/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../common + version: 1.2.3 +digest: sha256:e6ff49b06bf5d4d159e505ae6d153f36cd46170bb519caf90462cd5caebfd0fb +generated: "2023-11-16T14:37:01.193129073+02:00" diff --git a/community/joplin/1.0.7/Chart.yaml b/community/joplin/1.1.0/Chart.yaml similarity index 92% rename from community/joplin/1.0.7/Chart.yaml rename to community/joplin/1.1.0/Chart.yaml index 8a397ffd5d..6d6bbd0c7e 100644 --- a/community/joplin/1.0.7/Chart.yaml +++ b/community/joplin/1.1.0/Chart.yaml @@ -3,9 +3,9 @@ description: Joplin is an open source note-taking app. Capture your thoughts and annotations: title: Joplin type: application -version: 1.0.7 +version: 1.1.0 apiVersion: v2 -appVersion: 2.13.3 +appVersion: 2.13.4 kubeVersion: '>=1.16.0-0' maintainers: - name: truenas @@ -14,7 +14,7 @@ maintainers: dependencies: - name: common repository: file://../../../common - version: 1.2.2 + version: 1.2.3 home: https://joplinapp.org/ icon: https://media.sys.truenas.net/apps/joplin/icons/icon.png sources: diff --git a/community/joplin/1.0.7/README.md b/community/joplin/1.1.0/README.md similarity index 100% rename from community/joplin/1.0.7/README.md rename to community/joplin/1.1.0/README.md diff --git a/community/joplin/1.0.7/app-readme.md b/community/joplin/1.1.0/app-readme.md similarity index 100% rename from community/joplin/1.0.7/app-readme.md rename to community/joplin/1.1.0/app-readme.md diff --git a/community/joplin/1.1.0/charts/common-1.2.3.tgz b/community/joplin/1.1.0/charts/common-1.2.3.tgz new file mode 100644 index 0000000000..d73f68557a Binary files /dev/null and b/community/joplin/1.1.0/charts/common-1.2.3.tgz differ diff --git a/community/joplin/1.1.0/ci/basic-values.yaml b/community/joplin/1.1.0/ci/basic-values.yaml new file mode 100644 index 0000000000..6007811af7 --- /dev/null +++ b/community/joplin/1.1.0/ci/basic-values.yaml @@ -0,0 +1,8 @@ +joplinNetwork: + webPort: 31000 + +joplinStorage: + pgData: + type: pvc + pgBackup: + type: emptyDir diff --git a/community/joplin/1.1.0/ci/hostNet-values.yaml b/community/joplin/1.1.0/ci/hostNet-values.yaml new file mode 100644 index 0000000000..05dd1fedcb --- /dev/null +++ b/community/joplin/1.1.0/ci/hostNet-values.yaml @@ -0,0 +1,9 @@ +joplinNetwork: + webPort: 31000 + hostNetwork: true + +joplinStorage: + pgData: + type: pvc + pgBackup: + type: emptyDir diff --git a/community/joplin/1.0.7/ix_values.yaml b/community/joplin/1.1.0/ix_values.yaml similarity index 86% rename from community/joplin/1.0.7/ix_values.yaml rename to community/joplin/1.1.0/ix_values.yaml index 5849e84009..72c38752da 100644 --- a/community/joplin/1.0.7/ix_values.yaml +++ b/community/joplin/1.1.0/ix_values.yaml @@ -1,7 +1,7 @@ image: repository: joplin/server pullPolicy: IfNotPresent - tag: 2.13.3-beta + tag: 2.13.4-beta resources: limits: @@ -19,10 +19,13 @@ joplinNetwork: joplinStorage: pgData: type: ixVolume - datasetName: pgData + ixVolumeConfig: + datasetName: pgData pgBackup: type: ixVolume - datasetName: pgBackup + ixVolumeConfig: + datasetName: pgBackup + additionalStorages: [] notes: custom: | diff --git a/community/joplin/1.0.7/metadata.yaml b/community/joplin/1.1.0/metadata.yaml similarity index 100% rename from community/joplin/1.0.7/metadata.yaml rename to community/joplin/1.1.0/metadata.yaml diff --git a/community/joplin/1.1.0/migrations/migrate b/community/joplin/1.1.0/migrations/migrate new file mode 100755 index 0000000000..446d243054 --- /dev/null +++ b/community/joplin/1.1.0/migrations/migrate @@ -0,0 +1,51 @@ +#!/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') + + for key in delete_keys: + storage.pop(key, None) + + return storage + + +def migrate(values): + storage_key = 'joplinStorage' + storages = ['pgData', 'pgBackup'] + + 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) + + 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/joplin/1.1.0/questions.yaml b/community/joplin/1.1.0/questions.yaml new file mode 100644 index 0000000000..2c7c0f2ed2 --- /dev/null +++ b/community/joplin/1.1.0/questions.yaml @@ -0,0 +1,451 @@ +groups: + - name: Joplin Configuration + description: Configure Joplin + - name: Network Configuration + description: Configure Network for Joplin + - name: Storage Configuration + description: Configure Storage for Joplin + - name: Resources Configuration + description: Configure Resources for Joplin + +portals: + web_portal: + protocols: + - "$kubernetes-resource_configmap_portal_protocol" + host: + - "$kubernetes-resource_configmap_portal_host" + ports: + - "$kubernetes-resource_configmap_portal_port" + path: "$kubernetes-resource_configmap_portal_path" + +questions: + - variable: joplinConfig + label: "" + group: Joplin Configuration + schema: + type: dict + attrs: + - variable: baseUrl + label: Base URL + description: | + The base URL for Joplin.
+ Examples:
+ https://joplin.example.com + http://192.168.1.100:30062 + schema: + type: uri + default: "" + required: true + - variable: additionalEnvs + label: Additional Environment Variables + description: Configure additional environment variables for Joplin. + schema: + type: list + default: [] + items: + - variable: env + label: Environment Variable + schema: + type: dict + attrs: + - variable: name + label: Name + schema: + type: string + required: true + - variable: value + label: Value + schema: + type: string + required: true + + - variable: joplinNetwork + label: "" + group: Network Configuration + schema: + type: dict + attrs: + - variable: webPort + label: Web Port + description: The port for the Joplin Web UI. + schema: + type: int + default: 30062 + min: 9000 + max: 65535 + required: true + - variable: hostNetwork + label: Host Network + description: | + Bind to the host network. It's recommended to keep this disabled.
+ schema: + type: boolean + default: false + + - variable: joplinStorage + label: "" + group: Storage Configuration + schema: + type: dict + attrs: + - variable: pgData + label: Joplin Postgres Data Storage + description: The path to store Joplin Postgres Data. + schema: + type: dict + attrs: + - variable: type + label: Type + description: | + ixVolume: Is dataset created automatically by the system.
+ Host Path: Is a path that already exists on the system. + schema: + type: string + required: true + immutable: true + default: ixVolume + enum: + - value: hostPath + description: Host Path (Path that already exists on the system) + - value: ixVolume + description: ixVolume (Dataset created automatically by the system) + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. + schema: + type: dict + # Nothing to show for the user + hidden: true + show_if: [["type", "=", "ixVolume"]] + $ref: + - "normalize/ixVolume" + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + # Postgres does a CHMOD at startup + # Which fails with ACL + hidden: true + 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: "pgData" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: hostPathConfig + schema: + type: dict + show_if: [["type", "=", "hostPath"]] + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + # Postgres does a CHMOD at startup + # Which fails with ACL + hidden: true + 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]] + immutable: true + required: true + + - variable: pgBackup + label: Joplin Postgres Backup Storage + description: The path to store Joplin Postgres Backup. + schema: + type: dict + attrs: + - variable: type + label: Type + description: | + ixVolume: Is dataset created automatically by the system.
+ Host Path: Is a path that already exists on the system. + schema: + type: string + required: true + immutable: true + default: ixVolume + enum: + - value: hostPath + description: Host Path (Path that already exists on the system) + - value: ixVolume + description: ixVolume (Dataset created automatically by the system) + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. + schema: + type: dict + # Nothing to show for the user + hidden: true + show_if: [["type", "=", "ixVolume"]] + $ref: + - "normalize/ixVolume" + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + # Postgres does a CHMOD at startup + # Which fails with ACL + hidden: true + 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: "pgBackup" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: hostPathConfig + label: hostPathConfig + schema: + type: dict + show_if: [["type", "=", "hostPath"]] + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + # Postgres does a CHMOD at startup + # Which fails with ACL + hidden: true + 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]] + immutable: true + required: true + + - variable: additionalStorages + label: Additional Storage + description: Additional storage for Joplin. + schema: + type: list + default: [] + items: + - variable: storageEntry + label: Storage Entry + schema: + type: dict + attrs: + - variable: type + label: Type + description: | + ixVolume: Is dataset created automatically by the system.
+ Host Path: Is a path that already exists on the system.
+ SMB Share: Is a SMB share that is mounted to a persistent volume claim. + schema: + type: string + required: true + default: "ixVolume" + immutable: true + enum: + - value: "hostPath" + description: Host Path (Path that already exists on the system) + - value: "ixVolume" + 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: hostPathConfig + label: hostPathConfig + schema: + type: dict + show_if: [["type", "=", "hostPath"]] + 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]] + immutable: true + required: true + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. + schema: + type: dict + show_if: [["type", "=", "ixVolume"]] + $ref: + - "normalize/ixVolume" + 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: dict + show_if: [["type", "=", "smb-pv-pvc"]] + 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 + label: "" + schema: + type: dict + attrs: + - variable: limits + label: Limits + schema: + type: dict + attrs: + - variable: cpu + label: CPU + description: CPU limit for Joplin. + schema: + type: string + max_length: 6 + valid_chars: '^(0\.[1-9]|[1-9][0-9]*)(\.[0-9]|m?)$' + valid_chars_error: | + Valid CPU limit formats are
+ - Plain Integer - eg. 1
+ - Float - eg. 0.5
+ - Milicpu - eg. 500m + default: "4000m" + required: true + - variable: memory + label: Memory + description: Memory limit for Joplin. + schema: + type: string + max_length: 12 + valid_chars: '^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$' + valid_chars_error: | + Valid Memory limit formats are
+ - Suffixed with E/P/T/G/M/K - eg. 1G
+ - Suffixed with Ei/Pi/Ti/Gi/Mi/Ki - eg. 1Gi
+ - Plain Integer in bytes - eg. 1024
+ - Exponent - eg. 134e6 + default: "8Gi" + required: true diff --git a/community/joplin/1.0.7/templates/NOTES.txt b/community/joplin/1.1.0/templates/NOTES.txt similarity index 100% rename from community/joplin/1.0.7/templates/NOTES.txt rename to community/joplin/1.1.0/templates/NOTES.txt diff --git a/community/joplin/1.0.7/templates/_configuration.tpl b/community/joplin/1.1.0/templates/_configuration.tpl similarity index 100% rename from community/joplin/1.0.7/templates/_configuration.tpl rename to community/joplin/1.1.0/templates/_configuration.tpl diff --git a/community/joplin/1.0.7/templates/_joplin.tpl b/community/joplin/1.1.0/templates/_joplin.tpl similarity index 100% rename from community/joplin/1.0.7/templates/_joplin.tpl rename to community/joplin/1.1.0/templates/_joplin.tpl diff --git a/community/joplin/1.1.0/templates/_persistence.tpl b/community/joplin/1.1.0/templates/_persistence.tpl new file mode 100644 index 0000000000..7f41699925 --- /dev/null +++ b/community/joplin/1.1.0/templates/_persistence.tpl @@ -0,0 +1,31 @@ +{{- define "joplin.persistence" -}} + {{- include "joplin.storage.ci.migration" (dict "storage" .Values.joplinStorage.pgData) }} + {{- include "joplin.storage.ci.migration" (dict "storage" .Values.joplinStorage.pgBackup) }} + +persistence: + {{- include "ix.v1.common.app.postgresPersistence" + (dict "pgData" .Values.joplinStorage.pgData + "pgBackup" .Values.joplinStorage.pgBackup + ) | nindent 2 }} + + {{- range $idx, $storage := .Values.joplinStorage.additionalStorages }} + {{ printf "joplin-%v:" (int $idx) }} + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} + targetSelector: + joplin: + joplin: + mountPath: {{ $storage.mountPath }} + {{- end }} +{{- end -}} + + +{{/* TODO: Remove on the next version bump, eg 1.1.0+ */}} +{{- define "joplin.storage.ci.migration" -}} + {{- $storage := .storage -}} + + {{- if $storage.hostPath -}} + {{- $_ := set $storage "hostPathConfig" dict -}} + {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}} + {{- end -}} +{{- end -}} diff --git a/community/joplin/1.0.7/templates/_portal.tpl b/community/joplin/1.1.0/templates/_portal.tpl similarity index 100% rename from community/joplin/1.0.7/templates/_portal.tpl rename to community/joplin/1.1.0/templates/_portal.tpl diff --git a/community/joplin/1.0.7/templates/_postgres.tpl b/community/joplin/1.1.0/templates/_postgres.tpl similarity index 100% rename from community/joplin/1.0.7/templates/_postgres.tpl rename to community/joplin/1.1.0/templates/_postgres.tpl diff --git a/community/joplin/1.0.7/templates/_service.tpl b/community/joplin/1.1.0/templates/_service.tpl similarity index 100% rename from community/joplin/1.0.7/templates/_service.tpl rename to community/joplin/1.1.0/templates/_service.tpl diff --git a/community/joplin/1.0.7/templates/common.yaml b/community/joplin/1.1.0/templates/common.yaml similarity index 100% rename from community/joplin/1.0.7/templates/common.yaml rename to community/joplin/1.1.0/templates/common.yaml