mirror of
https://github.com/truenas/charts.git
synced 2026-02-11 06:16:23 +08:00
Publish new changes in catalog
This commit is contained in:
sonicaj
@@ -1,6 +0,0 @@
|
||||
dependencies:
|
||||
- name: common
|
||||
repository: file://../../../common
|
||||
version: 1.2.2
|
||||
digest: sha256:fb077cb81f6acecd5c9e6adc22a18e156f780cd78f27198cdb47810f95364b56
|
||||
generated: "2023-11-09T15:41:32.501062799+02:00"
|
||||
Binary file not shown.
@@ -1,51 +0,0 @@
|
||||
{{- define "listmonk.persistence" -}}
|
||||
persistence:
|
||||
uploads:
|
||||
enabled: true
|
||||
type: {{ .Values.listmonkStorage.uploads.type }}
|
||||
datasetName: {{ .Values.listmonkStorage.uploads.datasetName | default "" }}
|
||||
hostPath: {{ .Values.listmonkStorage.uploads.hostPath | default "" }}
|
||||
targetSelector:
|
||||
listmonk:
|
||||
listmonk:
|
||||
mountPath: /listmonk/uploads
|
||||
01-permissions:
|
||||
mountPath: /mnt/directories/uploads
|
||||
tmp:
|
||||
enabled: true
|
||||
type: emptyDir
|
||||
targetSelector:
|
||||
listmonk:
|
||||
listmonk:
|
||||
mountPath: /tmp
|
||||
{{- range $idx, $storage := .Values.listmonkStorage.additionalStorages }}
|
||||
{{ printf "listmonk-%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:
|
||||
listmonk:
|
||||
listmonk:
|
||||
mountPath: {{ $storage.mountPath }}
|
||||
{{- end -}}
|
||||
|
||||
{{- include "ix.v1.common.app.postgresPersistence"
|
||||
(dict "pgData" .Values.listmonkStorage.pgData
|
||||
"pgBackup" .Values.listmonkStorage.pgBackup
|
||||
) | nindent 2 }}
|
||||
{{- end -}}
|
||||
6
community/listmonk/1.2.0/Chart.lock
Normal file
6
community/listmonk/1.2.0/Chart.lock
Normal file
@@ -0,0 +1,6 @@
|
||||
dependencies:
|
||||
- name: common
|
||||
repository: file://../../../common
|
||||
version: 1.2.3
|
||||
digest: sha256:e6ff49b06bf5d4d159e505ae6d153f36cd46170bb519caf90462cd5caebfd0fb
|
||||
generated: "2023-11-21T16:51:17.550030304+02:00"
|
||||
@@ -3,7 +3,7 @@ description: Listmonk is a self-hosted newsletter and mailing list manager.
|
||||
annotations:
|
||||
title: Listmonk
|
||||
type: application
|
||||
version: 1.1.3
|
||||
version: 1.2.0
|
||||
apiVersion: v2
|
||||
appVersion: v2.5.1
|
||||
kubeVersion: '>=1.16.0-0'
|
||||
@@ -14,7 +14,7 @@ maintainers:
|
||||
dependencies:
|
||||
- name: common
|
||||
repository: file://../../../common
|
||||
version: 1.2.2
|
||||
version: 1.2.3
|
||||
home: https://listmonk.app/
|
||||
icon: https://media.sys.truenas.net/apps/listmonk/icons/icon.svg
|
||||
sources:
|
||||
BIN
community/listmonk/1.2.0/charts/common-1.2.3.tgz
Normal file
BIN
community/listmonk/1.2.0/charts/common-1.2.3.tgz
Normal file
Binary file not shown.
@@ -24,13 +24,16 @@ listmonkRunAs:
|
||||
listmonkStorage:
|
||||
uploads:
|
||||
type: ixVolume
|
||||
datasetName: uploads
|
||||
ixVolumeConfig:
|
||||
datasetName: uploads
|
||||
pgData:
|
||||
type: ixVolume
|
||||
datasetName: pgData
|
||||
ixVolumeConfig:
|
||||
datasetName: pgData
|
||||
pgBackup:
|
||||
type: ixVolume
|
||||
datasetName: pgBackup
|
||||
ixVolumeConfig:
|
||||
datasetName: pgBackup
|
||||
additionalStorages: []
|
||||
|
||||
notes:
|
||||
73
community/listmonk/1.2.0/migrations/migrate
Executable file
73
community/listmonk/1.2.0/migrations/migrate
Executable file
@@ -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 = 'listmonkStorage'
|
||||
storages = ['uploads', '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)
|
||||
|
||||
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()))))
|
||||
@@ -139,24 +139,65 @@ 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: uploads
|
||||
$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: uploads
|
||||
- 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"]]
|
||||
immutable: true
|
||||
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]]
|
||||
immutable: true
|
||||
required: true
|
||||
|
||||
- variable: pgData
|
||||
label: Listmonk Postgres Data Storage
|
||||
description: The path to store Listmonk Postgres Data.
|
||||
@@ -178,24 +219,73 @@ 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
|
||||
show_if: [["type", "=", "ixVolume"]]
|
||||
required: true
|
||||
type: dict
|
||||
# Nothing to show for the user
|
||||
hidden: true
|
||||
immutable: true
|
||||
default: pgData
|
||||
show_if: [["type", "=", "ixVolume"]]
|
||||
$ref:
|
||||
- "normalize/ixVolume"
|
||||
- variable: hostPath
|
||||
label: Host Path
|
||||
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: Host Path Configuration
|
||||
schema:
|
||||
type: hostpath
|
||||
type: dict
|
||||
show_if: [["type", "=", "hostPath"]]
|
||||
immutable: true
|
||||
required: true
|
||||
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: Listmonk Postgres Backup Storage
|
||||
description: The path to store Listmonk Postgres Backup.
|
||||
@@ -217,24 +307,73 @@ 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
|
||||
show_if: [["type", "=", "ixVolume"]]
|
||||
required: true
|
||||
type: dict
|
||||
# Nothing to show for the user
|
||||
hidden: true
|
||||
immutable: true
|
||||
default: pgBackup
|
||||
show_if: [["type", "=", "ixVolume"]]
|
||||
$ref:
|
||||
- "normalize/ixVolume"
|
||||
- variable: hostPath
|
||||
label: Host Path
|
||||
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: Host Path Configuration
|
||||
schema:
|
||||
type: hostpath
|
||||
type: dict
|
||||
show_if: [["type", "=", "hostPath"]]
|
||||
immutable: true
|
||||
required: true
|
||||
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 Listmonk.
|
||||
@@ -265,75 +404,120 @@ 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]]
|
||||
immutable: true
|
||||
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
|
||||
label: ""
|
||||
@@ -41,14 +41,9 @@ workload:
|
||||
port: {{ .Values.listmonkNetwork.webPort }}
|
||||
path: /health
|
||||
initContainers:
|
||||
{{- include "ix.v1.common.app.permissions" (dict "containerName" "01-permissions"
|
||||
"UID" .Values.listmonkRunAs.user
|
||||
"GID" .Values.listmonkRunAs.group
|
||||
"mode" "check"
|
||||
"type" "init") | nindent 8 }}
|
||||
{{- include "ix.v1.common.app.postgresWait" (dict "name" "02-postgres-wait"
|
||||
{{- include "ix.v1.common.app.postgresWait" (dict "name" "01-postgres-wait"
|
||||
"secretName" "postgres-creds") | nindent 8 }}
|
||||
03-db:
|
||||
02-db:
|
||||
enabled: true
|
||||
type: init
|
||||
imageSelector: image
|
||||
31
community/listmonk/1.2.0/templates/_persistence.tpl
Normal file
31
community/listmonk/1.2.0/templates/_persistence.tpl
Normal file
@@ -0,0 +1,31 @@
|
||||
{{- define "listmonk.persistence" -}}
|
||||
persistence:
|
||||
uploads:
|
||||
enabled: true
|
||||
{{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.listmonkStorage.uploads) | nindent 4 }}
|
||||
targetSelector:
|
||||
listmonk:
|
||||
listmonk:
|
||||
mountPath: /listmonk/uploads
|
||||
tmp:
|
||||
enabled: true
|
||||
type: emptyDir
|
||||
targetSelector:
|
||||
listmonk:
|
||||
listmonk:
|
||||
mountPath: /tmp
|
||||
{{- range $idx, $storage := .Values.listmonkStorage.additionalStorages }}
|
||||
{{ printf "listmonk-%v:" (int $idx) }}
|
||||
enabled: true
|
||||
{{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }}
|
||||
targetSelector:
|
||||
listmonk:
|
||||
listmonk:
|
||||
mountPath: {{ $storage.mountPath }}
|
||||
{{- end -}}
|
||||
|
||||
{{- include "ix.v1.common.app.postgresPersistence"
|
||||
(dict "pgData" .Values.listmonkStorage.pgData
|
||||
"pgBackup" .Values.listmonkStorage.pgBackup
|
||||
) | nindent 2 }}
|
||||
{{- end -}}
|
||||
Reference in New Issue
Block a user