diff --git a/community/filebrowser/1.2.2/Chart.lock b/community/filebrowser/1.2.3/Chart.lock similarity index 100% rename from community/filebrowser/1.2.2/Chart.lock rename to community/filebrowser/1.2.3/Chart.lock diff --git a/community/filebrowser/1.2.2/Chart.yaml b/community/filebrowser/1.2.3/Chart.yaml similarity index 83% rename from community/filebrowser/1.2.2/Chart.yaml rename to community/filebrowser/1.2.3/Chart.yaml index b5caec2a44..677a4fe1b1 100644 --- a/community/filebrowser/1.2.2/Chart.yaml +++ b/community/filebrowser/1.2.3/Chart.yaml @@ -1,11 +1,12 @@ name: filebrowser -description: File Browser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files. +description: File Browser provides a file managing interface within a specified directory + and it can be used to upload, delete, preview, rename and edit your files. annotations: title: File Browser type: application -version: 1.2.2 +version: 1.2.3 apiVersion: v2 -appVersion: 2.26.0 +appVersion: 2.27.0 kubeVersion: '>=1.16.0-0' maintainers: - name: truenas diff --git a/community/filebrowser/1.2.2/README.md b/community/filebrowser/1.2.3/README.md similarity index 100% rename from community/filebrowser/1.2.2/README.md rename to community/filebrowser/1.2.3/README.md diff --git a/community/filebrowser/1.2.2/app-readme.md b/community/filebrowser/1.2.3/app-readme.md similarity index 100% rename from community/filebrowser/1.2.2/app-readme.md rename to community/filebrowser/1.2.3/app-readme.md diff --git a/community/filebrowser/1.2.2/charts/common-1.2.6.tgz b/community/filebrowser/1.2.3/charts/common-1.2.6.tgz similarity index 100% rename from community/filebrowser/1.2.2/charts/common-1.2.6.tgz rename to community/filebrowser/1.2.3/charts/common-1.2.6.tgz diff --git a/community/filebrowser/1.2.2/ci/basic-values.yaml b/community/filebrowser/1.2.3/ci/basic-values.yaml similarity index 100% rename from community/filebrowser/1.2.2/ci/basic-values.yaml rename to community/filebrowser/1.2.3/ci/basic-values.yaml diff --git a/community/filebrowser/1.2.2/ci/https-values.yaml b/community/filebrowser/1.2.3/ci/https-values.yaml similarity index 100% rename from community/filebrowser/1.2.2/ci/https-values.yaml rename to community/filebrowser/1.2.3/ci/https-values.yaml diff --git a/community/filebrowser/1.2.2/ix_values.yaml b/community/filebrowser/1.2.3/ix_values.yaml similarity index 97% rename from community/filebrowser/1.2.2/ix_values.yaml rename to community/filebrowser/1.2.3/ix_values.yaml index 8e7327e92b..53764cb681 100644 --- a/community/filebrowser/1.2.2/ix_values.yaml +++ b/community/filebrowser/1.2.3/ix_values.yaml @@ -1,7 +1,7 @@ image: repository: filebrowser/filebrowser pullPolicy: IfNotPresent - tag: v2.26.0 + tag: v2.27.0 resources: limits: diff --git a/community/filebrowser/1.2.2/metadata.yaml b/community/filebrowser/1.2.3/metadata.yaml similarity index 100% rename from community/filebrowser/1.2.2/metadata.yaml rename to community/filebrowser/1.2.3/metadata.yaml diff --git a/community/filebrowser/1.2.2/migrations/migrate b/community/filebrowser/1.2.3/migrations/migrate similarity index 100% rename from community/filebrowser/1.2.2/migrations/migrate rename to community/filebrowser/1.2.3/migrations/migrate diff --git a/community/filebrowser/1.2.2/questions.yaml b/community/filebrowser/1.2.3/questions.yaml similarity index 100% rename from community/filebrowser/1.2.2/questions.yaml rename to community/filebrowser/1.2.3/questions.yaml diff --git a/community/filebrowser/1.2.2/templates/NOTES.txt b/community/filebrowser/1.2.3/templates/NOTES.txt similarity index 100% rename from community/filebrowser/1.2.2/templates/NOTES.txt rename to community/filebrowser/1.2.3/templates/NOTES.txt diff --git a/community/filebrowser/1.2.2/templates/_filebrowser.tpl b/community/filebrowser/1.2.3/templates/_filebrowser.tpl similarity index 100% rename from community/filebrowser/1.2.2/templates/_filebrowser.tpl rename to community/filebrowser/1.2.3/templates/_filebrowser.tpl diff --git a/community/filebrowser/1.2.2/templates/_persistence.tpl b/community/filebrowser/1.2.3/templates/_persistence.tpl similarity index 100% rename from community/filebrowser/1.2.2/templates/_persistence.tpl rename to community/filebrowser/1.2.3/templates/_persistence.tpl diff --git a/community/filebrowser/1.2.2/templates/_portal.tpl b/community/filebrowser/1.2.3/templates/_portal.tpl similarity index 100% rename from community/filebrowser/1.2.2/templates/_portal.tpl rename to community/filebrowser/1.2.3/templates/_portal.tpl diff --git a/community/filebrowser/1.2.2/templates/_service.tpl b/community/filebrowser/1.2.3/templates/_service.tpl similarity index 100% rename from community/filebrowser/1.2.2/templates/_service.tpl rename to community/filebrowser/1.2.3/templates/_service.tpl diff --git a/community/filebrowser/1.2.2/templates/common.yaml b/community/filebrowser/1.2.3/templates/common.yaml similarity index 100% rename from community/filebrowser/1.2.2/templates/common.yaml rename to community/filebrowser/1.2.3/templates/common.yaml diff --git a/community/firefly-iii/1.1.7/Chart.lock b/community/firefly-iii/1.1.8/Chart.lock similarity index 100% rename from community/firefly-iii/1.1.7/Chart.lock rename to community/firefly-iii/1.1.8/Chart.lock diff --git a/community/firefly-iii/1.1.7/Chart.yaml b/community/firefly-iii/1.1.8/Chart.yaml similarity index 95% rename from community/firefly-iii/1.1.7/Chart.yaml rename to community/firefly-iii/1.1.8/Chart.yaml index 6eb6f984c1..a2f5750e64 100644 --- a/community/firefly-iii/1.1.7/Chart.yaml +++ b/community/firefly-iii/1.1.8/Chart.yaml @@ -3,9 +3,9 @@ description: Firefly III is a personal finances manager annotations: title: Firefly III type: application -version: 1.1.7 +version: 1.1.8 apiVersion: v2 -appVersion: 6.1.1 +appVersion: 6.1.4 kubeVersion: '>=1.16.0-0' maintainers: - name: truenas diff --git a/community/firefly-iii/1.1.7/README.md b/community/firefly-iii/1.1.8/README.md similarity index 100% rename from community/firefly-iii/1.1.7/README.md rename to community/firefly-iii/1.1.8/README.md diff --git a/community/firefly-iii/1.1.7/app-readme.md b/community/firefly-iii/1.1.8/app-readme.md similarity index 100% rename from community/firefly-iii/1.1.7/app-readme.md rename to community/firefly-iii/1.1.8/app-readme.md diff --git a/community/firefly-iii/1.1.7/charts/common-1.2.6.tgz b/community/firefly-iii/1.1.8/charts/common-1.2.6.tgz similarity index 100% rename from community/firefly-iii/1.1.7/charts/common-1.2.6.tgz rename to community/firefly-iii/1.1.8/charts/common-1.2.6.tgz diff --git a/community/firefly-iii/1.1.7/ci/basic-values.yaml b/community/firefly-iii/1.1.8/ci/basic-values.yaml similarity index 100% rename from community/firefly-iii/1.1.7/ci/basic-values.yaml rename to community/firefly-iii/1.1.8/ci/basic-values.yaml diff --git a/community/firefly-iii/1.1.7/ci/importer-values.yaml b/community/firefly-iii/1.1.8/ci/importer-values.yaml similarity index 100% rename from community/firefly-iii/1.1.7/ci/importer-values.yaml rename to community/firefly-iii/1.1.8/ci/importer-values.yaml diff --git a/community/firefly-iii/1.1.7/ix_values.yaml b/community/firefly-iii/1.1.8/ix_values.yaml similarity index 98% rename from community/firefly-iii/1.1.7/ix_values.yaml rename to community/firefly-iii/1.1.8/ix_values.yaml index 8da661f571..14743ee278 100644 --- a/community/firefly-iii/1.1.7/ix_values.yaml +++ b/community/firefly-iii/1.1.8/ix_values.yaml @@ -1,7 +1,7 @@ image: repository: fireflyiii/core pullPolicy: IfNotPresent - tag: version-6.1.1 + tag: version-6.1.4 importerImage: repository: fireflyiii/data-importer diff --git a/community/firefly-iii/1.1.7/metadata.yaml b/community/firefly-iii/1.1.8/metadata.yaml similarity index 100% rename from community/firefly-iii/1.1.7/metadata.yaml rename to community/firefly-iii/1.1.8/metadata.yaml diff --git a/community/firefly-iii/1.1.7/migrations/migrate b/community/firefly-iii/1.1.8/migrations/migrate similarity index 100% rename from community/firefly-iii/1.1.7/migrations/migrate rename to community/firefly-iii/1.1.8/migrations/migrate diff --git a/community/firefly-iii/1.1.7/questions.yaml b/community/firefly-iii/1.1.8/questions.yaml similarity index 100% rename from community/firefly-iii/1.1.7/questions.yaml rename to community/firefly-iii/1.1.8/questions.yaml diff --git a/community/firefly-iii/1.1.7/templates/NOTES.txt b/community/firefly-iii/1.1.8/templates/NOTES.txt similarity index 100% rename from community/firefly-iii/1.1.7/templates/NOTES.txt rename to community/firefly-iii/1.1.8/templates/NOTES.txt diff --git a/community/firefly-iii/1.1.7/templates/_configuration.tpl b/community/firefly-iii/1.1.8/templates/_configuration.tpl similarity index 100% rename from community/firefly-iii/1.1.7/templates/_configuration.tpl rename to community/firefly-iii/1.1.8/templates/_configuration.tpl diff --git a/community/firefly-iii/1.1.7/templates/_firefly.tpl b/community/firefly-iii/1.1.8/templates/_firefly.tpl similarity index 100% rename from community/firefly-iii/1.1.7/templates/_firefly.tpl rename to community/firefly-iii/1.1.8/templates/_firefly.tpl diff --git a/community/firefly-iii/1.1.7/templates/_firefly_cron.tpl b/community/firefly-iii/1.1.8/templates/_firefly_cron.tpl similarity index 100% rename from community/firefly-iii/1.1.7/templates/_firefly_cron.tpl rename to community/firefly-iii/1.1.8/templates/_firefly_cron.tpl diff --git a/community/firefly-iii/1.1.7/templates/_firefly_importer.tpl b/community/firefly-iii/1.1.8/templates/_firefly_importer.tpl similarity index 100% rename from community/firefly-iii/1.1.7/templates/_firefly_importer.tpl rename to community/firefly-iii/1.1.8/templates/_firefly_importer.tpl diff --git a/community/firefly-iii/1.1.7/templates/_persistence.tpl b/community/firefly-iii/1.1.8/templates/_persistence.tpl similarity index 100% rename from community/firefly-iii/1.1.7/templates/_persistence.tpl rename to community/firefly-iii/1.1.8/templates/_persistence.tpl diff --git a/community/firefly-iii/1.1.7/templates/_portal.tpl b/community/firefly-iii/1.1.8/templates/_portal.tpl similarity index 100% rename from community/firefly-iii/1.1.7/templates/_portal.tpl rename to community/firefly-iii/1.1.8/templates/_portal.tpl diff --git a/community/firefly-iii/1.1.7/templates/_postgres.tpl b/community/firefly-iii/1.1.8/templates/_postgres.tpl similarity index 100% rename from community/firefly-iii/1.1.7/templates/_postgres.tpl rename to community/firefly-iii/1.1.8/templates/_postgres.tpl diff --git a/community/firefly-iii/1.1.7/templates/_redis.tpl b/community/firefly-iii/1.1.8/templates/_redis.tpl similarity index 100% rename from community/firefly-iii/1.1.7/templates/_redis.tpl rename to community/firefly-iii/1.1.8/templates/_redis.tpl diff --git a/community/firefly-iii/1.1.7/templates/_service.tpl b/community/firefly-iii/1.1.8/templates/_service.tpl similarity index 100% rename from community/firefly-iii/1.1.7/templates/_service.tpl rename to community/firefly-iii/1.1.8/templates/_service.tpl diff --git a/community/firefly-iii/1.1.7/templates/common.yaml b/community/firefly-iii/1.1.8/templates/common.yaml similarity index 100% rename from community/firefly-iii/1.1.7/templates/common.yaml rename to community/firefly-iii/1.1.8/templates/common.yaml diff --git a/community/metube/1.2.2/Chart.lock b/community/metube/1.2.3/Chart.lock similarity index 100% rename from community/metube/1.2.2/Chart.lock rename to community/metube/1.2.3/Chart.lock diff --git a/community/metube/1.2.2/Chart.yaml b/community/metube/1.2.3/Chart.yaml similarity index 93% rename from community/metube/1.2.2/Chart.yaml rename to community/metube/1.2.3/Chart.yaml index ced14ccd2b..54d0cede37 100644 --- a/community/metube/1.2.2/Chart.yaml +++ b/community/metube/1.2.3/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.2 +version: 1.2.3 apiVersion: v2 -appVersion: '2023-12-31' +appVersion: '2024-01-02' kubeVersion: '>=1.16.0-0' maintainers: - name: truenas diff --git a/community/metube/1.2.2/README.md b/community/metube/1.2.3/README.md similarity index 100% rename from community/metube/1.2.2/README.md rename to community/metube/1.2.3/README.md diff --git a/community/metube/1.2.2/app-readme.md b/community/metube/1.2.3/app-readme.md similarity index 100% rename from community/metube/1.2.2/app-readme.md rename to community/metube/1.2.3/app-readme.md diff --git a/community/metube/1.2.2/charts/common-1.2.6.tgz b/community/metube/1.2.3/charts/common-1.2.6.tgz similarity index 100% rename from community/metube/1.2.2/charts/common-1.2.6.tgz rename to community/metube/1.2.3/charts/common-1.2.6.tgz diff --git a/community/metube/1.2.2/ci/basic-values.yaml b/community/metube/1.2.3/ci/basic-values.yaml similarity index 100% rename from community/metube/1.2.2/ci/basic-values.yaml rename to community/metube/1.2.3/ci/basic-values.yaml diff --git a/community/metube/1.2.2/ci/extra-values.yaml b/community/metube/1.2.3/ci/extra-values.yaml similarity index 100% rename from community/metube/1.2.2/ci/extra-values.yaml rename to community/metube/1.2.3/ci/extra-values.yaml diff --git a/community/metube/1.2.2/ci/hostNet-values.yaml b/community/metube/1.2.3/ci/hostNet-values.yaml similarity index 100% rename from community/metube/1.2.2/ci/hostNet-values.yaml rename to community/metube/1.2.3/ci/hostNet-values.yaml diff --git a/community/metube/1.2.2/ix_values.yaml b/community/metube/1.2.3/ix_values.yaml similarity index 95% rename from community/metube/1.2.2/ix_values.yaml rename to community/metube/1.2.3/ix_values.yaml index 89abb80d39..3988691010 100644 --- a/community/metube/1.2.2/ix_values.yaml +++ b/community/metube/1.2.3/ix_values.yaml @@ -1,7 +1,7 @@ image: repository: alexta69/metube pullPolicy: IfNotPresent - tag: '2023-12-31' + tag: '2024-01-02' resources: limits: diff --git a/community/metube/1.2.2/metadata.yaml b/community/metube/1.2.3/metadata.yaml similarity index 100% rename from community/metube/1.2.2/metadata.yaml rename to community/metube/1.2.3/metadata.yaml diff --git a/community/metube/1.2.2/migrations/migrate b/community/metube/1.2.3/migrations/migrate similarity index 100% rename from community/metube/1.2.2/migrations/migrate rename to community/metube/1.2.3/migrations/migrate diff --git a/community/metube/1.2.2/questions.yaml b/community/metube/1.2.3/questions.yaml similarity index 100% rename from community/metube/1.2.2/questions.yaml rename to community/metube/1.2.3/questions.yaml diff --git a/community/metube/1.2.2/templates/NOTES.txt b/community/metube/1.2.3/templates/NOTES.txt similarity index 100% rename from community/metube/1.2.2/templates/NOTES.txt rename to community/metube/1.2.3/templates/NOTES.txt diff --git a/community/metube/1.2.2/templates/_metube.tpl b/community/metube/1.2.3/templates/_metube.tpl similarity index 100% rename from community/metube/1.2.2/templates/_metube.tpl rename to community/metube/1.2.3/templates/_metube.tpl diff --git a/community/metube/1.2.2/templates/_persistence.tpl b/community/metube/1.2.3/templates/_persistence.tpl similarity index 100% rename from community/metube/1.2.2/templates/_persistence.tpl rename to community/metube/1.2.3/templates/_persistence.tpl diff --git a/community/metube/1.2.2/templates/_portal.tpl b/community/metube/1.2.3/templates/_portal.tpl similarity index 100% rename from community/metube/1.2.2/templates/_portal.tpl rename to community/metube/1.2.3/templates/_portal.tpl diff --git a/community/metube/1.2.2/templates/_service.tpl b/community/metube/1.2.3/templates/_service.tpl similarity index 100% rename from community/metube/1.2.2/templates/_service.tpl rename to community/metube/1.2.3/templates/_service.tpl diff --git a/community/metube/1.2.2/templates/common.yaml b/community/metube/1.2.3/templates/common.yaml similarity index 100% rename from community/metube/1.2.2/templates/common.yaml rename to community/metube/1.2.3/templates/common.yaml diff --git a/community/tiny-media-manager/1.1.9/ci/extra-values.yaml b/community/tiny-media-manager/1.1.9/ci/extra-values.yaml deleted file mode 100644 index e450053d44..0000000000 --- a/community/tiny-media-manager/1.1.9/ci/extra-values.yaml +++ /dev/null @@ -1,17 +0,0 @@ -tmmConfig: - password: secret - -tmmNetwork: - webPort: 31000 - -tmmStorage: - data: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data - additionalStorages: - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/tv-shows - mountPath: /tv-shows - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/movies - mountPath: /movies diff --git a/community/tiny-media-manager/1.1.9/templates/_persistence.tpl b/community/tiny-media-manager/1.1.9/templates/_persistence.tpl deleted file mode 100644 index 734a36cba5..0000000000 --- a/community/tiny-media-manager/1.1.9/templates/_persistence.tpl +++ /dev/null @@ -1,44 +0,0 @@ -{{- define "tmm.persistence" -}} -persistence: - data: - enabled: true - type: {{ .Values.tmmStorage.data.type }} - datasetName: {{ .Values.tmmStorage.data.datasetName | default "" }} - hostPath: {{ .Values.tmmStorage.data.hostPath | default "" }} - targetSelector: - tmm: - tmm: - mountPath: /data - tmp: - enabled: true - type: emptyDir - targetSelector: - tmm: - tmm: - mountPath: /tmp - {{- range $idx, $storage := .Values.tmmStorage.additionalStorages }} - {{ printf "tmm-%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: - tmm: - tmm: - mountPath: {{ $storage.mountPath }} - {{- end }} -{{- end -}} diff --git a/community/tiny-media-manager/1.1.9/Chart.lock b/community/tiny-media-manager/1.2.0/Chart.lock similarity index 100% rename from community/tiny-media-manager/1.1.9/Chart.lock rename to community/tiny-media-manager/1.2.0/Chart.lock diff --git a/community/tiny-media-manager/1.1.9/Chart.yaml b/community/tiny-media-manager/1.2.0/Chart.yaml similarity index 98% rename from community/tiny-media-manager/1.1.9/Chart.yaml rename to community/tiny-media-manager/1.2.0/Chart.yaml index 406187efde..9539eb9c40 100644 --- a/community/tiny-media-manager/1.1.9/Chart.yaml +++ b/community/tiny-media-manager/1.2.0/Chart.yaml @@ -3,7 +3,7 @@ description: tinyMediaManager is a media management tool written in Java/Swing. annotations: title: tinyMediaManager type: application -version: 1.1.9 +version: 1.2.0 apiVersion: v2 appVersion: 5.0.0 kubeVersion: '>=1.16.0-0' diff --git a/community/tiny-media-manager/1.1.9/README.md b/community/tiny-media-manager/1.2.0/README.md similarity index 100% rename from community/tiny-media-manager/1.1.9/README.md rename to community/tiny-media-manager/1.2.0/README.md diff --git a/community/tiny-media-manager/1.1.9/app-readme.md b/community/tiny-media-manager/1.2.0/app-readme.md similarity index 100% rename from community/tiny-media-manager/1.1.9/app-readme.md rename to community/tiny-media-manager/1.2.0/app-readme.md diff --git a/community/tiny-media-manager/1.1.9/charts/common-1.2.6.tgz b/community/tiny-media-manager/1.2.0/charts/common-1.2.6.tgz similarity index 100% rename from community/tiny-media-manager/1.1.9/charts/common-1.2.6.tgz rename to community/tiny-media-manager/1.2.0/charts/common-1.2.6.tgz diff --git a/community/tiny-media-manager/1.1.9/ci/basic-values.yaml b/community/tiny-media-manager/1.2.0/ci/basic-values.yaml similarity index 63% rename from community/tiny-media-manager/1.1.9/ci/basic-values.yaml rename to community/tiny-media-manager/1.2.0/ci/basic-values.yaml index 79b1a1c6ae..a349f7deb5 100644 --- a/community/tiny-media-manager/1.1.9/ci/basic-values.yaml +++ b/community/tiny-media-manager/1.2.0/ci/basic-values.yaml @@ -10,5 +10,4 @@ tmmID: tmmStorage: data: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data + type: pvc diff --git a/community/tiny-media-manager/1.2.0/ci/extra-values.yaml b/community/tiny-media-manager/1.2.0/ci/extra-values.yaml new file mode 100644 index 0000000000..89c4cf7c02 --- /dev/null +++ b/community/tiny-media-manager/1.2.0/ci/extra-values.yaml @@ -0,0 +1,14 @@ +tmmConfig: + password: secret + +tmmNetwork: + webPort: 31000 + +tmmStorage: + data: + type: pvc + additionalStorages: + - type: pvc + mountPath: /tv-shows + - type: pvc + mountPath: /movies diff --git a/community/tiny-media-manager/1.1.9/ci/hostNet-values.yaml b/community/tiny-media-manager/1.2.0/ci/hostNet-values.yaml similarity index 59% rename from community/tiny-media-manager/1.1.9/ci/hostNet-values.yaml rename to community/tiny-media-manager/1.2.0/ci/hostNet-values.yaml index 39100f858a..63f434bf2e 100644 --- a/community/tiny-media-manager/1.1.9/ci/hostNet-values.yaml +++ b/community/tiny-media-manager/1.2.0/ci/hostNet-values.yaml @@ -7,5 +7,4 @@ tmmNetwork: tmmStorage: data: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data + type: pvc diff --git a/community/tiny-media-manager/1.1.9/ix_values.yaml b/community/tiny-media-manager/1.2.0/ix_values.yaml similarity index 85% rename from community/tiny-media-manager/1.1.9/ix_values.yaml rename to community/tiny-media-manager/1.2.0/ix_values.yaml index fede8a6cbc..52d804cdee 100644 --- a/community/tiny-media-manager/1.1.9/ix_values.yaml +++ b/community/tiny-media-manager/1.2.0/ix_values.yaml @@ -20,7 +20,8 @@ tmmID: group: 568 tmmStorage: - config: + data: type: ixVolume - datasetName: data + ixVolumeConfig: + datasetName: data additionalStorages: [] diff --git a/community/tiny-media-manager/1.1.9/metadata.yaml b/community/tiny-media-manager/1.2.0/metadata.yaml similarity index 100% rename from community/tiny-media-manager/1.1.9/metadata.yaml rename to community/tiny-media-manager/1.2.0/metadata.yaml diff --git a/community/tiny-media-manager/1.2.0/migrations/migrate b/community/tiny-media-manager/1.2.0/migrations/migrate new file mode 100755 index 0000000000..58c0b20644 --- /dev/null +++ b/community/tiny-media-manager/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 = 'tmmStorage' + 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/tiny-media-manager/1.1.9/questions.yaml b/community/tiny-media-manager/1.2.0/questions.yaml similarity index 57% rename from community/tiny-media-manager/1.1.9/questions.yaml rename to community/tiny-media-manager/1.2.0/questions.yaml index ebe26eab1e..c4d8eb324c 100644 --- a/community/tiny-media-manager/1.1.9/questions.yaml +++ b/community/tiny-media-manager/1.2.0/questions.yaml @@ -122,23 +122,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 tinyMediaManager. @@ -169,74 +210,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/tiny-media-manager/1.1.9/templates/NOTES.txt b/community/tiny-media-manager/1.2.0/templates/NOTES.txt similarity index 100% rename from community/tiny-media-manager/1.1.9/templates/NOTES.txt rename to community/tiny-media-manager/1.2.0/templates/NOTES.txt diff --git a/community/tiny-media-manager/1.2.0/templates/_persistence.tpl b/community/tiny-media-manager/1.2.0/templates/_persistence.tpl new file mode 100644 index 0000000000..d2097f6d9d --- /dev/null +++ b/community/tiny-media-manager/1.2.0/templates/_persistence.tpl @@ -0,0 +1,38 @@ +{{- define "tmm.persistence" -}} +persistence: + data: + enabled: true + {{- include "tmm.storage.ci.migration" (dict "storage" .Values.tmmStorage.data) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.tmmStorage.data) | nindent 4 }} + targetSelector: + tmm: + tmm: + mountPath: /data + tmp: + enabled: true + type: emptyDir + targetSelector: + tmm: + tmm: + mountPath: /tmp + {{- range $idx, $storage := .Values.tmmStorage.additionalStorages }} + {{ printf "tmm-%v" (int $idx) }}: + enabled: true + {{- include "tmm.storage.ci.migration" (dict "storage" $storage) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} + targetSelector: + tmm: + tmm: + mountPath: {{ $storage.mountPath }} + {{- end }} +{{- end -}} + +{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}} +{{- define "tmm.storage.ci.migration" -}} + {{- $storage := .storage -}} + + {{- if $storage.hostPath -}} + {{- $_ := set $storage "hostPathConfig" dict -}} + {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}} + {{- end -}} +{{- end -}} diff --git a/community/tiny-media-manager/1.1.9/templates/_portal.tpl b/community/tiny-media-manager/1.2.0/templates/_portal.tpl similarity index 100% rename from community/tiny-media-manager/1.1.9/templates/_portal.tpl rename to community/tiny-media-manager/1.2.0/templates/_portal.tpl diff --git a/community/tiny-media-manager/1.1.9/templates/_service.tpl b/community/tiny-media-manager/1.2.0/templates/_service.tpl similarity index 100% rename from community/tiny-media-manager/1.1.9/templates/_service.tpl rename to community/tiny-media-manager/1.2.0/templates/_service.tpl diff --git a/community/tiny-media-manager/1.1.9/templates/_tmm.tpl b/community/tiny-media-manager/1.2.0/templates/_tmm.tpl similarity index 100% rename from community/tiny-media-manager/1.1.9/templates/_tmm.tpl rename to community/tiny-media-manager/1.2.0/templates/_tmm.tpl diff --git a/community/tiny-media-manager/1.1.9/templates/common.yaml b/community/tiny-media-manager/1.2.0/templates/common.yaml similarity index 100% rename from community/tiny-media-manager/1.1.9/templates/common.yaml rename to community/tiny-media-manager/1.2.0/templates/common.yaml diff --git a/community/unifi-controller/1.2.6/Chart.lock b/community/unifi-controller/1.3.0/Chart.lock similarity index 100% rename from community/unifi-controller/1.2.6/Chart.lock rename to community/unifi-controller/1.3.0/Chart.lock diff --git a/community/unifi-controller/1.2.6/Chart.yaml b/community/unifi-controller/1.3.0/Chart.yaml similarity index 98% rename from community/unifi-controller/1.2.6/Chart.yaml rename to community/unifi-controller/1.3.0/Chart.yaml index 3057d0c01d..1f7e8b88f3 100644 --- a/community/unifi-controller/1.2.6/Chart.yaml +++ b/community/unifi-controller/1.3.0/Chart.yaml @@ -3,7 +3,7 @@ description: Unifi Controller is a network management controller for Unifi Equip annotations: title: Unifi Controller type: application -version: 1.2.6 +version: 1.3.0 apiVersion: v2 appVersion: 8.0.24 kubeVersion: '>=1.16.0-0' diff --git a/community/unifi-controller/1.2.6/README.md b/community/unifi-controller/1.3.0/README.md similarity index 100% rename from community/unifi-controller/1.2.6/README.md rename to community/unifi-controller/1.3.0/README.md diff --git a/community/unifi-controller/1.2.6/app-readme.md b/community/unifi-controller/1.3.0/app-readme.md similarity index 100% rename from community/unifi-controller/1.2.6/app-readme.md rename to community/unifi-controller/1.3.0/app-readme.md diff --git a/community/unifi-controller/1.2.6/charts/common-1.2.6.tgz b/community/unifi-controller/1.3.0/charts/common-1.2.6.tgz similarity index 100% rename from community/unifi-controller/1.2.6/charts/common-1.2.6.tgz rename to community/unifi-controller/1.3.0/charts/common-1.2.6.tgz diff --git a/community/unifi-controller/1.2.6/ci/basic-values.yaml b/community/unifi-controller/1.3.0/ci/basic-values.yaml similarity index 100% rename from community/unifi-controller/1.2.6/ci/basic-values.yaml rename to community/unifi-controller/1.3.0/ci/basic-values.yaml diff --git a/community/unifi-controller/1.2.6/ci/extra-values.yaml b/community/unifi-controller/1.3.0/ci/extra-values.yaml similarity index 100% rename from community/unifi-controller/1.2.6/ci/extra-values.yaml rename to community/unifi-controller/1.3.0/ci/extra-values.yaml diff --git a/community/unifi-controller/1.2.6/ci/hostNet-values.yaml b/community/unifi-controller/1.3.0/ci/hostNet-values.yaml similarity index 100% rename from community/unifi-controller/1.2.6/ci/hostNet-values.yaml rename to community/unifi-controller/1.3.0/ci/hostNet-values.yaml diff --git a/community/unifi-controller/1.2.6/ci/https-values.yaml b/community/unifi-controller/1.3.0/ci/https-values.yaml similarity index 100% rename from community/unifi-controller/1.2.6/ci/https-values.yaml rename to community/unifi-controller/1.3.0/ci/https-values.yaml diff --git a/community/unifi-controller/1.2.6/ix_values.yaml b/community/unifi-controller/1.3.0/ix_values.yaml similarity index 91% rename from community/unifi-controller/1.2.6/ix_values.yaml rename to community/unifi-controller/1.3.0/ix_values.yaml index e9726e7edb..05326c7a35 100644 --- a/community/unifi-controller/1.2.6/ix_values.yaml +++ b/community/unifi-controller/1.3.0/ix_values.yaml @@ -25,5 +25,6 @@ unifiNetwork: unifiStorage: data: type: ixVolume - datasetName: data + ixVolumeConfig: + datasetName: data additionalStorages: [] diff --git a/community/unifi-controller/1.2.6/metadata.yaml b/community/unifi-controller/1.3.0/metadata.yaml similarity index 100% rename from community/unifi-controller/1.2.6/metadata.yaml rename to community/unifi-controller/1.3.0/metadata.yaml diff --git a/community/unifi-controller/1.3.0/migrations/migrate b/community/unifi-controller/1.3.0/migrations/migrate new file mode 100755 index 0000000000..8b34417e45 --- /dev/null +++ b/community/unifi-controller/1.3.0/migrations/migrate @@ -0,0 +1,73 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def storage_migrate(storage): + delete_keys = [] + if storage['type'] == 'hostPath': + # Check if the key exists, if not we have already migrated + if not storage.get('hostPath'): + return storage + + storage['hostPathConfig'] = {'hostPath': storage['hostPath']} + delete_keys.append('hostPath') + + elif storage['type'] == 'ixVolume': + # Check if the key exists, if not we have already migrated + if not storage.get('datasetName'): + return storage + + storage['ixVolumeConfig'] = {'datasetName': storage['datasetName']} + delete_keys.append('datasetName') + + elif storage['type'] == 'smb-pv-pvc': + # Check if the key exists, if not we have already migrated + if not storage.get('server'): + return storage + + storage['smbConfig'] = { + 'server': storage['server'], + 'share': storage['share'], + 'domain': storage['domain'], + 'username': storage['username'], + 'password': storage['password'], + 'size': storage['size'], + } + delete_keys.extend(['server', 'share', 'domain', 'username', 'password', 'size']) + + for key in delete_keys: + storage.pop(key, None) + + return storage + + +def migrate(values): + storage_key = 'unifiStorage' + 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/unifi-controller/1.2.6/questions.yaml b/community/unifi-controller/1.3.0/questions.yaml similarity index 60% rename from community/unifi-controller/1.2.6/questions.yaml rename to community/unifi-controller/1.3.0/questions.yaml index b7736ea758..8cdc4d92d8 100644 --- a/community/unifi-controller/1.2.6/questions.yaml +++ b/community/unifi-controller/1.3.0/questions.yaml @@ -158,23 +158,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 Unifi Controller. @@ -205,74 +246,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/unifi-controller/1.2.6/templates/NOTES.txt b/community/unifi-controller/1.3.0/templates/NOTES.txt similarity index 100% rename from community/unifi-controller/1.2.6/templates/NOTES.txt rename to community/unifi-controller/1.3.0/templates/NOTES.txt diff --git a/community/unifi-controller/1.2.6/templates/_persistence.tpl b/community/unifi-controller/1.3.0/templates/_persistence.tpl similarity index 68% rename from community/unifi-controller/1.2.6/templates/_persistence.tpl rename to community/unifi-controller/1.3.0/templates/_persistence.tpl index 607bc1f1c5..60c92db874 100644 --- a/community/unifi-controller/1.2.6/templates/_persistence.tpl +++ b/community/unifi-controller/1.3.0/templates/_persistence.tpl @@ -2,15 +2,16 @@ persistence: data: enabled: true - type: {{ .Values.unifiStorage.data.type }} - datasetName: {{ .Values.unifiStorage.data.datasetName | default "" }} - hostPath: {{ .Values.unifiStorage.data.hostPath | default "" }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.unifiStorage.data) | nindent 4 }} targetSelector: unifi: unifi: mountPath: /usr/lib/unifi/data + {{- if and (eq .Values.unifiStorage.data.type "ixVolume") + (not (.Values.unifiStorage.data.ixVolumeConfig | default dict).aclEnable) }} 01-permissions: mountPath: /mnt/directories/unifi + {{- end }} 02-migrate: mountPath: /usr/lib/unifi/data cert: @@ -38,30 +39,16 @@ persistence: mountPath: /tmp {{- range $idx, $storage := .Values.unifiStorage.additionalStorages }} {{ printf "unifi-%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: unifi: unifi: mountPath: {{ $storage.mountPath }} + {{- if and (eq $storage.type "ixVolume") (not ($storage.ixVolumeConfig | default dict).aclEnable) }} 01-permissions: mountPath: /mnt/directories{{ $storage.mountPath }} + {{- end }} {{- end -}} {{- if .Values.unifiNetwork.certificateID }} diff --git a/community/unifi-controller/1.2.6/templates/_portal.tpl b/community/unifi-controller/1.3.0/templates/_portal.tpl similarity index 100% rename from community/unifi-controller/1.2.6/templates/_portal.tpl rename to community/unifi-controller/1.3.0/templates/_portal.tpl diff --git a/community/unifi-controller/1.2.6/templates/_service.tpl b/community/unifi-controller/1.3.0/templates/_service.tpl similarity index 100% rename from community/unifi-controller/1.2.6/templates/_service.tpl rename to community/unifi-controller/1.3.0/templates/_service.tpl diff --git a/community/unifi-controller/1.2.6/templates/_unifi.tpl b/community/unifi-controller/1.3.0/templates/_unifi.tpl similarity index 99% rename from community/unifi-controller/1.2.6/templates/_unifi.tpl rename to community/unifi-controller/1.3.0/templates/_unifi.tpl index 1f509093fa..3bcdceef89 100644 --- a/community/unifi-controller/1.2.6/templates/_unifi.tpl +++ b/community/unifi-controller/1.3.0/templates/_unifi.tpl @@ -48,7 +48,7 @@ workload: "UID" 999 "GID" 999 "mode" "check" - "type" "init") | nindent 8 }} + "type" "install") | nindent 8 }} {{- $migrate := false -}} {{- if (hasKey .Values.global "ixChartContext") -}} {{- if (hasKey .Values.global.ixChartContext "upgradeMetadata") -}} diff --git a/community/unifi-controller/1.2.6/templates/common.yaml b/community/unifi-controller/1.3.0/templates/common.yaml similarity index 100% rename from community/unifi-controller/1.2.6/templates/common.yaml rename to community/unifi-controller/1.3.0/templates/common.yaml diff --git a/community/unifi-protect-backup/1.1.9/ci/extra-values.yaml b/community/unifi-protect-backup/1.1.9/ci/extra-values.yaml deleted file mode 100644 index 9aac370321..0000000000 --- a/community/unifi-protect-backup/1.1.9/ci/extra-values.yaml +++ /dev/null @@ -1,20 +0,0 @@ -upbConfig: - unifiProtectUsername: 'user' - unifiProtectPassword: 'pass' - unifiProtectAddress: '192.168.1.100' - rcloneDestination: 'gdrive:unifi-protect-backup' - -upbStorage: - config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config - data: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data - additionalStorages: - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data1 - mountPath: /data1 - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data2 - mountPath: /data2 diff --git a/community/unifi-protect-backup/1.1.9/templates/_persistence.tpl b/community/unifi-protect-backup/1.1.9/templates/_persistence.tpl deleted file mode 100644 index 9b23d2c680..0000000000 --- a/community/unifi-protect-backup/1.1.9/templates/_persistence.tpl +++ /dev/null @@ -1,59 +0,0 @@ -{{- define "upb.persistence" -}} -persistence: - config: - enabled: true - type: {{ .Values.upbStorage.config.type }} - datasetName: {{ .Values.upbStorage.config.datasetName | default "" }} - hostPath: {{ .Values.upbStorage.config.hostPath | default "" }} - targetSelector: - unifi-protect: - unifi-protect: - mountPath: /config - 01-permissions: - mountPath: /mnt/directories/config - data: - enabled: true - type: {{ .Values.upbStorage.data.type }} - datasetName: {{ .Values.upbStorage.data.datasetName | default "" }} - hostPath: {{ .Values.upbStorage.data.hostPath | default "" }} - targetSelector: - unifi-protect: - unifi-protect: - mountPath: /data - 01-permissions: - mountPath: /mnt/directories/data - tmp: - enabled: true - type: emptyDir - targetSelector: - unifi-protect: - unifi-protect: - mountPath: /tmp - {{- range $idx, $storage := .Values.upbStorage.additionalStorages }} - {{ printf "upb-%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: - unifi-protect: - unifi-protect: - mountPath: {{ $storage.mountPath }} - 01-permissions: - mountPath: /mnt/directories{{ $storage.mountPath }} - {{- end }} -{{- end -}} diff --git a/community/unifi-protect-backup/1.1.9/Chart.lock b/community/unifi-protect-backup/1.2.0/Chart.lock similarity index 100% rename from community/unifi-protect-backup/1.1.9/Chart.lock rename to community/unifi-protect-backup/1.2.0/Chart.lock diff --git a/community/unifi-protect-backup/1.1.9/Chart.yaml b/community/unifi-protect-backup/1.2.0/Chart.yaml similarity index 98% rename from community/unifi-protect-backup/1.1.9/Chart.yaml rename to community/unifi-protect-backup/1.2.0/Chart.yaml index ab08590142..f9aa943a55 100644 --- a/community/unifi-protect-backup/1.1.9/Chart.yaml +++ b/community/unifi-protect-backup/1.2.0/Chart.yaml @@ -3,7 +3,7 @@ description: Unifi Protect Backup is a python based tool for backing up UniFi Pr annotations: title: Unifi Protect Backup type: application -version: 1.1.9 +version: 1.2.0 apiVersion: v2 appVersion: 0.10.3 kubeVersion: '>=1.16.0-0' diff --git a/community/unifi-protect-backup/1.1.9/README.md b/community/unifi-protect-backup/1.2.0/README.md similarity index 100% rename from community/unifi-protect-backup/1.1.9/README.md rename to community/unifi-protect-backup/1.2.0/README.md diff --git a/community/unifi-protect-backup/1.1.9/app-readme.md b/community/unifi-protect-backup/1.2.0/app-readme.md similarity index 100% rename from community/unifi-protect-backup/1.1.9/app-readme.md rename to community/unifi-protect-backup/1.2.0/app-readme.md diff --git a/community/unifi-protect-backup/1.1.9/charts/common-1.2.6.tgz b/community/unifi-protect-backup/1.2.0/charts/common-1.2.6.tgz similarity index 100% rename from community/unifi-protect-backup/1.1.9/charts/common-1.2.6.tgz rename to community/unifi-protect-backup/1.2.0/charts/common-1.2.6.tgz diff --git a/community/unifi-protect-backup/1.1.9/ci/basic-values.yaml b/community/unifi-protect-backup/1.2.0/ci/basic-values.yaml similarity index 58% rename from community/unifi-protect-backup/1.1.9/ci/basic-values.yaml rename to community/unifi-protect-backup/1.2.0/ci/basic-values.yaml index 62efebee17..b7d51dc295 100644 --- a/community/unifi-protect-backup/1.1.9/ci/basic-values.yaml +++ b/community/unifi-protect-backup/1.2.0/ci/basic-values.yaml @@ -6,8 +6,6 @@ upbConfig: upbStorage: config: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/config + type: pvc data: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data + type: pvc diff --git a/community/unifi-protect-backup/1.2.0/ci/extra-values.yaml b/community/unifi-protect-backup/1.2.0/ci/extra-values.yaml new file mode 100644 index 0000000000..3c9dc32b5f --- /dev/null +++ b/community/unifi-protect-backup/1.2.0/ci/extra-values.yaml @@ -0,0 +1,16 @@ +upbConfig: + unifiProtectUsername: 'user' + unifiProtectPassword: 'pass' + unifiProtectAddress: '192.168.1.100' + rcloneDestination: 'gdrive:unifi-protect-backup' + +upbStorage: + config: + type: pvc + data: + type: pvc + additionalStorages: + - type: pvc + mountPath: /data1 + - type: pvc + mountPath: /data2 diff --git a/community/unifi-protect-backup/1.1.9/ix_values.yaml b/community/unifi-protect-backup/1.2.0/ix_values.yaml similarity index 87% rename from community/unifi-protect-backup/1.1.9/ix_values.yaml rename to community/unifi-protect-backup/1.2.0/ix_values.yaml index 329988bc9e..7edc75e037 100644 --- a/community/unifi-protect-backup/1.1.9/ix_values.yaml +++ b/community/unifi-protect-backup/1.2.0/ix_values.yaml @@ -33,8 +33,10 @@ upbID: upbStorage: config: type: ixVolume - datasetName: config + ixVolumeConfig: + datasetName: config data: type: ixVolume - datasetName: data + ixVolumeConfig: + datasetName: data additionalStorages: [] diff --git a/community/unifi-protect-backup/1.1.9/metadata.yaml b/community/unifi-protect-backup/1.2.0/metadata.yaml similarity index 100% rename from community/unifi-protect-backup/1.1.9/metadata.yaml rename to community/unifi-protect-backup/1.2.0/metadata.yaml diff --git a/community/unifi-protect-backup/1.2.0/migrations/migrate b/community/unifi-protect-backup/1.2.0/migrations/migrate new file mode 100755 index 0000000000..d5d7c26671 --- /dev/null +++ b/community/unifi-protect-backup/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 = 'upbStorage' + storages = ['data', '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/unifi-protect-backup/1.1.9/questions.yaml b/community/unifi-protect-backup/1.2.0/questions.yaml similarity index 60% rename from community/unifi-protect-backup/1.1.9/questions.yaml rename to community/unifi-protect-backup/1.2.0/questions.yaml index 40f916d47c..e6ac26bac5 100644 --- a/community/unifi-protect-backup/1.1.9/questions.yaml +++ b/community/unifi-protect-backup/1.2.0/questions.yaml @@ -214,23 +214,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: data label: Unifi Protect Backup Data Storage description: The path to store Unifi Protect Backup Data. @@ -252,23 +293,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 Unifi Protect Backup. @@ -299,74 +381,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/unifi-protect-backup/1.1.9/templates/NOTES.txt b/community/unifi-protect-backup/1.2.0/templates/NOTES.txt similarity index 100% rename from community/unifi-protect-backup/1.1.9/templates/NOTES.txt rename to community/unifi-protect-backup/1.2.0/templates/NOTES.txt diff --git a/community/unifi-protect-backup/1.1.9/templates/_configuration.tpl b/community/unifi-protect-backup/1.2.0/templates/_configuration.tpl similarity index 100% rename from community/unifi-protect-backup/1.1.9/templates/_configuration.tpl rename to community/unifi-protect-backup/1.2.0/templates/_configuration.tpl diff --git a/community/unifi-protect-backup/1.2.0/templates/_persistence.tpl b/community/unifi-protect-backup/1.2.0/templates/_persistence.tpl new file mode 100644 index 0000000000..7658df4e89 --- /dev/null +++ b/community/unifi-protect-backup/1.2.0/templates/_persistence.tpl @@ -0,0 +1,46 @@ +{{- define "upb.persistence" -}} +persistence: + config: + enabled: true + {{- include "upb.storage.ci.migration" (dict "storage" .Values.upbStorage.config) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.upbStorage.config) | nindent 4 }} + targetSelector: + unifi-protect: + unifi-protect: + mountPath: /config + data: + enabled: true + {{- include "upb.storage.ci.migration" (dict "storage" .Values.upbStorage.data) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.upbStorage.data) | nindent 4 }} + targetSelector: + unifi-protect: + unifi-protect: + mountPath: /data + tmp: + enabled: true + type: emptyDir + targetSelector: + unifi-protect: + unifi-protect: + mountPath: /tmp + {{- range $idx, $storage := .Values.upbStorage.additionalStorages }} + {{ printf "upb-%v" (int $idx) }}: + enabled: true + {{- include "upb.storage.ci.migration" (dict "storage" $storage) }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} + targetSelector: + unifi-protect: + unifi-protect: + mountPath: {{ $storage.mountPath }} + {{- end }} +{{- end -}} + +{{/* TODO: Remove on the next version bump, eg 1.2.0+ */}} +{{- define "upb.storage.ci.migration" -}} + {{- $storage := .storage -}} + + {{- if $storage.hostPath -}} + {{- $_ := set $storage "hostPathConfig" dict -}} + {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}} + {{- end -}} +{{- end -}} diff --git a/community/unifi-protect-backup/1.1.9/templates/_unifi-protect-backup.tpl b/community/unifi-protect-backup/1.2.0/templates/_unifi-protect-backup.tpl similarity index 100% rename from community/unifi-protect-backup/1.1.9/templates/_unifi-protect-backup.tpl rename to community/unifi-protect-backup/1.2.0/templates/_unifi-protect-backup.tpl diff --git a/community/unifi-protect-backup/1.1.9/templates/_validation.tpl b/community/unifi-protect-backup/1.2.0/templates/_validation.tpl similarity index 100% rename from community/unifi-protect-backup/1.1.9/templates/_validation.tpl rename to community/unifi-protect-backup/1.2.0/templates/_validation.tpl diff --git a/community/unifi-protect-backup/1.1.9/templates/common.yaml b/community/unifi-protect-backup/1.2.0/templates/common.yaml similarity index 100% rename from community/unifi-protect-backup/1.1.9/templates/common.yaml rename to community/unifi-protect-backup/1.2.0/templates/common.yaml