diff --git a/community/homarr/2.0.5/Chart.lock b/community/homarr/2.0.6/Chart.lock similarity index 100% rename from community/homarr/2.0.5/Chart.lock rename to community/homarr/2.0.6/Chart.lock diff --git a/community/homarr/2.0.5/Chart.yaml b/community/homarr/2.0.6/Chart.yaml similarity index 88% rename from community/homarr/2.0.5/Chart.yaml rename to community/homarr/2.0.6/Chart.yaml index 43cad1f24e..9efab553d6 100644 --- a/community/homarr/2.0.5/Chart.yaml +++ b/community/homarr/2.0.6/Chart.yaml @@ -1,11 +1,12 @@ name: homarr -description: Homarr is a sleek, modern dashboard that puts all of your apps and services at your fingertips. +description: Homarr is a sleek, modern dashboard that puts all of your apps and services + at your fingertips. annotations: title: Homarr type: application -version: 2.0.5 +version: 2.0.6 apiVersion: v2 -appVersion: 0.14.2 +appVersion: 0.14.3 kubeVersion: '>=1.16.0-0' maintainers: - name: truenas diff --git a/community/homarr/2.0.5/README.md b/community/homarr/2.0.6/README.md similarity index 100% rename from community/homarr/2.0.5/README.md rename to community/homarr/2.0.6/README.md diff --git a/community/homarr/2.0.5/app-readme.md b/community/homarr/2.0.6/app-readme.md similarity index 100% rename from community/homarr/2.0.5/app-readme.md rename to community/homarr/2.0.6/app-readme.md diff --git a/community/homarr/2.0.5/charts/common-1.2.6.tgz b/community/homarr/2.0.6/charts/common-1.2.6.tgz similarity index 100% rename from community/homarr/2.0.5/charts/common-1.2.6.tgz rename to community/homarr/2.0.6/charts/common-1.2.6.tgz diff --git a/community/homarr/2.0.5/ci/basic-values.yaml b/community/homarr/2.0.6/ci/basic-values.yaml similarity index 100% rename from community/homarr/2.0.5/ci/basic-values.yaml rename to community/homarr/2.0.6/ci/basic-values.yaml diff --git a/community/homarr/2.0.5/ci/extra-values.yaml b/community/homarr/2.0.6/ci/extra-values.yaml similarity index 100% rename from community/homarr/2.0.5/ci/extra-values.yaml rename to community/homarr/2.0.6/ci/extra-values.yaml diff --git a/community/homarr/2.0.5/ci/hostNet-values.yaml b/community/homarr/2.0.6/ci/hostNet-values.yaml similarity index 100% rename from community/homarr/2.0.5/ci/hostNet-values.yaml rename to community/homarr/2.0.6/ci/hostNet-values.yaml diff --git a/community/homarr/2.0.5/ix_values.yaml b/community/homarr/2.0.6/ix_values.yaml similarity index 97% rename from community/homarr/2.0.5/ix_values.yaml rename to community/homarr/2.0.6/ix_values.yaml index 8200085297..3d1f323a48 100644 --- a/community/homarr/2.0.5/ix_values.yaml +++ b/community/homarr/2.0.6/ix_values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/ajnart/homarr pullPolicy: IfNotPresent - tag: 0.14.2 + tag: 0.14.3 resources: limits: diff --git a/community/homarr/2.0.5/metadata.yaml b/community/homarr/2.0.6/metadata.yaml similarity index 100% rename from community/homarr/2.0.5/metadata.yaml rename to community/homarr/2.0.6/metadata.yaml diff --git a/community/homarr/2.0.5/questions.yaml b/community/homarr/2.0.6/questions.yaml similarity index 100% rename from community/homarr/2.0.5/questions.yaml rename to community/homarr/2.0.6/questions.yaml diff --git a/community/homarr/2.0.5/templates/NOTES.txt b/community/homarr/2.0.6/templates/NOTES.txt similarity index 100% rename from community/homarr/2.0.5/templates/NOTES.txt rename to community/homarr/2.0.6/templates/NOTES.txt diff --git a/community/homarr/2.0.5/templates/_configuration.tpl b/community/homarr/2.0.6/templates/_configuration.tpl similarity index 100% rename from community/homarr/2.0.5/templates/_configuration.tpl rename to community/homarr/2.0.6/templates/_configuration.tpl diff --git a/community/homarr/2.0.5/templates/_homarr.tpl b/community/homarr/2.0.6/templates/_homarr.tpl similarity index 100% rename from community/homarr/2.0.5/templates/_homarr.tpl rename to community/homarr/2.0.6/templates/_homarr.tpl diff --git a/community/homarr/2.0.5/templates/_persistence.tpl b/community/homarr/2.0.6/templates/_persistence.tpl similarity index 100% rename from community/homarr/2.0.5/templates/_persistence.tpl rename to community/homarr/2.0.6/templates/_persistence.tpl diff --git a/community/homarr/2.0.5/templates/_portal.tpl b/community/homarr/2.0.6/templates/_portal.tpl similarity index 100% rename from community/homarr/2.0.5/templates/_portal.tpl rename to community/homarr/2.0.6/templates/_portal.tpl diff --git a/community/homarr/2.0.5/templates/_service.tpl b/community/homarr/2.0.6/templates/_service.tpl similarity index 100% rename from community/homarr/2.0.5/templates/_service.tpl rename to community/homarr/2.0.6/templates/_service.tpl diff --git a/community/homarr/2.0.5/templates/common.yaml b/community/homarr/2.0.6/templates/common.yaml similarity index 100% rename from community/homarr/2.0.5/templates/common.yaml rename to community/homarr/2.0.6/templates/common.yaml diff --git a/community/metube/1.2.1/Chart.lock b/community/metube/1.2.2/Chart.lock similarity index 100% rename from community/metube/1.2.1/Chart.lock rename to community/metube/1.2.2/Chart.lock diff --git a/community/metube/1.2.1/Chart.yaml b/community/metube/1.2.2/Chart.yaml similarity index 93% rename from community/metube/1.2.1/Chart.yaml rename to community/metube/1.2.2/Chart.yaml index c73c23f106..ced14ccd2b 100644 --- a/community/metube/1.2.1/Chart.yaml +++ b/community/metube/1.2.2/Chart.yaml @@ -4,9 +4,9 @@ description: MeTube is a web GUI for youtube-dl (using the yt-dlp fork) with pla annotations: title: MeTube type: application -version: 1.2.1 +version: 1.2.2 apiVersion: v2 -appVersion: '2023-12-30' +appVersion: '2023-12-31' kubeVersion: '>=1.16.0-0' maintainers: - name: truenas diff --git a/community/metube/1.2.1/README.md b/community/metube/1.2.2/README.md similarity index 100% rename from community/metube/1.2.1/README.md rename to community/metube/1.2.2/README.md diff --git a/community/metube/1.2.1/app-readme.md b/community/metube/1.2.2/app-readme.md similarity index 100% rename from community/metube/1.2.1/app-readme.md rename to community/metube/1.2.2/app-readme.md diff --git a/community/metube/1.2.1/charts/common-1.2.6.tgz b/community/metube/1.2.2/charts/common-1.2.6.tgz similarity index 100% rename from community/metube/1.2.1/charts/common-1.2.6.tgz rename to community/metube/1.2.2/charts/common-1.2.6.tgz diff --git a/community/metube/1.2.1/ci/basic-values.yaml b/community/metube/1.2.2/ci/basic-values.yaml similarity index 100% rename from community/metube/1.2.1/ci/basic-values.yaml rename to community/metube/1.2.2/ci/basic-values.yaml diff --git a/community/metube/1.2.1/ci/extra-values.yaml b/community/metube/1.2.2/ci/extra-values.yaml similarity index 100% rename from community/metube/1.2.1/ci/extra-values.yaml rename to community/metube/1.2.2/ci/extra-values.yaml diff --git a/community/metube/1.2.1/ci/hostNet-values.yaml b/community/metube/1.2.2/ci/hostNet-values.yaml similarity index 100% rename from community/metube/1.2.1/ci/hostNet-values.yaml rename to community/metube/1.2.2/ci/hostNet-values.yaml diff --git a/community/metube/1.2.1/ix_values.yaml b/community/metube/1.2.2/ix_values.yaml similarity index 95% rename from community/metube/1.2.1/ix_values.yaml rename to community/metube/1.2.2/ix_values.yaml index e480dbba19..89abb80d39 100644 --- a/community/metube/1.2.1/ix_values.yaml +++ b/community/metube/1.2.2/ix_values.yaml @@ -1,7 +1,7 @@ image: repository: alexta69/metube pullPolicy: IfNotPresent - tag: '2023-12-30' + tag: '2023-12-31' resources: limits: diff --git a/community/metube/1.2.1/metadata.yaml b/community/metube/1.2.2/metadata.yaml similarity index 100% rename from community/metube/1.2.1/metadata.yaml rename to community/metube/1.2.2/metadata.yaml diff --git a/community/metube/1.2.1/migrations/migrate b/community/metube/1.2.2/migrations/migrate similarity index 100% rename from community/metube/1.2.1/migrations/migrate rename to community/metube/1.2.2/migrations/migrate diff --git a/community/metube/1.2.1/questions.yaml b/community/metube/1.2.2/questions.yaml similarity index 100% rename from community/metube/1.2.1/questions.yaml rename to community/metube/1.2.2/questions.yaml diff --git a/community/metube/1.2.1/templates/NOTES.txt b/community/metube/1.2.2/templates/NOTES.txt similarity index 100% rename from community/metube/1.2.1/templates/NOTES.txt rename to community/metube/1.2.2/templates/NOTES.txt diff --git a/community/metube/1.2.1/templates/_metube.tpl b/community/metube/1.2.2/templates/_metube.tpl similarity index 100% rename from community/metube/1.2.1/templates/_metube.tpl rename to community/metube/1.2.2/templates/_metube.tpl diff --git a/community/metube/1.2.1/templates/_persistence.tpl b/community/metube/1.2.2/templates/_persistence.tpl similarity index 100% rename from community/metube/1.2.1/templates/_persistence.tpl rename to community/metube/1.2.2/templates/_persistence.tpl diff --git a/community/metube/1.2.1/templates/_portal.tpl b/community/metube/1.2.2/templates/_portal.tpl similarity index 100% rename from community/metube/1.2.1/templates/_portal.tpl rename to community/metube/1.2.2/templates/_portal.tpl diff --git a/community/metube/1.2.1/templates/_service.tpl b/community/metube/1.2.2/templates/_service.tpl similarity index 100% rename from community/metube/1.2.1/templates/_service.tpl rename to community/metube/1.2.2/templates/_service.tpl diff --git a/community/metube/1.2.1/templates/common.yaml b/community/metube/1.2.2/templates/common.yaml similarity index 100% rename from community/metube/1.2.1/templates/common.yaml rename to community/metube/1.2.2/templates/common.yaml diff --git a/community/prowlarr/1.2.7/Chart.lock b/community/prowlarr/1.2.8/Chart.lock similarity index 100% rename from community/prowlarr/1.2.7/Chart.lock rename to community/prowlarr/1.2.8/Chart.lock diff --git a/community/prowlarr/1.2.7/Chart.yaml b/community/prowlarr/1.2.8/Chart.yaml similarity index 90% rename from community/prowlarr/1.2.7/Chart.yaml rename to community/prowlarr/1.2.8/Chart.yaml index 1c58e521f2..05768d719a 100644 --- a/community/prowlarr/1.2.7/Chart.yaml +++ b/community/prowlarr/1.2.8/Chart.yaml @@ -1,11 +1,12 @@ name: prowlarr -description: Prowlarr is an indexer manager/proxy to integrate with your various PVR apps. +description: Prowlarr is an indexer manager/proxy to integrate with your various PVR + apps. annotations: title: Prowlarr type: application -version: 1.2.7 +version: 1.2.8 apiVersion: v2 -appVersion: 1.11.3.4163 +appVersion: 1.11.4.4173 kubeVersion: '>=1.16.0-0' maintainers: - name: truenas diff --git a/community/prowlarr/1.2.7/README.md b/community/prowlarr/1.2.8/README.md similarity index 100% rename from community/prowlarr/1.2.7/README.md rename to community/prowlarr/1.2.8/README.md diff --git a/community/prowlarr/1.2.7/app-readme.md b/community/prowlarr/1.2.8/app-readme.md similarity index 100% rename from community/prowlarr/1.2.7/app-readme.md rename to community/prowlarr/1.2.8/app-readme.md diff --git a/community/prowlarr/1.2.7/charts/common-1.2.6.tgz b/community/prowlarr/1.2.8/charts/common-1.2.6.tgz similarity index 100% rename from community/prowlarr/1.2.7/charts/common-1.2.6.tgz rename to community/prowlarr/1.2.8/charts/common-1.2.6.tgz diff --git a/community/prowlarr/1.2.7/ci/basic-values.yaml b/community/prowlarr/1.2.8/ci/basic-values.yaml similarity index 100% rename from community/prowlarr/1.2.7/ci/basic-values.yaml rename to community/prowlarr/1.2.8/ci/basic-values.yaml diff --git a/community/prowlarr/1.2.7/ci/extra-values.yaml b/community/prowlarr/1.2.8/ci/extra-values.yaml similarity index 100% rename from community/prowlarr/1.2.7/ci/extra-values.yaml rename to community/prowlarr/1.2.8/ci/extra-values.yaml diff --git a/community/prowlarr/1.2.7/ci/hostNet-values.yaml b/community/prowlarr/1.2.8/ci/hostNet-values.yaml similarity index 100% rename from community/prowlarr/1.2.7/ci/hostNet-values.yaml rename to community/prowlarr/1.2.8/ci/hostNet-values.yaml diff --git a/community/prowlarr/1.2.7/ix_values.yaml b/community/prowlarr/1.2.8/ix_values.yaml similarity index 95% rename from community/prowlarr/1.2.7/ix_values.yaml rename to community/prowlarr/1.2.8/ix_values.yaml index 21f446d464..37a38c3c67 100644 --- a/community/prowlarr/1.2.7/ix_values.yaml +++ b/community/prowlarr/1.2.8/ix_values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/onedr0p/prowlarr-develop pullPolicy: IfNotPresent - tag: 1.11.3.4163 + tag: 1.11.4.4173 resources: limits: diff --git a/community/prowlarr/1.2.7/metadata.yaml b/community/prowlarr/1.2.8/metadata.yaml similarity index 100% rename from community/prowlarr/1.2.7/metadata.yaml rename to community/prowlarr/1.2.8/metadata.yaml diff --git a/community/prowlarr/1.2.7/migrations/migrate b/community/prowlarr/1.2.8/migrations/migrate similarity index 100% rename from community/prowlarr/1.2.7/migrations/migrate rename to community/prowlarr/1.2.8/migrations/migrate diff --git a/community/prowlarr/1.2.7/questions.yaml b/community/prowlarr/1.2.8/questions.yaml similarity index 100% rename from community/prowlarr/1.2.7/questions.yaml rename to community/prowlarr/1.2.8/questions.yaml diff --git a/community/prowlarr/1.2.7/templates/NOTES.txt b/community/prowlarr/1.2.8/templates/NOTES.txt similarity index 100% rename from community/prowlarr/1.2.7/templates/NOTES.txt rename to community/prowlarr/1.2.8/templates/NOTES.txt diff --git a/community/prowlarr/1.2.7/templates/_persistence.tpl b/community/prowlarr/1.2.8/templates/_persistence.tpl similarity index 100% rename from community/prowlarr/1.2.7/templates/_persistence.tpl rename to community/prowlarr/1.2.8/templates/_persistence.tpl diff --git a/community/prowlarr/1.2.7/templates/_portal.tpl b/community/prowlarr/1.2.8/templates/_portal.tpl similarity index 100% rename from community/prowlarr/1.2.7/templates/_portal.tpl rename to community/prowlarr/1.2.8/templates/_portal.tpl diff --git a/community/prowlarr/1.2.7/templates/_prowlarr.tpl b/community/prowlarr/1.2.8/templates/_prowlarr.tpl similarity index 100% rename from community/prowlarr/1.2.7/templates/_prowlarr.tpl rename to community/prowlarr/1.2.8/templates/_prowlarr.tpl diff --git a/community/prowlarr/1.2.7/templates/_service.tpl b/community/prowlarr/1.2.8/templates/_service.tpl similarity index 100% rename from community/prowlarr/1.2.7/templates/_service.tpl rename to community/prowlarr/1.2.8/templates/_service.tpl diff --git a/community/prowlarr/1.2.7/templates/common.yaml b/community/prowlarr/1.2.8/templates/common.yaml similarity index 100% rename from community/prowlarr/1.2.7/templates/common.yaml rename to community/prowlarr/1.2.8/templates/common.yaml diff --git a/community/readarr/1.2.5/Chart.lock b/community/readarr/1.2.6/Chart.lock similarity index 100% rename from community/readarr/1.2.5/Chart.lock rename to community/readarr/1.2.6/Chart.lock diff --git a/community/readarr/1.2.5/Chart.yaml b/community/readarr/1.2.6/Chart.yaml similarity index 90% rename from community/readarr/1.2.5/Chart.yaml rename to community/readarr/1.2.6/Chart.yaml index 7dd23752f3..3a8554edff 100644 --- a/community/readarr/1.2.5/Chart.yaml +++ b/community/readarr/1.2.6/Chart.yaml @@ -1,11 +1,12 @@ name: readarr -description: Readarr is an ebook and audiobook collection manager for Usenet and BitTorrent users. +description: Readarr is an ebook and audiobook collection manager for Usenet and BitTorrent + users. annotations: title: Readarr type: application -version: 1.2.5 +version: 1.2.6 apiVersion: v2 -appVersion: 0.3.13.2338 +appVersion: 0.3.14.2348 kubeVersion: '>=1.16.0-0' maintainers: - name: truenas diff --git a/community/readarr/1.2.5/README.md b/community/readarr/1.2.6/README.md similarity index 100% rename from community/readarr/1.2.5/README.md rename to community/readarr/1.2.6/README.md diff --git a/community/readarr/1.2.5/app-readme.md b/community/readarr/1.2.6/app-readme.md similarity index 100% rename from community/readarr/1.2.5/app-readme.md rename to community/readarr/1.2.6/app-readme.md diff --git a/community/readarr/1.2.5/charts/common-1.2.6.tgz b/community/readarr/1.2.6/charts/common-1.2.6.tgz similarity index 100% rename from community/readarr/1.2.5/charts/common-1.2.6.tgz rename to community/readarr/1.2.6/charts/common-1.2.6.tgz diff --git a/community/readarr/1.2.5/ci/basic-values.yaml b/community/readarr/1.2.6/ci/basic-values.yaml similarity index 100% rename from community/readarr/1.2.5/ci/basic-values.yaml rename to community/readarr/1.2.6/ci/basic-values.yaml diff --git a/community/readarr/1.2.5/ci/extra-values.yaml b/community/readarr/1.2.6/ci/extra-values.yaml similarity index 100% rename from community/readarr/1.2.5/ci/extra-values.yaml rename to community/readarr/1.2.6/ci/extra-values.yaml diff --git a/community/readarr/1.2.5/ci/hostNet-values.yaml b/community/readarr/1.2.6/ci/hostNet-values.yaml similarity index 100% rename from community/readarr/1.2.5/ci/hostNet-values.yaml rename to community/readarr/1.2.6/ci/hostNet-values.yaml diff --git a/community/readarr/1.2.5/ix_values.yaml b/community/readarr/1.2.6/ix_values.yaml similarity index 95% rename from community/readarr/1.2.5/ix_values.yaml rename to community/readarr/1.2.6/ix_values.yaml index d6f1bee271..c5f0e867eb 100644 --- a/community/readarr/1.2.5/ix_values.yaml +++ b/community/readarr/1.2.6/ix_values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/onedr0p/readarr-develop pullPolicy: IfNotPresent - tag: 0.3.13.2338 + tag: 0.3.14.2348 resources: limits: diff --git a/community/readarr/1.2.5/metadata.yaml b/community/readarr/1.2.6/metadata.yaml similarity index 100% rename from community/readarr/1.2.5/metadata.yaml rename to community/readarr/1.2.6/metadata.yaml diff --git a/community/readarr/1.2.5/migrations/migrate b/community/readarr/1.2.6/migrations/migrate similarity index 100% rename from community/readarr/1.2.5/migrations/migrate rename to community/readarr/1.2.6/migrations/migrate diff --git a/community/readarr/1.2.5/questions.yaml b/community/readarr/1.2.6/questions.yaml similarity index 100% rename from community/readarr/1.2.5/questions.yaml rename to community/readarr/1.2.6/questions.yaml diff --git a/community/readarr/1.2.5/templates/NOTES.txt b/community/readarr/1.2.6/templates/NOTES.txt similarity index 100% rename from community/readarr/1.2.5/templates/NOTES.txt rename to community/readarr/1.2.6/templates/NOTES.txt diff --git a/community/readarr/1.2.5/templates/_persistence.tpl b/community/readarr/1.2.6/templates/_persistence.tpl similarity index 100% rename from community/readarr/1.2.5/templates/_persistence.tpl rename to community/readarr/1.2.6/templates/_persistence.tpl diff --git a/community/readarr/1.2.5/templates/_portal.tpl b/community/readarr/1.2.6/templates/_portal.tpl similarity index 100% rename from community/readarr/1.2.5/templates/_portal.tpl rename to community/readarr/1.2.6/templates/_portal.tpl diff --git a/community/readarr/1.2.5/templates/_readarr.tpl b/community/readarr/1.2.6/templates/_readarr.tpl similarity index 100% rename from community/readarr/1.2.5/templates/_readarr.tpl rename to community/readarr/1.2.6/templates/_readarr.tpl diff --git a/community/readarr/1.2.5/templates/_service.tpl b/community/readarr/1.2.6/templates/_service.tpl similarity index 100% rename from community/readarr/1.2.5/templates/_service.tpl rename to community/readarr/1.2.6/templates/_service.tpl diff --git a/community/readarr/1.2.5/templates/common.yaml b/community/readarr/1.2.6/templates/common.yaml similarity index 100% rename from community/readarr/1.2.5/templates/common.yaml rename to community/readarr/1.2.6/templates/common.yaml diff --git a/community/rust-desk/1.1.8/templates/_persistence.tpl b/community/rust-desk/1.1.8/templates/_persistence.tpl deleted file mode 100644 index 4e073b3e80..0000000000 --- a/community/rust-desk/1.1.8/templates/_persistence.tpl +++ /dev/null @@ -1,47 +0,0 @@ -{{- define "rust.persistence" -}} -persistence: - data: - enabled: true - type: {{ .Values.rustStorage.data.type }} - datasetName: {{ .Values.rustStorage.data.datasetName | default "" }} - hostPath: {{ .Values.rustStorage.data.hostPath | default "" }} - targetSelector: - server: - server: - mountPath: /root - 01-permissions: - mountPath: /mnt/directories/data - relay: - relay: - mountPath: /root - {{- range $idx, $storage := .Values.rustStorage.additionalStorages }} - {{ printf "rust-%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: - server: - server: - mountPath: {{ $storage.mountPath }} - 01-permissions: - mountPath: /mnt/directories{{ $storage.mountPath }} - relay: - relay: - mountPath: {{ $storage.mountPath }} - {{- end }} -{{- end -}} diff --git a/community/rust-desk/1.1.8/Chart.lock b/community/rust-desk/1.2.0/Chart.lock similarity index 100% rename from community/rust-desk/1.1.8/Chart.lock rename to community/rust-desk/1.2.0/Chart.lock diff --git a/community/rust-desk/1.1.8/Chart.yaml b/community/rust-desk/1.2.0/Chart.yaml similarity index 97% rename from community/rust-desk/1.1.8/Chart.yaml rename to community/rust-desk/1.2.0/Chart.yaml index 72b9a5a2ff..0b7fdee737 100644 --- a/community/rust-desk/1.1.8/Chart.yaml +++ b/community/rust-desk/1.2.0/Chart.yaml @@ -3,7 +3,7 @@ description: Rust Desk is an open-source remote desktop, and alternative to Team annotations: title: Rust Desk type: application -version: 1.1.8 +version: 1.2.0 apiVersion: v2 appVersion: 1.1.9 kubeVersion: '>=1.16.0-0' diff --git a/community/rust-desk/1.1.8/README.md b/community/rust-desk/1.2.0/README.md similarity index 100% rename from community/rust-desk/1.1.8/README.md rename to community/rust-desk/1.2.0/README.md diff --git a/community/rust-desk/1.1.8/app-readme.md b/community/rust-desk/1.2.0/app-readme.md similarity index 100% rename from community/rust-desk/1.1.8/app-readme.md rename to community/rust-desk/1.2.0/app-readme.md diff --git a/community/rust-desk/1.1.8/charts/common-1.2.6.tgz b/community/rust-desk/1.2.0/charts/common-1.2.6.tgz similarity index 100% rename from community/rust-desk/1.1.8/charts/common-1.2.6.tgz rename to community/rust-desk/1.2.0/charts/common-1.2.6.tgz diff --git a/community/rust-desk/1.1.8/ci/basic-values.yaml b/community/rust-desk/1.2.0/ci/basic-values.yaml similarity index 76% rename from community/rust-desk/1.1.8/ci/basic-values.yaml rename to community/rust-desk/1.2.0/ci/basic-values.yaml index d6e1822e58..fabef6380d 100644 --- a/community/rust-desk/1.1.8/ci/basic-values.yaml +++ b/community/rust-desk/1.2.0/ci/basic-values.yaml @@ -1,7 +1,6 @@ rustStorage: data: - type: hostPath - hostPath: /mnt/{{ .Release.Name }}/data + type: pvc rustNetwork: natTypeTestPort: 31115 diff --git a/community/rust-desk/1.1.8/ci/only-encrypted-values.yaml b/community/rust-desk/1.2.0/ci/only-encrypted-values.yaml similarity index 80% rename from community/rust-desk/1.1.8/ci/only-encrypted-values.yaml rename to community/rust-desk/1.2.0/ci/only-encrypted-values.yaml index 26f85a6098..ca10ec39f8 100644 --- a/community/rust-desk/1.1.8/ci/only-encrypted-values.yaml +++ b/community/rust-desk/1.2.0/ci/only-encrypted-values.yaml @@ -1,7 +1,6 @@ rustStorage: data: - type: hostPath - hostPath: /mnt/{{ .Release.Name }}/data + type: pvc rustConfig: allowOnlyEncryptedConnections: true diff --git a/community/rust-desk/1.1.8/ix_values.yaml b/community/rust-desk/1.2.0/ix_values.yaml similarity index 92% rename from community/rust-desk/1.1.8/ix_values.yaml rename to community/rust-desk/1.2.0/ix_values.yaml index eabe9acdeb..194b99264f 100644 --- a/community/rust-desk/1.1.8/ix_values.yaml +++ b/community/rust-desk/1.2.0/ix_values.yaml @@ -29,5 +29,6 @@ rustRunAs: rustStorage: data: type: ixVolume - datasetName: data + ixVolumeConfig: + datasetName: data additionalStorages: [] diff --git a/community/rust-desk/1.1.8/metadata.yaml b/community/rust-desk/1.2.0/metadata.yaml similarity index 100% rename from community/rust-desk/1.1.8/metadata.yaml rename to community/rust-desk/1.2.0/metadata.yaml diff --git a/community/rust-desk/1.2.0/migrations/migrate b/community/rust-desk/1.2.0/migrations/migrate new file mode 100755 index 0000000000..d65e0f6415 --- /dev/null +++ b/community/rust-desk/1.2.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 = 'rustStorage' + storages = ['data'] + + 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/rust-desk/1.1.8/questions.yaml b/community/rust-desk/1.2.0/questions.yaml similarity index 63% rename from community/rust-desk/1.1.8/questions.yaml rename to community/rust-desk/1.2.0/questions.yaml index 2fb8c216db..7d6ad28e17 100644 --- a/community/rust-desk/1.1.8/questions.yaml +++ b/community/rust-desk/1.2.0/questions.yaml @@ -192,23 +192,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: "data" $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: "data" + - 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: additionalStorages label: Additional Storage description: Additional storage for Rust Desk. @@ -239,74 +280,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/rust-desk/1.1.8/templates/NOTES.txt b/community/rust-desk/1.2.0/templates/NOTES.txt similarity index 100% rename from community/rust-desk/1.1.8/templates/NOTES.txt rename to community/rust-desk/1.2.0/templates/NOTES.txt diff --git a/community/rust-desk/1.2.0/templates/_persistence.tpl b/community/rust-desk/1.2.0/templates/_persistence.tpl new file mode 100644 index 0000000000..5892de9abf --- /dev/null +++ b/community/rust-desk/1.2.0/templates/_persistence.tpl @@ -0,0 +1,50 @@ +{{- define "rust.persistence" -}} +persistence: + data: + enabled: true + type: {{ .Values.rustStorage.data.type }} + datasetName: {{ .Values.rustStorage.data.datasetName | default "" }} + hostPath: {{ .Values.rustStorage.data.hostPath | default "" }} + {{- include "rustdesk.storage.ci.migration" (dict "storage" .Values.rustStorage.data) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.rustStorage.data) | nindent 4 }} + targetSelector: + server: + server: + mountPath: /root + {{- if and (eq .Values.rustStorage.data.type "ixVolume") + (not (.Values.rustStorage.data.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories/data + {{- end }} + relay: + relay: + mountPath: /root + + {{- range $idx, $storage := .Values.rustStorage.additionalStorages }} + {{ printf "rust-%v" (int $idx) }}: + enabled: true + {{- include "rustdesk.storage.ci.migration" (dict "storage" $storage) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} + targetSelector: + server: + server: + mountPath: {{ $storage.mountPath }} + {{- if and (eq $storage.type "ixVolume") (not ($storage.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories{{ $storage.mountPath }} + {{- end }} + relay: + relay: + mountPath: {{ $storage.mountPath }} + {{- end }} +{{- end -}} + +{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}} +{{- define "rustdesk.storage.ci.migration" -}} + {{- $storage := .storage -}} + + {{- if $storage.hostPath -}} + {{- $_ := set $storage "hostPathConfig" dict -}} + {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}} + {{- end -}} +{{- end -}} diff --git a/community/rust-desk/1.1.8/templates/_rust-desk-relay.tpl b/community/rust-desk/1.2.0/templates/_rust-desk-relay.tpl similarity index 100% rename from community/rust-desk/1.1.8/templates/_rust-desk-relay.tpl rename to community/rust-desk/1.2.0/templates/_rust-desk-relay.tpl diff --git a/community/rust-desk/1.1.8/templates/_rust-desk-server.tpl b/community/rust-desk/1.2.0/templates/_rust-desk-server.tpl similarity index 98% rename from community/rust-desk/1.1.8/templates/_rust-desk-server.tpl rename to community/rust-desk/1.2.0/templates/_rust-desk-server.tpl index 32c4b03d3f..6c8ac5a673 100644 --- a/community/rust-desk/1.1.8/templates/_rust-desk-server.tpl +++ b/community/rust-desk/1.2.0/templates/_rust-desk-server.tpl @@ -51,5 +51,5 @@ workload: "UID" .Values.rustRunAs.user "GID" .Values.rustRunAs.group "mode" "check" - "type" "init") | nindent 8 }} + "type" "install") | nindent 8 }} {{- end -}} diff --git a/community/rust-desk/1.1.8/templates/_service.tpl b/community/rust-desk/1.2.0/templates/_service.tpl similarity index 100% rename from community/rust-desk/1.1.8/templates/_service.tpl rename to community/rust-desk/1.2.0/templates/_service.tpl diff --git a/community/rust-desk/1.1.8/templates/common.yaml b/community/rust-desk/1.2.0/templates/common.yaml similarity index 100% rename from community/rust-desk/1.1.8/templates/common.yaml rename to community/rust-desk/1.2.0/templates/common.yaml diff --git a/community/sabnzbd/1.1.7/templates/_persistence.tpl b/community/sabnzbd/1.1.7/templates/_persistence.tpl deleted file mode 100644 index 5f0f61ac69..0000000000 --- a/community/sabnzbd/1.1.7/templates/_persistence.tpl +++ /dev/null @@ -1,48 +0,0 @@ -{{- define "sabnzbd.persistence" -}} -persistence: - config: - enabled: true - type: {{ .Values.sabnzbdStorage.config.type }} - datasetName: {{ .Values.sabnzbdStorage.config.datasetName | default "" }} - hostPath: {{ .Values.sabnzbdStorage.config.hostPath | default "" }} - targetSelector: - sabnzbd: - sabnzbd: - mountPath: /config - 01-permissions: - mountPath: /mnt/directories/config - tmp: - enabled: true - type: emptyDir - targetSelector: - sabnzbd: - sabnzbd: - mountPath: /tmp - {{- range $idx, $storage := .Values.sabnzbdStorage.additionalStorages }} - {{ printf "sabnzbd-%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: - sabnzbd: - sabnzbd: - mountPath: {{ $storage.mountPath }} - 01-permissions: - mountPath: /mnt/directories{{ $storage.mountPath }} - {{- end }} -{{- end -}} diff --git a/community/sabnzbd/1.1.7/Chart.lock b/community/sabnzbd/1.2.0/Chart.lock similarity index 100% rename from community/sabnzbd/1.1.7/Chart.lock rename to community/sabnzbd/1.2.0/Chart.lock diff --git a/community/sabnzbd/1.1.7/Chart.yaml b/community/sabnzbd/1.2.0/Chart.yaml similarity index 97% rename from community/sabnzbd/1.1.7/Chart.yaml rename to community/sabnzbd/1.2.0/Chart.yaml index 5aa1167431..59462f5982 100644 --- a/community/sabnzbd/1.1.7/Chart.yaml +++ b/community/sabnzbd/1.2.0/Chart.yaml @@ -3,7 +3,7 @@ description: SABnzbd is an Open Source Binary Newsreader written in Python. annotations: title: SABnzbd type: application -version: 1.1.7 +version: 1.2.0 apiVersion: v2 appVersion: 4.1.0 kubeVersion: '>=1.16.0-0' diff --git a/community/sabnzbd/1.1.7/README.md b/community/sabnzbd/1.2.0/README.md similarity index 100% rename from community/sabnzbd/1.1.7/README.md rename to community/sabnzbd/1.2.0/README.md diff --git a/community/sabnzbd/1.1.7/app-readme.md b/community/sabnzbd/1.2.0/app-readme.md similarity index 100% rename from community/sabnzbd/1.1.7/app-readme.md rename to community/sabnzbd/1.2.0/app-readme.md diff --git a/community/sabnzbd/1.1.7/charts/common-1.2.6.tgz b/community/sabnzbd/1.2.0/charts/common-1.2.6.tgz similarity index 100% rename from community/sabnzbd/1.1.7/charts/common-1.2.6.tgz rename to community/sabnzbd/1.2.0/charts/common-1.2.6.tgz diff --git a/community/sabnzbd/1.1.7/ci/basic-values.yaml b/community/sabnzbd/1.2.0/ci/basic-values.yaml similarity index 59% rename from community/sabnzbd/1.1.7/ci/basic-values.yaml rename to community/sabnzbd/1.2.0/ci/basic-values.yaml index 741fdd3c4b..5dc2df13b2 100644 --- a/community/sabnzbd/1.1.7/ci/basic-values.yaml +++ b/community/sabnzbd/1.2.0/ci/basic-values.yaml @@ -7,5 +7,4 @@ sabnzbdRunAs: sabnzbdStorage: config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config + type: pvc diff --git a/community/sabnzbd/1.1.7/ci/extra-values.yaml b/community/sabnzbd/1.2.0/ci/extra-values.yaml similarity index 57% rename from community/sabnzbd/1.1.7/ci/extra-values.yaml rename to community/sabnzbd/1.2.0/ci/extra-values.yaml index 35dbf8a192..43b3fb1b7f 100644 --- a/community/sabnzbd/1.1.7/ci/extra-values.yaml +++ b/community/sabnzbd/1.2.0/ci/extra-values.yaml @@ -10,12 +10,9 @@ sabnzbdNetwork: sabnzbdStorage: config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config + type: pvc additionalStorages: - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data1 + - type: pvc mountPath: /data1 - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data2 + - type: pvc mountPath: /data2 diff --git a/community/sabnzbd/1.1.7/ci/hostNet-values.yaml b/community/sabnzbd/1.2.0/ci/hostNet-values.yaml similarity index 53% rename from community/sabnzbd/1.1.7/ci/hostNet-values.yaml rename to community/sabnzbd/1.2.0/ci/hostNet-values.yaml index a5b6605076..3ec3d8bed5 100644 --- a/community/sabnzbd/1.1.7/ci/hostNet-values.yaml +++ b/community/sabnzbd/1.2.0/ci/hostNet-values.yaml @@ -4,5 +4,4 @@ sabnzbdNetwork: sabnzbdStorage: config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config + type: pvc diff --git a/community/sabnzbd/1.1.7/ix_values.yaml b/community/sabnzbd/1.2.0/ix_values.yaml similarity index 88% rename from community/sabnzbd/1.1.7/ix_values.yaml rename to community/sabnzbd/1.2.0/ix_values.yaml index ecfce92403..9b4317d2b1 100644 --- a/community/sabnzbd/1.1.7/ix_values.yaml +++ b/community/sabnzbd/1.2.0/ix_values.yaml @@ -22,5 +22,6 @@ sabnzbdRunAs: sabnzbdStorage: config: type: ixVolume - datasetName: config + ixVolumeConfig: + datasetName: config additionalStorages: [] diff --git a/community/sabnzbd/1.1.7/metadata.yaml b/community/sabnzbd/1.2.0/metadata.yaml similarity index 100% rename from community/sabnzbd/1.1.7/metadata.yaml rename to community/sabnzbd/1.2.0/metadata.yaml diff --git a/community/sabnzbd/1.2.0/migrations/migrate b/community/sabnzbd/1.2.0/migrations/migrate new file mode 100755 index 0000000000..a573375639 --- /dev/null +++ b/community/sabnzbd/1.2.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 = 'sabnzbdStorage' + storages = ['config'] + + 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/sabnzbd/1.1.7/questions.yaml b/community/sabnzbd/1.2.0/questions.yaml similarity index 56% rename from community/sabnzbd/1.1.7/questions.yaml rename to community/sabnzbd/1.2.0/questions.yaml index a028095ef8..836bf9bad5 100644 --- a/community/sabnzbd/1.1.7/questions.yaml +++ b/community/sabnzbd/1.2.0/questions.yaml @@ -123,23 +123,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: additionalStorages label: Additional Storage description: Additional storage for SABnzbd. @@ -170,74 +211,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/sabnzbd/1.1.7/templates/NOTES.txt b/community/sabnzbd/1.2.0/templates/NOTES.txt similarity index 100% rename from community/sabnzbd/1.1.7/templates/NOTES.txt rename to community/sabnzbd/1.2.0/templates/NOTES.txt diff --git a/community/sabnzbd/1.2.0/templates/_persistence.tpl b/community/sabnzbd/1.2.0/templates/_persistence.tpl new file mode 100644 index 0000000000..4e9e2b9f99 --- /dev/null +++ b/community/sabnzbd/1.2.0/templates/_persistence.tpl @@ -0,0 +1,48 @@ +{{- define "sabnzbd.persistence" -}} +persistence: + config: + enabled: true + {{- include "sabnzbd.storage.ci.migration" (dict "storage" .Values.sabnzbdStorage.config) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.sabnzbdStorage.config) | nindent 4 }} + targetSelector: + sabnzbd: + sabnzbd: + mountPath: /config + {{- if and (eq .Values.sabnzbdStorage.config.type "ixVolume") + (not (.Values.sabnzbdStorage.config.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories/config + {{- end }} + tmp: + enabled: true + type: emptyDir + targetSelector: + sabnzbd: + sabnzbd: + mountPath: /tmp + + {{- range $idx, $storage := .Values.sabnzbdStorage.additionalStorages }} + {{ printf "sabnzbd-%v" (int $idx) }}: + enabled: true + {{- include "sabnzbd.storage.ci.migration" (dict "storage" $storage) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} + targetSelector: + sabnzbd: + sabnzbd: + 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 -}} + +{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}} +{{- define "sabnzbd.storage.ci.migration" -}} + {{- $storage := .storage -}} + + {{- if $storage.hostPath -}} + {{- $_ := set $storage "hostPathConfig" dict -}} + {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}} + {{- end -}} +{{- end -}} diff --git a/community/sabnzbd/1.1.7/templates/_portal.tpl b/community/sabnzbd/1.2.0/templates/_portal.tpl similarity index 100% rename from community/sabnzbd/1.1.7/templates/_portal.tpl rename to community/sabnzbd/1.2.0/templates/_portal.tpl diff --git a/community/sabnzbd/1.1.7/templates/_sabnzbd.tpl b/community/sabnzbd/1.2.0/templates/_sabnzbd.tpl similarity index 98% rename from community/sabnzbd/1.1.7/templates/_sabnzbd.tpl rename to community/sabnzbd/1.2.0/templates/_sabnzbd.tpl index 1299dadbeb..8e23818c41 100644 --- a/community/sabnzbd/1.1.7/templates/_sabnzbd.tpl +++ b/community/sabnzbd/1.2.0/templates/_sabnzbd.tpl @@ -44,5 +44,5 @@ workload: "UID" .Values.sabnzbdRunAs.user "GID" .Values.sabnzbdRunAs.group "mode" "check" - "type" "init") | nindent 8 }} + "type" "install") | nindent 8 }} {{- end -}} diff --git a/community/sabnzbd/1.1.7/templates/_service.tpl b/community/sabnzbd/1.2.0/templates/_service.tpl similarity index 100% rename from community/sabnzbd/1.1.7/templates/_service.tpl rename to community/sabnzbd/1.2.0/templates/_service.tpl diff --git a/community/sabnzbd/1.1.7/templates/common.yaml b/community/sabnzbd/1.2.0/templates/common.yaml similarity index 100% rename from community/sabnzbd/1.1.7/templates/common.yaml rename to community/sabnzbd/1.2.0/templates/common.yaml diff --git a/community/searxng/1.2.14/Chart.lock b/community/searxng/1.2.15/Chart.lock similarity index 100% rename from community/searxng/1.2.14/Chart.lock rename to community/searxng/1.2.15/Chart.lock diff --git a/community/searxng/1.2.14/Chart.yaml b/community/searxng/1.2.15/Chart.yaml similarity index 94% rename from community/searxng/1.2.14/Chart.yaml rename to community/searxng/1.2.15/Chart.yaml index 36f8e02821..dd0d304dcc 100644 --- a/community/searxng/1.2.14/Chart.yaml +++ b/community/searxng/1.2.15/Chart.yaml @@ -3,9 +3,9 @@ description: SearXNG is a privacy-respecting, hackable metasearch engine annotations: title: SearXNG type: application -version: 1.2.14 +version: 1.2.15 apiVersion: v2 -appVersion: 2023.12.29 +appVersion: 2023.12.31 kubeVersion: '>=1.16.0-0' maintainers: - name: truenas diff --git a/community/searxng/1.2.14/README.md b/community/searxng/1.2.15/README.md similarity index 100% rename from community/searxng/1.2.14/README.md rename to community/searxng/1.2.15/README.md diff --git a/community/searxng/1.2.14/app-readme.md b/community/searxng/1.2.15/app-readme.md similarity index 100% rename from community/searxng/1.2.14/app-readme.md rename to community/searxng/1.2.15/app-readme.md diff --git a/community/searxng/1.2.14/charts/common-1.2.6.tgz b/community/searxng/1.2.15/charts/common-1.2.6.tgz similarity index 100% rename from community/searxng/1.2.14/charts/common-1.2.6.tgz rename to community/searxng/1.2.15/charts/common-1.2.6.tgz diff --git a/community/searxng/1.2.14/ci/basic-values.yaml b/community/searxng/1.2.15/ci/basic-values.yaml similarity index 100% rename from community/searxng/1.2.14/ci/basic-values.yaml rename to community/searxng/1.2.15/ci/basic-values.yaml diff --git a/community/searxng/1.2.14/ci/extra-values.yaml b/community/searxng/1.2.15/ci/extra-values.yaml similarity index 100% rename from community/searxng/1.2.14/ci/extra-values.yaml rename to community/searxng/1.2.15/ci/extra-values.yaml diff --git a/community/searxng/1.2.14/ci/hostNet-values.yaml b/community/searxng/1.2.15/ci/hostNet-values.yaml similarity index 100% rename from community/searxng/1.2.14/ci/hostNet-values.yaml rename to community/searxng/1.2.15/ci/hostNet-values.yaml diff --git a/community/searxng/1.2.14/ix_values.yaml b/community/searxng/1.2.15/ix_values.yaml similarity index 92% rename from community/searxng/1.2.14/ix_values.yaml rename to community/searxng/1.2.15/ix_values.yaml index df9d3e7b53..fd551e9ac8 100644 --- a/community/searxng/1.2.14/ix_values.yaml +++ b/community/searxng/1.2.15/ix_values.yaml @@ -1,7 +1,7 @@ image: repository: searxng/searxng pullPolicy: IfNotPresent - tag: 2023.12.29-a8cc101c3 + tag: 2023.12.31-3535377c9 resources: limits: diff --git a/community/searxng/1.2.14/metadata.yaml b/community/searxng/1.2.15/metadata.yaml similarity index 100% rename from community/searxng/1.2.14/metadata.yaml rename to community/searxng/1.2.15/metadata.yaml diff --git a/community/searxng/1.2.14/migrations/migrate b/community/searxng/1.2.15/migrations/migrate similarity index 100% rename from community/searxng/1.2.14/migrations/migrate rename to community/searxng/1.2.15/migrations/migrate diff --git a/community/searxng/1.2.14/questions.yaml b/community/searxng/1.2.15/questions.yaml similarity index 100% rename from community/searxng/1.2.14/questions.yaml rename to community/searxng/1.2.15/questions.yaml diff --git a/community/searxng/1.2.14/templates/NOTES.txt b/community/searxng/1.2.15/templates/NOTES.txt similarity index 100% rename from community/searxng/1.2.14/templates/NOTES.txt rename to community/searxng/1.2.15/templates/NOTES.txt diff --git a/community/searxng/1.2.14/templates/_persistence.tpl b/community/searxng/1.2.15/templates/_persistence.tpl similarity index 100% rename from community/searxng/1.2.14/templates/_persistence.tpl rename to community/searxng/1.2.15/templates/_persistence.tpl diff --git a/community/searxng/1.2.14/templates/_portal.tpl b/community/searxng/1.2.15/templates/_portal.tpl similarity index 100% rename from community/searxng/1.2.14/templates/_portal.tpl rename to community/searxng/1.2.15/templates/_portal.tpl diff --git a/community/searxng/1.2.14/templates/_searxng.tpl b/community/searxng/1.2.15/templates/_searxng.tpl similarity index 100% rename from community/searxng/1.2.14/templates/_searxng.tpl rename to community/searxng/1.2.15/templates/_searxng.tpl diff --git a/community/searxng/1.2.14/templates/_service.tpl b/community/searxng/1.2.15/templates/_service.tpl similarity index 100% rename from community/searxng/1.2.14/templates/_service.tpl rename to community/searxng/1.2.15/templates/_service.tpl diff --git a/community/searxng/1.2.14/templates/common.yaml b/community/searxng/1.2.15/templates/common.yaml similarity index 100% rename from community/searxng/1.2.14/templates/common.yaml rename to community/searxng/1.2.15/templates/common.yaml diff --git a/community/tautulli/1.1.10/templates/_persistence.tpl b/community/tautulli/1.1.10/templates/_persistence.tpl deleted file mode 100644 index 66fe163f69..0000000000 --- a/community/tautulli/1.1.10/templates/_persistence.tpl +++ /dev/null @@ -1,48 +0,0 @@ -{{- define "tautulli.persistence" -}} -persistence: - config: - enabled: true - type: {{ .Values.tautulliStorage.config.type }} - datasetName: {{ .Values.tautulliStorage.config.datasetName | default "" }} - hostPath: {{ .Values.tautulliStorage.config.hostPath | default "" }} - targetSelector: - tautulli: - tautulli: - mountPath: /config - 01-permissions: - mountPath: /mnt/directories/config - tmp: - enabled: true - type: emptyDir - targetSelector: - tautulli: - tautulli: - mountPath: /tmp - {{- range $idx, $storage := .Values.tautulliStorage.additionalStorages }} - {{ printf "tautulli-%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: - tautulli: - tautulli: - mountPath: {{ $storage.mountPath }} - 01-permissions: - mountPath: /mnt/directories{{ $storage.mountPath }} - {{- end }} -{{- end -}} diff --git a/community/tautulli/1.1.10/Chart.lock b/community/tautulli/1.2.0/Chart.lock similarity index 100% rename from community/tautulli/1.1.10/Chart.lock rename to community/tautulli/1.2.0/Chart.lock diff --git a/community/tautulli/1.1.10/Chart.yaml b/community/tautulli/1.2.0/Chart.yaml similarity index 97% rename from community/tautulli/1.1.10/Chart.yaml rename to community/tautulli/1.2.0/Chart.yaml index cb8b5b555e..4600b9f075 100644 --- a/community/tautulli/1.1.10/Chart.yaml +++ b/community/tautulli/1.2.0/Chart.yaml @@ -3,7 +3,7 @@ description: Tautulli is a python based web application for monitoring, analytic annotations: title: Tautulli type: application -version: 1.1.10 +version: 1.2.0 apiVersion: v2 appVersion: 2.13.4 kubeVersion: '>=1.16.0-0' diff --git a/community/tautulli/1.1.10/README.md b/community/tautulli/1.2.0/README.md similarity index 100% rename from community/tautulli/1.1.10/README.md rename to community/tautulli/1.2.0/README.md diff --git a/community/tautulli/1.1.10/app-readme.md b/community/tautulli/1.2.0/app-readme.md similarity index 100% rename from community/tautulli/1.1.10/app-readme.md rename to community/tautulli/1.2.0/app-readme.md diff --git a/community/tautulli/1.1.10/charts/common-1.2.6.tgz b/community/tautulli/1.2.0/charts/common-1.2.6.tgz similarity index 100% rename from community/tautulli/1.1.10/charts/common-1.2.6.tgz rename to community/tautulli/1.2.0/charts/common-1.2.6.tgz diff --git a/community/tautulli/1.1.10/ci/basic-values.yaml b/community/tautulli/1.2.0/ci/basic-values.yaml similarity index 60% rename from community/tautulli/1.1.10/ci/basic-values.yaml rename to community/tautulli/1.2.0/ci/basic-values.yaml index ff7435ed0c..a25060d5c1 100644 --- a/community/tautulli/1.1.10/ci/basic-values.yaml +++ b/community/tautulli/1.2.0/ci/basic-values.yaml @@ -7,5 +7,4 @@ tautulliRunAs: tautulliStorage: config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config + type: pvc diff --git a/community/tautulli/1.1.10/ci/hostNet-values.yaml b/community/tautulli/1.2.0/ci/hostNet-values.yaml similarity index 53% rename from community/tautulli/1.1.10/ci/hostNet-values.yaml rename to community/tautulli/1.2.0/ci/hostNet-values.yaml index b81580d164..c0d58966d5 100644 --- a/community/tautulli/1.1.10/ci/hostNet-values.yaml +++ b/community/tautulli/1.2.0/ci/hostNet-values.yaml @@ -4,5 +4,4 @@ tautulliNetwork: tautulliStorage: config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config + type: pvc diff --git a/community/tautulli/1.1.10/ix_values.yaml b/community/tautulli/1.2.0/ix_values.yaml similarity index 88% rename from community/tautulli/1.1.10/ix_values.yaml rename to community/tautulli/1.2.0/ix_values.yaml index 66b9b79dd7..476c423fe0 100644 --- a/community/tautulli/1.1.10/ix_values.yaml +++ b/community/tautulli/1.2.0/ix_values.yaml @@ -22,5 +22,6 @@ tautulliRunAs: tautulliStorage: config: type: ixVolume - datasetName: config + ixVolumeConfig: + datasetName: config additionalStorages: [] diff --git a/community/tautulli/1.1.10/metadata.yaml b/community/tautulli/1.2.0/metadata.yaml similarity index 100% rename from community/tautulli/1.1.10/metadata.yaml rename to community/tautulli/1.2.0/metadata.yaml diff --git a/community/tautulli/1.2.0/migrations/migrate b/community/tautulli/1.2.0/migrations/migrate new file mode 100755 index 0000000000..1ccc578333 --- /dev/null +++ b/community/tautulli/1.2.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 = 'tautulliStorage' + storages = ['config'] + + 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/tautulli/1.1.10/questions.yaml b/community/tautulli/1.2.0/questions.yaml similarity index 56% rename from community/tautulli/1.1.10/questions.yaml rename to community/tautulli/1.2.0/questions.yaml index f0fb396c32..dee771bdb0 100644 --- a/community/tautulli/1.1.10/questions.yaml +++ b/community/tautulli/1.2.0/questions.yaml @@ -123,23 +123,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: additionalStorages label: Additional Storage description: Additional storage for Tautulli. @@ -170,74 +211,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/tautulli/1.1.10/templates/NOTES.txt b/community/tautulli/1.2.0/templates/NOTES.txt similarity index 100% rename from community/tautulli/1.1.10/templates/NOTES.txt rename to community/tautulli/1.2.0/templates/NOTES.txt diff --git a/community/tautulli/1.2.0/templates/_persistence.tpl b/community/tautulli/1.2.0/templates/_persistence.tpl new file mode 100644 index 0000000000..5a234d2352 --- /dev/null +++ b/community/tautulli/1.2.0/templates/_persistence.tpl @@ -0,0 +1,48 @@ +{{- define "tautulli.persistence" -}} +persistence: + config: + enabled: true + {{- include "tautulli.storage.ci.migration" (dict "storage" .Values.tautulliStorage.config) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.tautulliStorage.config) | nindent 4 }} + targetSelector: + tautulli: + tautulli: + mountPath: /config + {{- if and (eq .Values.tautulliStorage.config.type "ixVolume") + (not (.Values.tautulliStorage.config.ixVolumeConfig | default dict).aclEnable) }} + 01-permissions: + mountPath: /mnt/directories/config + {{- end }} + tmp: + enabled: true + type: emptyDir + targetSelector: + tautulli: + tautulli: + mountPath: /tmp + + {{- range $idx, $storage := .Values.tautulliStorage.additionalStorages }} + {{ printf "tautulli-%v" (int $idx) }}: + enabled: true + {{- include "tautulli.storage.ci.migration" (dict "storage" $storage) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} + targetSelector: + tautulli: + tautulli: + 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 -}} + +{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}} +{{- define "tautulli.storage.ci.migration" -}} + {{- $storage := .storage -}} + + {{- if $storage.hostPath -}} + {{- $_ := set $storage "hostPathConfig" dict -}} + {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}} + {{- end -}} +{{- end -}} diff --git a/community/tautulli/1.1.10/templates/_portal.tpl b/community/tautulli/1.2.0/templates/_portal.tpl similarity index 100% rename from community/tautulli/1.1.10/templates/_portal.tpl rename to community/tautulli/1.2.0/templates/_portal.tpl diff --git a/community/tautulli/1.1.10/templates/_service.tpl b/community/tautulli/1.2.0/templates/_service.tpl similarity index 100% rename from community/tautulli/1.1.10/templates/_service.tpl rename to community/tautulli/1.2.0/templates/_service.tpl diff --git a/community/tautulli/1.1.10/templates/_tautulli.tpl b/community/tautulli/1.2.0/templates/_tautulli.tpl similarity index 98% rename from community/tautulli/1.1.10/templates/_tautulli.tpl rename to community/tautulli/1.2.0/templates/_tautulli.tpl index 8e70105664..3ac6f3abf0 100644 --- a/community/tautulli/1.1.10/templates/_tautulli.tpl +++ b/community/tautulli/1.2.0/templates/_tautulli.tpl @@ -47,5 +47,5 @@ workload: "UID" .Values.tautulliRunAs.user "GID" .Values.tautulliRunAs.group "mode" "check" - "type" "init") | nindent 8 }} + "type" "install") | nindent 8 }} {{- end -}} diff --git a/community/tautulli/1.1.10/templates/common.yaml b/community/tautulli/1.2.0/templates/common.yaml similarity index 100% rename from community/tautulli/1.1.10/templates/common.yaml rename to community/tautulli/1.2.0/templates/common.yaml diff --git a/community/whoogle/1.1.7/Chart.lock b/community/whoogle/1.2.0/Chart.lock similarity index 100% rename from community/whoogle/1.1.7/Chart.lock rename to community/whoogle/1.2.0/Chart.lock diff --git a/community/whoogle/1.1.7/Chart.yaml b/community/whoogle/1.2.0/Chart.yaml similarity index 97% rename from community/whoogle/1.1.7/Chart.yaml rename to community/whoogle/1.2.0/Chart.yaml index 7463819d63..b32d60b51b 100644 --- a/community/whoogle/1.1.7/Chart.yaml +++ b/community/whoogle/1.2.0/Chart.yaml @@ -3,7 +3,7 @@ description: Whoogle is a self-hosted, ad-free, privacy-respecting metasearch en annotations: title: Whoogle type: application -version: 1.1.7 +version: 1.2.0 apiVersion: v2 appVersion: 0.8.4 kubeVersion: '>=1.16.0-0' diff --git a/community/whoogle/1.1.7/README.md b/community/whoogle/1.2.0/README.md similarity index 100% rename from community/whoogle/1.1.7/README.md rename to community/whoogle/1.2.0/README.md diff --git a/community/whoogle/1.1.7/app-readme.md b/community/whoogle/1.2.0/app-readme.md similarity index 100% rename from community/whoogle/1.1.7/app-readme.md rename to community/whoogle/1.2.0/app-readme.md diff --git a/community/whoogle/1.1.7/charts/common-1.2.6.tgz b/community/whoogle/1.2.0/charts/common-1.2.6.tgz similarity index 100% rename from community/whoogle/1.1.7/charts/common-1.2.6.tgz rename to community/whoogle/1.2.0/charts/common-1.2.6.tgz diff --git a/community/whoogle/1.1.7/ci/basic-values.yaml b/community/whoogle/1.2.0/ci/basic-values.yaml similarity index 100% rename from community/whoogle/1.1.7/ci/basic-values.yaml rename to community/whoogle/1.2.0/ci/basic-values.yaml diff --git a/community/whoogle/1.1.7/ci/extra-values.yaml b/community/whoogle/1.2.0/ci/extra-values.yaml similarity index 100% rename from community/whoogle/1.1.7/ci/extra-values.yaml rename to community/whoogle/1.2.0/ci/extra-values.yaml diff --git a/community/whoogle/1.1.7/ci/hostNet-values.yaml b/community/whoogle/1.2.0/ci/hostNet-values.yaml similarity index 100% rename from community/whoogle/1.1.7/ci/hostNet-values.yaml rename to community/whoogle/1.2.0/ci/hostNet-values.yaml diff --git a/community/whoogle/1.1.7/ix_values.yaml b/community/whoogle/1.2.0/ix_values.yaml similarity index 100% rename from community/whoogle/1.1.7/ix_values.yaml rename to community/whoogle/1.2.0/ix_values.yaml diff --git a/community/whoogle/1.1.7/metadata.yaml b/community/whoogle/1.2.0/metadata.yaml similarity index 100% rename from community/whoogle/1.1.7/metadata.yaml rename to community/whoogle/1.2.0/metadata.yaml diff --git a/community/whoogle/1.2.0/migrations/migrate b/community/whoogle/1.2.0/migrations/migrate new file mode 100755 index 0000000000..401a1f601f --- /dev/null +++ b/community/whoogle/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 = 'whoogleStorage' + + 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/whoogle/1.1.7/questions.yaml b/community/whoogle/1.2.0/questions.yaml similarity index 59% rename from community/whoogle/1.1.7/questions.yaml rename to community/whoogle/1.2.0/questions.yaml index b55d0b59f1..5e538af146 100644 --- a/community/whoogle/1.1.7/questions.yaml +++ b/community/whoogle/1.2.0/questions.yaml @@ -137,74 +137,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/whoogle/1.1.7/templates/NOTES.txt b/community/whoogle/1.2.0/templates/NOTES.txt similarity index 100% rename from community/whoogle/1.1.7/templates/NOTES.txt rename to community/whoogle/1.2.0/templates/NOTES.txt diff --git a/community/whoogle/1.1.7/templates/_persistence.tpl b/community/whoogle/1.2.0/templates/_persistence.tpl similarity index 64% rename from community/whoogle/1.1.7/templates/_persistence.tpl rename to community/whoogle/1.2.0/templates/_persistence.tpl index 4ba65c259f..cbf7f65afe 100644 --- a/community/whoogle/1.1.7/templates/_persistence.tpl +++ b/community/whoogle/1.2.0/templates/_persistence.tpl @@ -34,31 +34,20 @@ persistence: # But for this directory we need to set it to 927:927 01-permissions: mountPath: /mnt/directories/varlibtor + {{- range $idx, $storage := .Values.whoogleStorage.additionalStorages }} {{ printf "whoogle-%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 "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} targetSelector: whoogle: whoogle: mountPath: {{ $storage.mountPath }} + {{- if $.Release.IsInstall }} + {{- if and (eq $storage.type "ixVolume") (not ($storage.ixVolumeConfig | default dict).aclEnable) }} 01-permissions: mountPath: /mnt/directories{{ $storage.mountPath }} + {{- end }} + {{- end }} {{- end }} {{- end -}} diff --git a/community/whoogle/1.1.7/templates/_portal.tpl b/community/whoogle/1.2.0/templates/_portal.tpl similarity index 100% rename from community/whoogle/1.1.7/templates/_portal.tpl rename to community/whoogle/1.2.0/templates/_portal.tpl diff --git a/community/whoogle/1.1.7/templates/_service.tpl b/community/whoogle/1.2.0/templates/_service.tpl similarity index 100% rename from community/whoogle/1.1.7/templates/_service.tpl rename to community/whoogle/1.2.0/templates/_service.tpl diff --git a/community/whoogle/1.1.7/templates/_whoogle.tpl b/community/whoogle/1.2.0/templates/_whoogle.tpl similarity index 100% rename from community/whoogle/1.1.7/templates/_whoogle.tpl rename to community/whoogle/1.2.0/templates/_whoogle.tpl diff --git a/community/whoogle/1.1.7/templates/common.yaml b/community/whoogle/1.2.0/templates/common.yaml similarity index 100% rename from community/whoogle/1.1.7/templates/common.yaml rename to community/whoogle/1.2.0/templates/common.yaml