diff --git a/community/qbittorrent/1.0.21/Chart.lock b/community/qbittorrent/1.0.21/Chart.lock deleted file mode 100644 index a3a3ee220b..0000000000 --- a/community/qbittorrent/1.0.21/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../common - version: 1.1.0 -digest: sha256:752ce76025f5b61094bd2b18ca11693eb9d26d0dde4eb2e63cd2330cbffe9e73 -generated: "2023-08-28T16:57:04.625845446+03:00" diff --git a/community/qbittorrent/1.0.21/charts/common-1.1.0.tgz b/community/qbittorrent/1.0.21/charts/common-1.1.0.tgz deleted file mode 100644 index 47d1ba1b30..0000000000 Binary files a/community/qbittorrent/1.0.21/charts/common-1.1.0.tgz and /dev/null differ diff --git a/community/qbittorrent/1.0.21/ci/basic-values.yaml b/community/qbittorrent/1.0.21/ci/basic-values.yaml deleted file mode 100644 index abb2549d2e..0000000000 --- a/community/qbittorrent/1.0.21/ci/basic-values.yaml +++ /dev/null @@ -1,17 +0,0 @@ -qbitNetwork: - webPort: 31000 - btPort: 32444 - -qbitRunAs: - user: 1000 - group: 1000 - -qbitStorage: - downloads: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/downloads - datasetName: "" - config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config - datasetName: "" diff --git a/community/qbittorrent/1.0.21/ci/hostNet-values.yaml b/community/qbittorrent/1.0.21/ci/hostNet-values.yaml deleted file mode 100644 index 0a6906efbb..0000000000 --- a/community/qbittorrent/1.0.21/ci/hostNet-values.yaml +++ /dev/null @@ -1,14 +0,0 @@ -qbitNetwork: - webPort: 30000 - btPort: 32555 - hostNetwork: true - -qbitStorage: - downloads: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/downloads - datasetName: "" - config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config - datasetName: "" diff --git a/community/qbittorrent/1.0.22/Chart.lock b/community/qbittorrent/1.0.22/Chart.lock new file mode 100644 index 0000000000..ecddc9bc9f --- /dev/null +++ b/community/qbittorrent/1.0.22/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../common + version: 1.1.1 +digest: sha256:a7dbe3e4d42dbcd4325776e5e01a1d630c7f185f79e7ebf22b1b9cc80f56eed7 +generated: "2023-10-10T14:21:08.770619275+03:00" diff --git a/community/qbittorrent/1.0.21/Chart.yaml b/community/qbittorrent/1.0.22/Chart.yaml similarity index 95% rename from community/qbittorrent/1.0.21/Chart.yaml rename to community/qbittorrent/1.0.22/Chart.yaml index 19d6dabf0a..593ce8e1e4 100644 --- a/community/qbittorrent/1.0.21/Chart.yaml +++ b/community/qbittorrent/1.0.22/Chart.yaml @@ -4,7 +4,7 @@ description: The qBittorrent project aims to provide an open-source software alt annotations: title: qBittorrent type: application -version: 1.0.21 +version: 1.0.22 apiVersion: v2 appVersion: 4.5.5 kubeVersion: '>=1.16.0-0' @@ -15,7 +15,7 @@ maintainers: dependencies: - name: common repository: file://../../../common - version: 1.1.0 + version: 1.1.1 home: https://www.qbittorrent.org/ icon: https://upload.wikimedia.org/wikipedia/commons/9/9e/Qbittorrent_logo.png sources: diff --git a/community/qbittorrent/1.0.21/README.md b/community/qbittorrent/1.0.22/README.md similarity index 100% rename from community/qbittorrent/1.0.21/README.md rename to community/qbittorrent/1.0.22/README.md diff --git a/community/qbittorrent/1.0.21/app-readme.md b/community/qbittorrent/1.0.22/app-readme.md similarity index 100% rename from community/qbittorrent/1.0.21/app-readme.md rename to community/qbittorrent/1.0.22/app-readme.md diff --git a/community/qbittorrent/1.0.22/charts/common-1.1.1.tgz b/community/qbittorrent/1.0.22/charts/common-1.1.1.tgz new file mode 100644 index 0000000000..bb20dd19db Binary files /dev/null and b/community/qbittorrent/1.0.22/charts/common-1.1.1.tgz differ diff --git a/community/qbittorrent/1.0.22/ci/basic-values.yaml b/community/qbittorrent/1.0.22/ci/basic-values.yaml new file mode 100644 index 0000000000..5ab9ab59b2 --- /dev/null +++ b/community/qbittorrent/1.0.22/ci/basic-values.yaml @@ -0,0 +1,13 @@ +qbitNetwork: + webPort: 31000 + btPort: 32444 + +qbitRunAs: + user: 1000 + group: 1000 + +qbitStorage: + downloads: + type: pvc + config: + type: pvc diff --git a/community/qbittorrent/1.0.21/ci/extra-env-values.yaml b/community/qbittorrent/1.0.22/ci/extra-values.yaml similarity index 53% rename from community/qbittorrent/1.0.21/ci/extra-env-values.yaml rename to community/qbittorrent/1.0.22/ci/extra-values.yaml index aafc675a72..b5602f4d01 100644 --- a/community/qbittorrent/1.0.21/ci/extra-env-values.yaml +++ b/community/qbittorrent/1.0.22/ci/extra-values.yaml @@ -11,10 +11,11 @@ qbitNetwork: qbitStorage: downloads: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/downloads - datasetName: "" + type: pvc config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config - datasetName: "" + type: pvc + additionalStorages: + - type: pvc + mountPath: /action_movies + - type: pvc + mountPath: /adventure_movies diff --git a/community/qbittorrent/1.0.22/ci/hostNet-values.yaml b/community/qbittorrent/1.0.22/ci/hostNet-values.yaml new file mode 100644 index 0000000000..10cdf2b95b --- /dev/null +++ b/community/qbittorrent/1.0.22/ci/hostNet-values.yaml @@ -0,0 +1,10 @@ +qbitNetwork: + webPort: 30000 + btPort: 32555 + hostNetwork: true + +qbitStorage: + downloads: + type: pvc + config: + type: pvc diff --git a/community/qbittorrent/1.0.21/ix_values.yaml b/community/qbittorrent/1.0.22/ix_values.yaml similarity index 95% rename from community/qbittorrent/1.0.21/ix_values.yaml rename to community/qbittorrent/1.0.22/ix_values.yaml index 5addb92490..a49d1c6767 100644 --- a/community/qbittorrent/1.0.21/ix_values.yaml +++ b/community/qbittorrent/1.0.22/ix_values.yaml @@ -24,6 +24,7 @@ qbitStorage: config: type: ixVolume datasetName: config + additionalStorages: [] notes: custom: | diff --git a/community/qbittorrent/1.0.21/metadata.yaml b/community/qbittorrent/1.0.22/metadata.yaml similarity index 100% rename from community/qbittorrent/1.0.21/metadata.yaml rename to community/qbittorrent/1.0.22/metadata.yaml diff --git a/community/qbittorrent/1.0.21/migrations/migrate b/community/qbittorrent/1.0.22/migrations/migrate similarity index 100% rename from community/qbittorrent/1.0.21/migrations/migrate rename to community/qbittorrent/1.0.22/migrations/migrate diff --git a/community/qbittorrent/1.0.21/questions.yaml b/community/qbittorrent/1.0.22/questions.yaml similarity index 77% rename from community/qbittorrent/1.0.21/questions.yaml rename to community/qbittorrent/1.0.22/questions.yaml index 07aafbd84d..f2f4a52255 100644 --- a/community/qbittorrent/1.0.21/questions.yaml +++ b/community/qbittorrent/1.0.22/questions.yaml @@ -187,6 +187,56 @@ questions: show_if: [["type", "=", "hostPath"]] immutable: true required: true + - variable: additionalStorages + label: Additional Storage + description: qBittorrent additional storage + 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. + schema: + type: string + required: 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: 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. + schema: + type: hostpath + show_if: [["type", "=", "hostPath"]] + required: true + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + show_if: [["type", "=", "ixVolume"]] + required: true + immutable: true + default: "storage_entry" + $ref: + - "normalize/ixVolume" - variable: resources label: Resources Configuration diff --git a/community/qbittorrent/1.0.21/templates/NOTES.txt b/community/qbittorrent/1.0.22/templates/NOTES.txt similarity index 100% rename from community/qbittorrent/1.0.21/templates/NOTES.txt rename to community/qbittorrent/1.0.22/templates/NOTES.txt diff --git a/community/qbittorrent/1.0.21/templates/_configuration.tpl b/community/qbittorrent/1.0.22/templates/_configuration.tpl similarity index 100% rename from community/qbittorrent/1.0.21/templates/_configuration.tpl rename to community/qbittorrent/1.0.22/templates/_configuration.tpl diff --git a/community/qbittorrent/1.0.21/templates/_portal.tpl b/community/qbittorrent/1.0.22/templates/_portal.tpl similarity index 100% rename from community/qbittorrent/1.0.21/templates/_portal.tpl rename to community/qbittorrent/1.0.22/templates/_portal.tpl diff --git a/community/qbittorrent/1.0.21/templates/_qbittorrent.tpl b/community/qbittorrent/1.0.22/templates/_qbittorrent.tpl similarity index 87% rename from community/qbittorrent/1.0.21/templates/_qbittorrent.tpl rename to community/qbittorrent/1.0.22/templates/_qbittorrent.tpl index 4926d59c28..aaab934d35 100644 --- a/community/qbittorrent/1.0.21/templates/_qbittorrent.tpl +++ b/community/qbittorrent/1.0.22/templates/_qbittorrent.tpl @@ -104,4 +104,17 @@ persistence: mountPath: /downloads 01-permissions: mountPath: /mnt/directories/downloads + {{- range $idx, $storage := .Values.qbitStorage.additionalStorages }} + {{ printf "qbittorrent-%v" (int $idx) }}: + enabled: true + type: {{ $storage.type }} + datasetName: {{ $storage.datasetName | default "" }} + hostPath: {{ $storage.hostPath | default "" }} + targetSelector: + qbittorrent: + qbittorrent: + mountPath: {{ $storage.mountPath }} + 01-permissions: + mountPath: /mnt/directories/{{ printf "qbittorrent-%v" (int $idx) }} + {{- end }} {{- end -}} diff --git a/community/qbittorrent/1.0.21/templates/common.yaml b/community/qbittorrent/1.0.22/templates/common.yaml similarity index 100% rename from community/qbittorrent/1.0.21/templates/common.yaml rename to community/qbittorrent/1.0.22/templates/common.yaml