diff --git a/community/briefkasten/1.1.1/Chart.lock b/community/briefkasten/1.1.1/Chart.lock deleted file mode 100644 index 9cf4c9b651..0000000000 --- a/community/briefkasten/1.1.1/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../common - version: 1.1.1 -digest: sha256:a7dbe3e4d42dbcd4325776e5e01a1d630c7f185f79e7ebf22b1b9cc80f56eed7 -generated: "2023-09-21T17:36:42.077526429+03:00" diff --git a/community/briefkasten/1.1.1/charts/common-1.1.1.tgz b/community/briefkasten/1.1.1/charts/common-1.1.1.tgz deleted file mode 100644 index da215400bf..0000000000 Binary files a/community/briefkasten/1.1.1/charts/common-1.1.1.tgz and /dev/null differ diff --git a/community/briefkasten/1.1.1/templates/_persistence.tpl b/community/briefkasten/1.1.1/templates/_persistence.tpl deleted file mode 100644 index af31ee819e..0000000000 --- a/community/briefkasten/1.1.1/templates/_persistence.tpl +++ /dev/null @@ -1,67 +0,0 @@ -{{- define "briefkasten.persistence" -}} -persistence: - tmp: - enabled: true - type: emptyDir - targetSelector: - briefkasten: - briefkasten: - mountPath: /tmp - {{- range $idx, $storage := .Values.briefkastenStorage.additionalStorages }} - {{ printf "briefkasten-%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: - briefkasten: - briefkasten: - mountPath: {{ $storage.mountPath }} - {{- end }} - - {{/* Database */}} - postgresdata: - enabled: true - type: {{ .Values.briefkastenStorage.pgData.type }} - datasetName: {{ .Values.briefkastenStorage.pgData.datasetName | default "" }} - hostPath: {{ .Values.briefkastenStorage.pgData.hostPath | default "" }} - targetSelector: - # Postgres pod - postgres: - # Postgres container - postgres: - mountPath: /var/lib/postgresql/data - # Postgres - Permissions container - # Different than the 01-permissions - permissions: - mountPath: /mnt/directories/postgres_data - postgresbackup: - enabled: true - type: {{ .Values.briefkastenStorage.pgBackup.type }} - datasetName: {{ .Values.briefkastenStorage.pgBackup.datasetName | default "" }} - hostPath: {{ .Values.briefkastenStorage.pgBackup.hostPath | default "" }} - targetSelector: - # Postgres backup pod - postgresbackup: - # Postgres backup container - postgresbackup: - mountPath: /postgres_backup - # Postgres - Permissions container - # Different than the 01-permissions - permissions: - mountPath: /mnt/directories/postgres_backup -{{- end -}} diff --git a/community/briefkasten/1.1.2/Chart.lock b/community/briefkasten/1.1.2/Chart.lock new file mode 100644 index 0000000000..1bf8c13b42 --- /dev/null +++ b/community/briefkasten/1.1.2/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../common + version: 1.2.0 +digest: sha256:a87a6988cedfc3f8a90eb308dffaaeaa1cbd0cad31c20e15b1147084360b9ec1 +generated: "2023-10-25T19:30:16.729964915+03:00" diff --git a/community/briefkasten/1.1.1/Chart.yaml b/community/briefkasten/1.1.2/Chart.yaml similarity index 95% rename from community/briefkasten/1.1.1/Chart.yaml rename to community/briefkasten/1.1.2/Chart.yaml index e3f6615f7c..0176c83142 100644 --- a/community/briefkasten/1.1.1/Chart.yaml +++ b/community/briefkasten/1.1.2/Chart.yaml @@ -3,7 +3,7 @@ description: Briefkasten is a self hosted bookmarking app annotations: title: Briefkasten type: application -version: 1.1.1 +version: 1.1.2 apiVersion: v2 appVersion: latest kubeVersion: '>=1.16.0-0' @@ -14,7 +14,7 @@ maintainers: dependencies: - name: common repository: file://../../../common - version: 1.1.1 + version: 1.2.0 home: https://github.com/ndom91/briefkasten icon: https://media.sys.truenas.net/apps/briefkasten/icons/icon.svg sources: diff --git a/community/briefkasten/1.1.1/README.md b/community/briefkasten/1.1.2/README.md similarity index 100% rename from community/briefkasten/1.1.1/README.md rename to community/briefkasten/1.1.2/README.md diff --git a/community/briefkasten/1.1.1/app-readme.md b/community/briefkasten/1.1.2/app-readme.md similarity index 100% rename from community/briefkasten/1.1.1/app-readme.md rename to community/briefkasten/1.1.2/app-readme.md diff --git a/community/briefkasten/1.1.2/charts/common-1.2.0.tgz b/community/briefkasten/1.1.2/charts/common-1.2.0.tgz new file mode 100644 index 0000000000..c98eeb763a Binary files /dev/null and b/community/briefkasten/1.1.2/charts/common-1.2.0.tgz differ diff --git a/community/briefkasten/1.1.1/ci/basic-values.yaml b/community/briefkasten/1.1.2/ci/basic-values.yaml similarity index 100% rename from community/briefkasten/1.1.1/ci/basic-values.yaml rename to community/briefkasten/1.1.2/ci/basic-values.yaml diff --git a/community/briefkasten/1.1.1/ci/extra-values.yaml b/community/briefkasten/1.1.2/ci/extra-values.yaml similarity index 100% rename from community/briefkasten/1.1.1/ci/extra-values.yaml rename to community/briefkasten/1.1.2/ci/extra-values.yaml diff --git a/community/briefkasten/1.1.1/ci/hostNet-values.yaml b/community/briefkasten/1.1.2/ci/hostNet-values.yaml similarity index 100% rename from community/briefkasten/1.1.1/ci/hostNet-values.yaml rename to community/briefkasten/1.1.2/ci/hostNet-values.yaml diff --git a/community/briefkasten/1.1.1/ix_values.yaml b/community/briefkasten/1.1.2/ix_values.yaml similarity index 100% rename from community/briefkasten/1.1.1/ix_values.yaml rename to community/briefkasten/1.1.2/ix_values.yaml diff --git a/community/briefkasten/1.1.1/metadata.yaml b/community/briefkasten/1.1.2/metadata.yaml similarity index 100% rename from community/briefkasten/1.1.1/metadata.yaml rename to community/briefkasten/1.1.2/metadata.yaml diff --git a/community/briefkasten/1.1.1/questions.yaml b/community/briefkasten/1.1.2/questions.yaml similarity index 100% rename from community/briefkasten/1.1.1/questions.yaml rename to community/briefkasten/1.1.2/questions.yaml diff --git a/community/briefkasten/1.1.1/templates/NOTES.txt b/community/briefkasten/1.1.2/templates/NOTES.txt similarity index 100% rename from community/briefkasten/1.1.1/templates/NOTES.txt rename to community/briefkasten/1.1.2/templates/NOTES.txt diff --git a/community/briefkasten/1.1.1/templates/_briefkasten.tpl b/community/briefkasten/1.1.2/templates/_briefkasten.tpl similarity index 100% rename from community/briefkasten/1.1.1/templates/_briefkasten.tpl rename to community/briefkasten/1.1.2/templates/_briefkasten.tpl diff --git a/community/briefkasten/1.1.1/templates/_configuration.tpl b/community/briefkasten/1.1.2/templates/_configuration.tpl similarity index 100% rename from community/briefkasten/1.1.1/templates/_configuration.tpl rename to community/briefkasten/1.1.2/templates/_configuration.tpl diff --git a/community/briefkasten/1.1.2/templates/_persistence.tpl b/community/briefkasten/1.1.2/templates/_persistence.tpl new file mode 100644 index 0000000000..31848873c3 --- /dev/null +++ b/community/briefkasten/1.1.2/templates/_persistence.tpl @@ -0,0 +1,40 @@ +{{- define "briefkasten.persistence" -}} +persistence: + tmp: + enabled: true + type: emptyDir + targetSelector: + briefkasten: + briefkasten: + mountPath: /tmp + {{- range $idx, $storage := .Values.briefkastenStorage.additionalStorages }} + {{ printf "briefkasten-%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: + briefkasten: + briefkasten: + mountPath: {{ $storage.mountPath }} + {{- end -}} + + {{- include "ix.v1.common.app.postgresPersistence" + (dict "pgData" .Values.briefkastenStorage.pgData + "pgBackup" .Values.briefkastenStorage.pgBackup + ) | nindent 2 }} +{{- end -}} diff --git a/community/briefkasten/1.1.1/templates/_portal.tpl b/community/briefkasten/1.1.2/templates/_portal.tpl similarity index 100% rename from community/briefkasten/1.1.1/templates/_portal.tpl rename to community/briefkasten/1.1.2/templates/_portal.tpl diff --git a/community/briefkasten/1.1.1/templates/_postgres.tpl b/community/briefkasten/1.1.2/templates/_postgres.tpl similarity index 100% rename from community/briefkasten/1.1.1/templates/_postgres.tpl rename to community/briefkasten/1.1.2/templates/_postgres.tpl diff --git a/community/briefkasten/1.1.1/templates/_service.tpl b/community/briefkasten/1.1.2/templates/_service.tpl similarity index 62% rename from community/briefkasten/1.1.1/templates/_service.tpl rename to community/briefkasten/1.1.2/templates/_service.tpl index d0ea35538f..e5974b2f7d 100644 --- a/community/briefkasten/1.1.1/templates/_service.tpl +++ b/community/briefkasten/1.1.2/templates/_service.tpl @@ -12,15 +12,6 @@ service: port: {{ .Values.briefkastenNetwork.webPort }} nodePort: {{ .Values.briefkastenNetwork.webPort }} targetSelector: briefkasten - postgres: - enabled: true - type: ClusterIP - targetSelector: postgres - ports: - postgres: - enabled: true - primary: true - port: 5432 - targetPort: 5432 - targetSelector: postgres + {{- include "ix.v1.common.app.postgresService" $ | nindent 2 }} + {{- end -}} diff --git a/community/briefkasten/1.1.1/templates/_validation.tpl b/community/briefkasten/1.1.2/templates/_validation.tpl similarity index 100% rename from community/briefkasten/1.1.1/templates/_validation.tpl rename to community/briefkasten/1.1.2/templates/_validation.tpl diff --git a/community/briefkasten/1.1.1/templates/common.yaml b/community/briefkasten/1.1.2/templates/common.yaml similarity index 100% rename from community/briefkasten/1.1.1/templates/common.yaml rename to community/briefkasten/1.1.2/templates/common.yaml diff --git a/community/briefkasten/1.1.1/upgrade_strategy_disable b/community/briefkasten/1.1.2/upgrade_strategy_disable similarity index 100% rename from community/briefkasten/1.1.1/upgrade_strategy_disable rename to community/briefkasten/1.1.2/upgrade_strategy_disable