diff --git a/community/vaultwarden/1.1.5/Chart.lock b/community/vaultwarden/1.1.6/Chart.lock similarity index 100% rename from community/vaultwarden/1.1.5/Chart.lock rename to community/vaultwarden/1.1.6/Chart.lock diff --git a/community/vaultwarden/1.1.5/Chart.yaml b/community/vaultwarden/1.1.6/Chart.yaml similarity index 97% rename from community/vaultwarden/1.1.5/Chart.yaml rename to community/vaultwarden/1.1.6/Chart.yaml index 69eb98be65..c23e29c7f6 100644 --- a/community/vaultwarden/1.1.5/Chart.yaml +++ b/community/vaultwarden/1.1.6/Chart.yaml @@ -3,7 +3,7 @@ description: Alternative implementation of the Bitwarden server API written in R annotations: title: Vaultwarden type: application -version: 1.1.5 +version: 1.1.6 apiVersion: v2 appVersion: 1.30.1 kubeVersion: '>=1.16.0-0' diff --git a/community/vaultwarden/1.1.5/README.md b/community/vaultwarden/1.1.6/README.md similarity index 100% rename from community/vaultwarden/1.1.5/README.md rename to community/vaultwarden/1.1.6/README.md diff --git a/community/vaultwarden/1.1.5/app-readme.md b/community/vaultwarden/1.1.6/app-readme.md similarity index 100% rename from community/vaultwarden/1.1.5/app-readme.md rename to community/vaultwarden/1.1.6/app-readme.md diff --git a/community/vaultwarden/1.1.5/charts/common-1.2.6.tgz b/community/vaultwarden/1.1.6/charts/common-1.2.6.tgz similarity index 100% rename from community/vaultwarden/1.1.5/charts/common-1.2.6.tgz rename to community/vaultwarden/1.1.6/charts/common-1.2.6.tgz diff --git a/community/vaultwarden/1.1.5/ci/additional-env-values.yaml b/community/vaultwarden/1.1.6/ci/additional-env-values.yaml similarity index 100% rename from community/vaultwarden/1.1.5/ci/additional-env-values.yaml rename to community/vaultwarden/1.1.6/ci/additional-env-values.yaml diff --git a/community/vaultwarden/1.1.5/ci/admin-values.yaml b/community/vaultwarden/1.1.6/ci/admin-values.yaml similarity index 100% rename from community/vaultwarden/1.1.5/ci/admin-values.yaml rename to community/vaultwarden/1.1.6/ci/admin-values.yaml diff --git a/community/vaultwarden/1.1.5/ci/basic-values.yaml b/community/vaultwarden/1.1.6/ci/basic-values.yaml similarity index 100% rename from community/vaultwarden/1.1.5/ci/basic-values.yaml rename to community/vaultwarden/1.1.6/ci/basic-values.yaml diff --git a/community/vaultwarden/1.1.5/ci/https-values.yaml b/community/vaultwarden/1.1.6/ci/https-values.yaml similarity index 100% rename from community/vaultwarden/1.1.5/ci/https-values.yaml rename to community/vaultwarden/1.1.6/ci/https-values.yaml diff --git a/community/vaultwarden/1.1.5/ci/other-user-values.yaml b/community/vaultwarden/1.1.6/ci/other-user-values.yaml similarity index 100% rename from community/vaultwarden/1.1.5/ci/other-user-values.yaml rename to community/vaultwarden/1.1.6/ci/other-user-values.yaml diff --git a/community/vaultwarden/1.1.5/ci/ws-disabled-values.yaml b/community/vaultwarden/1.1.6/ci/ws-disabled-values.yaml similarity index 100% rename from community/vaultwarden/1.1.5/ci/ws-disabled-values.yaml rename to community/vaultwarden/1.1.6/ci/ws-disabled-values.yaml diff --git a/community/vaultwarden/1.1.5/ix_values.yaml b/community/vaultwarden/1.1.6/ix_values.yaml similarity index 100% rename from community/vaultwarden/1.1.5/ix_values.yaml rename to community/vaultwarden/1.1.6/ix_values.yaml diff --git a/community/vaultwarden/1.1.5/metadata.yaml b/community/vaultwarden/1.1.6/metadata.yaml similarity index 100% rename from community/vaultwarden/1.1.5/metadata.yaml rename to community/vaultwarden/1.1.6/metadata.yaml diff --git a/community/vaultwarden/1.1.5/migrations/migrate b/community/vaultwarden/1.1.6/migrations/migrate similarity index 100% rename from community/vaultwarden/1.1.5/migrations/migrate rename to community/vaultwarden/1.1.6/migrations/migrate diff --git a/community/vaultwarden/1.1.5/questions.yaml b/community/vaultwarden/1.1.6/questions.yaml similarity index 100% rename from community/vaultwarden/1.1.5/questions.yaml rename to community/vaultwarden/1.1.6/questions.yaml diff --git a/community/vaultwarden/1.1.5/templates/NOTES.txt b/community/vaultwarden/1.1.6/templates/NOTES.txt similarity index 100% rename from community/vaultwarden/1.1.5/templates/NOTES.txt rename to community/vaultwarden/1.1.6/templates/NOTES.txt diff --git a/community/vaultwarden/1.1.5/templates/_configuration.tpl b/community/vaultwarden/1.1.6/templates/_configuration.tpl similarity index 100% rename from community/vaultwarden/1.1.5/templates/_configuration.tpl rename to community/vaultwarden/1.1.6/templates/_configuration.tpl diff --git a/community/vaultwarden/1.1.5/templates/_portal.tpl b/community/vaultwarden/1.1.6/templates/_portal.tpl similarity index 100% rename from community/vaultwarden/1.1.5/templates/_portal.tpl rename to community/vaultwarden/1.1.6/templates/_portal.tpl diff --git a/community/vaultwarden/1.1.5/templates/_postgres.tpl b/community/vaultwarden/1.1.6/templates/_postgres.tpl similarity index 71% rename from community/vaultwarden/1.1.5/templates/_postgres.tpl rename to community/vaultwarden/1.1.6/templates/_postgres.tpl index f753e16df4..3615cd58ac 100644 --- a/community/vaultwarden/1.1.5/templates/_postgres.tpl +++ b/community/vaultwarden/1.1.6/templates/_postgres.tpl @@ -1,7 +1,9 @@ {{- define "postgres.workload" -}} {{/* Postgres Database */}} workload: -{{- include "ix.v1.common.app.postgres" (dict "secretName" "postgres-creds" "resources" .Values.resources) | nindent 2 }} +{{- include "ix.v1.common.app.postgres" (dict "secretName" "postgres-creds" + "resources" .Values.resources + "ixChartContext" .Values.ixChartContext) | nindent 2 }} {{/* Service */}} service: diff --git a/community/vaultwarden/1.1.5/templates/_vaultwarden.tpl b/community/vaultwarden/1.1.6/templates/_vaultwarden.tpl similarity index 100% rename from community/vaultwarden/1.1.5/templates/_vaultwarden.tpl rename to community/vaultwarden/1.1.6/templates/_vaultwarden.tpl diff --git a/community/vaultwarden/1.1.5/templates/common.yaml b/community/vaultwarden/1.1.6/templates/common.yaml similarity index 100% rename from community/vaultwarden/1.1.5/templates/common.yaml rename to community/vaultwarden/1.1.6/templates/common.yaml diff --git a/test/syncthing/1.0.13/Chart.lock b/test/syncthing/1.0.13/Chart.lock deleted file mode 100644 index a119fd6565..0000000000 --- a/test/syncthing/1.0.13/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../common - version: 1.1.1 -digest: sha256:a7dbe3e4d42dbcd4325776e5e01a1d630c7f185f79e7ebf22b1b9cc80f56eed7 -generated: "2023-09-04T19:34:56.105136152+03:00" diff --git a/test/syncthing/1.0.13/charts/common-1.1.1.tgz b/test/syncthing/1.0.13/charts/common-1.1.1.tgz deleted file mode 100644 index fff3f8fe46..0000000000 Binary files a/test/syncthing/1.0.13/charts/common-1.1.1.tgz and /dev/null differ diff --git a/test/syncthing/1.1.5/Chart.lock b/test/syncthing/1.1.5/Chart.lock new file mode 100644 index 0000000000..406528f89a --- /dev/null +++ b/test/syncthing/1.1.5/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../common + version: 1.2.6 +digest: sha256:956cef64e364b567d2e5327a00e60b68f3ef765e003d6c35afc143bb81ecc26b +generated: "2024-01-02T19:23:50.344200237+02:00" diff --git a/test/syncthing/1.0.13/Chart.yaml b/test/syncthing/1.1.5/Chart.yaml similarity index 83% rename from test/syncthing/1.0.13/Chart.yaml rename to test/syncthing/1.1.5/Chart.yaml index 7765506807..13fb9056bc 100644 --- a/test/syncthing/1.0.13/Chart.yaml +++ b/test/syncthing/1.1.5/Chart.yaml @@ -3,9 +3,9 @@ description: Syncthing is a continuous file synchronization program. annotations: title: Syncthing type: application -version: 1.0.13 +version: 1.1.5 apiVersion: v2 -appVersion: '1.23.3' +appVersion: '1.27.0' kubeVersion: '>=1.16.0-0' maintainers: - name: truenas @@ -14,9 +14,9 @@ maintainers: dependencies: - name: common repository: file://../../../common - version: 1.1.1 + version: 1.2.6 home: https://syncthing.net/ -icon: https://syncthing.net/img/logo-horizontal.svg +icon: https://media.sys.truenas.net/apps/syncthing/icons/icon.svg sources: - https://syncthing.net/ - https://github.com/syncthing/syncthing diff --git a/test/syncthing/1.0.13/README.md b/test/syncthing/1.1.5/README.md similarity index 100% rename from test/syncthing/1.0.13/README.md rename to test/syncthing/1.1.5/README.md diff --git a/test/syncthing/1.0.13/app-readme.md b/test/syncthing/1.1.5/app-readme.md similarity index 100% rename from test/syncthing/1.0.13/app-readme.md rename to test/syncthing/1.1.5/app-readme.md diff --git a/test/syncthing/1.1.5/charts/common-1.2.6.tgz b/test/syncthing/1.1.5/charts/common-1.2.6.tgz new file mode 100644 index 0000000000..7857127359 Binary files /dev/null and b/test/syncthing/1.1.5/charts/common-1.2.6.tgz differ diff --git a/test/syncthing/1.0.13/ci/basic-no-hostnet-values.yaml b/test/syncthing/1.1.5/ci/basic-no-hostnet-values.yaml similarity index 100% rename from test/syncthing/1.0.13/ci/basic-no-hostnet-values.yaml rename to test/syncthing/1.1.5/ci/basic-no-hostnet-values.yaml diff --git a/test/syncthing/1.0.13/ci/basic-values.yaml b/test/syncthing/1.1.5/ci/basic-values.yaml similarity index 100% rename from test/syncthing/1.0.13/ci/basic-values.yaml rename to test/syncthing/1.1.5/ci/basic-values.yaml diff --git a/test/syncthing/1.0.13/ci/https-no-hostnet-values.yaml b/test/syncthing/1.1.5/ci/https-no-hostnet-values.yaml similarity index 100% rename from test/syncthing/1.0.13/ci/https-no-hostnet-values.yaml rename to test/syncthing/1.1.5/ci/https-no-hostnet-values.yaml diff --git a/test/syncthing/1.0.13/ci/https-values.yaml b/test/syncthing/1.1.5/ci/https-values.yaml similarity index 100% rename from test/syncthing/1.0.13/ci/https-values.yaml rename to test/syncthing/1.1.5/ci/https-values.yaml diff --git a/test/syncthing/1.0.13/ix_values.yaml b/test/syncthing/1.1.5/ix_values.yaml similarity index 84% rename from test/syncthing/1.0.13/ix_values.yaml rename to test/syncthing/1.1.5/ix_values.yaml index dc73a39af6..edbe036f43 100644 --- a/test/syncthing/1.0.13/ix_values.yaml +++ b/test/syncthing/1.1.5/ix_values.yaml @@ -1,6 +1,6 @@ image: repository: syncthing/syncthing - tag: '1.23.3' + tag: '1.27.0' pullPolicy: IfNotPresent resources: @@ -8,9 +8,10 @@ resources: cpu: 4000m memory: 8Gi -# Currently not exposed in the UI -# But can be exposed in the future syncthingConfig: + additionalEnvs: [] + # Currently not exposed in the UI + # But can be exposed in the future natTraversal: false localDiscovery: false globalDiscovery: false diff --git a/test/syncthing/1.0.13/metadata.yaml b/test/syncthing/1.1.5/metadata.yaml similarity index 100% rename from test/syncthing/1.0.13/metadata.yaml rename to test/syncthing/1.1.5/metadata.yaml diff --git a/test/syncthing/1.0.13/questions.yaml b/test/syncthing/1.1.5/questions.yaml similarity index 82% rename from test/syncthing/1.0.13/questions.yaml rename to test/syncthing/1.1.5/questions.yaml index 90e9b78f45..2791454c3c 100644 --- a/test/syncthing/1.0.13/questions.yaml +++ b/test/syncthing/1.1.5/questions.yaml @@ -31,6 +31,74 @@ questions: $ref: - definitions/timezone + - variable: syncthingConfig + label: "" + group: Syncthing Configuration + schema: + type: dict + attrs: + # Boolean flags are currently + # not exposed to the user + - variable: natTraversal + label: NAT Traversal + schema: + type: boolean + default: false + hidden: true + - variable: localDiscovery + label: Local Discovery + schema: + type: boolean + default: false + hidden: true + - variable: globalDiscovery + label: Global Discovery + schema: + type: boolean + default: false + hidden: true + - variable: telemetry + label: Telemetry + schema: + type: boolean + default: false + hidden: true + - variable: relaying + label: Relaying + schema: + type: boolean + default: false + hidden: true + - variable: announceLANAddresses + label: Announce LAN Addresses + schema: + type: boolean + default: false + hidden: true + + - variable: additionalEnvs + label: Additional Environment Variables + description: Configure additional environment variables for Syncthing. + schema: + type: list + default: [] + items: + - variable: env + label: Environment Variable + schema: + type: dict + attrs: + - variable: name + label: Name + schema: + type: string + required: true + - variable: value + label: Value + schema: + type: string + required: true + - variable: syncthingID label: "" group: User and Group Configuration @@ -131,6 +199,7 @@ questions: schema: type: string required: true + immutable: true default: "ixVolume" enum: - value: "hostPath" @@ -155,7 +224,6 @@ questions: show_if: [["type", "=", "hostPath"]] immutable: true required: true - - variable: additionalStorages label: Additional Storage description: Additional storage for Syncthing. @@ -176,11 +244,13 @@ questions: - variable: type label: Type description: | - Host Path: Is a path that already exists on the system. + Host Path: Is a path that already exists on the system.
+ SMB Share: Mounts a persistent volume claim to a SMB share. schema: type: string required: true default: "hostPath" + immutable: true enum: - value: "hostPath" description: Host Path (Path that already exists on the system) diff --git a/test/syncthing/1.0.13/templates/NOTES.txt b/test/syncthing/1.1.5/templates/NOTES.txt similarity index 100% rename from test/syncthing/1.0.13/templates/NOTES.txt rename to test/syncthing/1.1.5/templates/NOTES.txt diff --git a/test/syncthing/1.0.13/templates/_certContainer.tpl b/test/syncthing/1.1.5/templates/_certContainer.tpl similarity index 100% rename from test/syncthing/1.0.13/templates/_certContainer.tpl rename to test/syncthing/1.1.5/templates/_certContainer.tpl diff --git a/test/syncthing/1.0.13/templates/_configure.tpl b/test/syncthing/1.1.5/templates/_configure.tpl similarity index 98% rename from test/syncthing/1.0.13/templates/_configure.tpl rename to test/syncthing/1.1.5/templates/_configure.tpl index 390f118314..bfe02f5153 100644 --- a/test/syncthing/1.0.13/templates/_configure.tpl +++ b/test/syncthing/1.1.5/templates/_configure.tpl @@ -26,7 +26,7 @@ configmap: done function setConfig() { - syncthing cli --home "$configDir" config $@ + syncthing cli --home "$configDir" config "$@" } # Now we can use the syncthing cli (wrapper around the API) to set the defaults. @@ -50,6 +50,7 @@ configmap: setConfig defaults folder send-xattrs set -- 1 setConfig defaults folder sync-xattrs set -- 1 setConfig defaults folder ignore-perms set -- 1 + setConfig defaults folder path set -- "" syncthing-truenas-logo: enabled: true data: diff --git a/test/syncthing/1.0.13/templates/_persistence.tpl b/test/syncthing/1.1.5/templates/_persistence.tpl similarity index 100% rename from test/syncthing/1.0.13/templates/_persistence.tpl rename to test/syncthing/1.1.5/templates/_persistence.tpl diff --git a/test/syncthing/1.0.13/templates/_portal.tpl b/test/syncthing/1.1.5/templates/_portal.tpl similarity index 100% rename from test/syncthing/1.0.13/templates/_portal.tpl rename to test/syncthing/1.1.5/templates/_portal.tpl diff --git a/test/syncthing/1.0.13/templates/_service.tpl b/test/syncthing/1.1.5/templates/_service.tpl similarity index 100% rename from test/syncthing/1.0.13/templates/_service.tpl rename to test/syncthing/1.1.5/templates/_service.tpl diff --git a/test/syncthing/1.0.13/templates/_syncthing.tpl b/test/syncthing/1.1.5/templates/_syncthing.tpl similarity index 91% rename from test/syncthing/1.0.13/templates/_syncthing.tpl rename to test/syncthing/1.1.5/templates/_syncthing.tpl index be392f87be..246019c07c 100644 --- a/test/syncthing/1.0.13/templates/_syncthing.tpl +++ b/test/syncthing/1.1.5/templates/_syncthing.tpl @@ -40,6 +40,13 @@ workload: STNOUPGRADE: "true" fixedEnv: PUID: {{ .Values.syncthingID.user }} + {{ with .Values.syncthingConfig.additionalEnvs }} + envList: + {{ range $env := . }} + - name: {{ $env.name }} + value: {{ $env.value }} + {{ end }} + {{ end }} probes: liveness: enabled: true diff --git a/test/syncthing/1.0.13/templates/common.yaml b/test/syncthing/1.1.5/templates/common.yaml similarity index 100% rename from test/syncthing/1.0.13/templates/common.yaml rename to test/syncthing/1.1.5/templates/common.yaml diff --git a/test/syncthing/1.0.13/upgrade_strategy_disable b/test/syncthing/1.1.5/upgrade_strategy_disable similarity index 100% rename from test/syncthing/1.0.13/upgrade_strategy_disable rename to test/syncthing/1.1.5/upgrade_strategy_disable diff --git a/test/syncthing/item.yaml b/test/syncthing/item.yaml index e0523fcd26..350345874e 100644 --- a/test/syncthing/item.yaml +++ b/test/syncthing/item.yaml @@ -1,8 +1,11 @@ -icon_url: https://syncthing.net/img/logo-horizontal.svg +icon_url: https://media.sys.truenas.net/apps/syncthing/icons/icon.svg categories: - storage screenshots: - - https://syncthing.net/img/screenshot.png + - https://media.sys.truenas.net/apps/syncthing/screenshots/screenshot1.png + - https://media.sys.truenas.net/apps/syncthing/screenshots/screenshot2.png + - https://media.sys.truenas.net/apps/syncthing/screenshots/screenshot3.png + - https://media.sys.truenas.net/apps/syncthing/screenshots/screenshot4.png tags: - sync - file-sharing