diff --git a/community/transmission/1.2.6/templates/_persistence.tpl b/community/transmission/1.2.6/templates/_persistence.tpl deleted file mode 100644 index 354a91d99b..0000000000 --- a/community/transmission/1.2.6/templates/_persistence.tpl +++ /dev/null @@ -1,65 +0,0 @@ -{{- define "transmission.persistence" -}} -persistence: - config: - enabled: true - type: {{ .Values.transmissionStorage.config.type }} - datasetName: {{ .Values.transmissionStorage.config.datasetName | default "" }} - hostPath: {{ .Values.transmissionStorage.config.hostPath | default "" }} - targetSelector: - transmission: - transmission: - mountPath: /config - 01-permissions: - mountPath: /mnt/directories/config - download-complete: - enabled: true - type: {{ .Values.transmissionStorage.downloadsComplete.type }} - datasetName: {{ .Values.transmissionStorage.downloadsComplete.datasetName | default "" }} - hostPath: {{ .Values.transmissionStorage.downloadsComplete.hostPath | default "" }} - targetSelector: - transmission: - transmission: - mountPath: {{ .Values.transmissionStorage.downloadsDir | default "/downloads/complete" }} - 01-permissions: - mountPath: /mnt/directories/complete - {{- if .Values.transmissionStorage.enableIncompleteDir }} - download-incomplete: - enabled: true - type: {{ .Values.transmissionStorage.downloadsIncomplete.type }} - datasetName: {{ .Values.transmissionStorage.downloadsIncomplete.datasetName | default "" }} - hostPath: {{ .Values.transmissionStorage.downloadsIncomplete.hostPath | default "" }} - targetSelector: - transmission: - transmission: - mountPath: {{ .Values.transmissionStorage.incompleteDir | default "/downloads/incomplete" }} - 01-permissions: - mountPath: /mnt/directories/incomplete - {{- end -}} - {{- range $idx, $storage := .Values.transmissionStorage.additionalStorages }} - {{ printf "transmission-%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: - transmission: - transmission: - mountPath: {{ $storage.mountPath }} - 01-permissions: - mountPath: /mnt/directories{{ $storage.mountPath }} - {{- end }} -{{- end -}} diff --git a/community/transmission/1.2.6/Chart.lock b/community/transmission/1.3.0/Chart.lock similarity index 100% rename from community/transmission/1.2.6/Chart.lock rename to community/transmission/1.3.0/Chart.lock diff --git a/community/transmission/1.2.6/Chart.yaml b/community/transmission/1.3.0/Chart.yaml similarity index 97% rename from community/transmission/1.2.6/Chart.yaml rename to community/transmission/1.3.0/Chart.yaml index 7f2ebe8938..de363ec528 100644 --- a/community/transmission/1.2.6/Chart.yaml +++ b/community/transmission/1.3.0/Chart.yaml @@ -3,7 +3,7 @@ description: Transmission is designed for easy, powerful use. annotations: title: Transmission type: application -version: 1.2.6 +version: 1.3.0 apiVersion: v2 appVersion: 4.0.4 kubeVersion: '>=1.16.0-0' diff --git a/community/transmission/1.2.6/README.md b/community/transmission/1.3.0/README.md similarity index 100% rename from community/transmission/1.2.6/README.md rename to community/transmission/1.3.0/README.md diff --git a/community/transmission/1.2.6/app-readme.md b/community/transmission/1.3.0/app-readme.md similarity index 100% rename from community/transmission/1.2.6/app-readme.md rename to community/transmission/1.3.0/app-readme.md diff --git a/community/transmission/1.2.6/charts/common-1.2.5.tgz b/community/transmission/1.3.0/charts/common-1.2.5.tgz similarity index 100% rename from community/transmission/1.2.6/charts/common-1.2.5.tgz rename to community/transmission/1.3.0/charts/common-1.2.5.tgz diff --git a/community/transmission/1.2.6/ci/basic-values.yaml b/community/transmission/1.3.0/ci/basic-values.yaml similarity index 100% rename from community/transmission/1.2.6/ci/basic-values.yaml rename to community/transmission/1.3.0/ci/basic-values.yaml diff --git a/community/transmission/1.2.6/ci/extra-values.yaml b/community/transmission/1.3.0/ci/extra-values.yaml similarity index 100% rename from community/transmission/1.2.6/ci/extra-values.yaml rename to community/transmission/1.3.0/ci/extra-values.yaml diff --git a/community/transmission/1.2.6/ci/hostNet-values.yaml b/community/transmission/1.3.0/ci/hostNet-values.yaml similarity index 100% rename from community/transmission/1.2.6/ci/hostNet-values.yaml rename to community/transmission/1.3.0/ci/hostNet-values.yaml diff --git a/community/transmission/1.2.6/ix_values.yaml b/community/transmission/1.3.0/ix_values.yaml similarity index 81% rename from community/transmission/1.2.6/ix_values.yaml rename to community/transmission/1.3.0/ix_values.yaml index 09587fa66b..4b0cb4a111 100644 --- a/community/transmission/1.2.6/ix_values.yaml +++ b/community/transmission/1.3.0/ix_values.yaml @@ -23,15 +23,18 @@ transmissionRunAs: transmissionStorage: config: type: ixVolume - datasetName: config + ixVolumeConfig: + datasetName: config downloadsComplete: type: ixVolume - datasetName: downloads-complete + ixVolumeConfig: + datasetName: downloads-complete downloadsDir: /downloads/complete enableIncompleteDir: true downloadsIncomplete: type: ixVolume - datasetName: downloads-incomplete + ixVolumeConfig: + datasetName: downloads-incomplete incompleteDir: /downloads/incomplete additionalStorages: [] diff --git a/community/transmission/1.2.6/metadata.yaml b/community/transmission/1.3.0/metadata.yaml similarity index 100% rename from community/transmission/1.2.6/metadata.yaml rename to community/transmission/1.3.0/metadata.yaml diff --git a/community/transmission/1.3.0/migrations/migrate b/community/transmission/1.3.0/migrations/migrate new file mode 100755 index 0000000000..b55ce99c09 --- /dev/null +++ b/community/transmission/1.3.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 = 'transmissionStorage' + storages = ['config', 'downloadsComplete', 'downloadsIncomplete'] + + 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/transmission/1.2.6/questions.yaml b/community/transmission/1.3.0/questions.yaml similarity index 53% rename from community/transmission/1.2.6/questions.yaml rename to community/transmission/1.3.0/questions.yaml index 5efbfe2218..4807f5abfc 100644 --- a/community/transmission/1.2.6/questions.yaml +++ b/community/transmission/1.3.0/questions.yaml @@ -132,23 +132,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: downloadsComplete label: Transmission Complete Downloads Storage description: The path to store Transmission Complete Downloads. @@ -170,23 +211,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: "downloads-complete" $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: "downloads-complete" + - 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: downloadsDir label: Downloads Directory (In-Container) description: The directory inside the container to store downloads. @@ -224,23 +306,63 @@ 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: "downloads-incomplete" $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: "downloads-incomplete" + - 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: incompleteDir label: Incomplete Directory (In-Container) description: The directory inside the container to store incomplete downloads. @@ -280,74 +402,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 label: Resources Configuration @@ -380,7 +547,7 @@ questions: schema: type: string max_length: 12 - valid_chars: '^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$' + 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
diff --git a/community/transmission/1.2.6/templates/NOTES.txt b/community/transmission/1.3.0/templates/NOTES.txt similarity index 100% rename from community/transmission/1.2.6/templates/NOTES.txt rename to community/transmission/1.3.0/templates/NOTES.txt diff --git a/community/transmission/1.2.6/templates/_configuration.tpl b/community/transmission/1.3.0/templates/_configuration.tpl similarity index 100% rename from community/transmission/1.2.6/templates/_configuration.tpl rename to community/transmission/1.3.0/templates/_configuration.tpl diff --git a/community/transmission/1.3.0/templates/_persistence.tpl b/community/transmission/1.3.0/templates/_persistence.tpl new file mode 100644 index 0000000000..d2cf70a9ca --- /dev/null +++ b/community/transmission/1.3.0/templates/_persistence.tpl @@ -0,0 +1,54 @@ +{{- define "transmission.persistence" -}} +persistence: + config: + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.transmissionStorage.config) | nindent 4 }} + targetSelector: + transmission: + transmission: + mountPath: /config + {{- if and (eq .Values.transmissionStorage.config.type "ixVolume") + (not (.Values.transmissionStorage.config.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories/config + {{- end }} + download-complete: + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.transmissionStorage.downloadsComplete) | nindent 4 }} + targetSelector: + transmission: + transmission: + mountPath: {{ .Values.transmissionStorage.downloadsDir | default "/downloads/complete" }} + {{- if and (eq .Values.transmissionStorage.downloadsComplete.type "ixVolume") + (not (.Values.transmissionStorage.downloadsComplete.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories/complete + {{- end }} + {{- if .Values.transmissionStorage.enableIncompleteDir }} + download-incomplete: + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.transmissionStorage.downloadsIncomplete) | nindent 4 }} + targetSelector: + transmission: + transmission: + mountPath: {{ .Values.transmissionStorage.incompleteDir | default "/downloads/incomplete" }} + {{- if and (eq .Values.transmissionStorage.downloadsIncomplete.type "ixVolume") + (not (.Values.transmissionStorage.downloadsIncomplete.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories/incomplete + {{- end }} + {{- end -}} + {{- range $idx, $storage := .Values.transmissionStorage.additionalStorages }} + {{ printf "transmission-%v:" (int $idx) }} + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} + targetSelector: + transmission: + transmission: + 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 -}} diff --git a/community/transmission/1.2.6/templates/_portal.tpl b/community/transmission/1.3.0/templates/_portal.tpl similarity index 100% rename from community/transmission/1.2.6/templates/_portal.tpl rename to community/transmission/1.3.0/templates/_portal.tpl diff --git a/community/transmission/1.2.6/templates/_service.tpl b/community/transmission/1.3.0/templates/_service.tpl similarity index 100% rename from community/transmission/1.2.6/templates/_service.tpl rename to community/transmission/1.3.0/templates/_service.tpl diff --git a/community/transmission/1.2.6/templates/_transmission.tpl b/community/transmission/1.3.0/templates/_transmission.tpl similarity index 98% rename from community/transmission/1.2.6/templates/_transmission.tpl rename to community/transmission/1.3.0/templates/_transmission.tpl index 63244c5380..0c669246b4 100644 --- a/community/transmission/1.2.6/templates/_transmission.tpl +++ b/community/transmission/1.3.0/templates/_transmission.tpl @@ -42,6 +42,6 @@ workload: "UID" .Values.transmissionRunAs.user "GID" .Values.transmissionRunAs.group "mode" "check" - "type" "init") | nindent 8 }} + "type" "install") | nindent 8 }} {{- end -}} diff --git a/community/transmission/1.2.6/templates/common.yaml b/community/transmission/1.3.0/templates/common.yaml similarity index 100% rename from community/transmission/1.2.6/templates/common.yaml rename to community/transmission/1.3.0/templates/common.yaml