From bafa2b9aeebf500d23931378144f8746ccc45bd8 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Sat, 15 Jul 2023 16:50:05 +0000 Subject: [PATCH] Publish new changes in catalog --- .../syncthing/1.0.6/templates/_configure.tpl | 53 ------ .../syncthing/1.0.6/templates/_syncthing.tpl | 178 ------------------ .../syncthing/{1.0.6 => 1.0.7}/Chart.lock | 0 .../syncthing/{1.0.6 => 1.0.7}/Chart.yaml | 2 +- .../syncthing/{1.0.6 => 1.0.7}/README.md | 0 .../syncthing/{1.0.6 => 1.0.7}/app-readme.md | 0 .../{1.0.6 => 1.0.7}/charts/common-1.0.11.tgz | Bin .../ci/basic-no-hostnet-values.yaml | 0 .../{1.0.6 => 1.0.7}/ci/basic-values.yaml | 0 .../ci/https-no-hostnet-values.yaml | 0 .../{1.0.6 => 1.0.7}/ci/https-values.yaml | 0 .../syncthing/{1.0.6 => 1.0.7}/ix_values.yaml | 0 .../syncthing/{1.0.6 => 1.0.7}/metadata.yaml | 0 .../syncthing/{1.0.6 => 1.0.7}/questions.yaml | 0 .../{1.0.6 => 1.0.7}/templates/NOTES.txt | 0 .../templates/_certContainer.tpl | 0 .../syncthing/1.0.7/templates/_configure.tpl | 94 +++++++++ .../1.0.7/templates/_persistence.tpl | 73 +++++++ .../{1.0.6 => 1.0.7}/templates/_portal.tpl | 0 .../syncthing/1.0.7/templates/_service.tpl | 47 +++++ .../syncthing/1.0.7/templates/_syncthing.tpl | 71 +++++++ .../{1.0.6 => 1.0.7}/templates/common.yaml | 2 + .../{1.0.6 => 1.0.7}/upgrade_strategy_disable | 0 23 files changed, 288 insertions(+), 232 deletions(-) delete mode 100644 enterprise/syncthing/1.0.6/templates/_configure.tpl delete mode 100644 enterprise/syncthing/1.0.6/templates/_syncthing.tpl rename enterprise/syncthing/{1.0.6 => 1.0.7}/Chart.lock (100%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/Chart.yaml (97%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/README.md (100%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/app-readme.md (100%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/charts/common-1.0.11.tgz (100%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/ci/basic-no-hostnet-values.yaml (100%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/ci/basic-values.yaml (100%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/ci/https-no-hostnet-values.yaml (100%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/ci/https-values.yaml (100%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/ix_values.yaml (100%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/metadata.yaml (100%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/questions.yaml (100%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/templates/NOTES.txt (100%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/templates/_certContainer.tpl (100%) create mode 100644 enterprise/syncthing/1.0.7/templates/_configure.tpl create mode 100644 enterprise/syncthing/1.0.7/templates/_persistence.tpl rename enterprise/syncthing/{1.0.6 => 1.0.7}/templates/_portal.tpl (100%) create mode 100644 enterprise/syncthing/1.0.7/templates/_service.tpl create mode 100644 enterprise/syncthing/1.0.7/templates/_syncthing.tpl rename enterprise/syncthing/{1.0.6 => 1.0.7}/templates/common.yaml (69%) rename enterprise/syncthing/{1.0.6 => 1.0.7}/upgrade_strategy_disable (100%) diff --git a/enterprise/syncthing/1.0.6/templates/_configure.tpl b/enterprise/syncthing/1.0.6/templates/_configure.tpl deleted file mode 100644 index 8bc27338f1..0000000000 --- a/enterprise/syncthing/1.0.6/templates/_configure.tpl +++ /dev/null @@ -1,53 +0,0 @@ -{{- define "syncthing.configure" -}} -{{/* - https://docs.syncthing.net/users/config.html - Note: Configuration in the above link does not match the subcommands of the cli - To get the correct subcommands, run `syncthing cli config ` - It will print all the available subcommands for that category - "Knobs" are exposed under Values.syncthingConfig, We can exposed those to questions.yaml if we want - */}} -configmap: - syncthing-configure: - enabled: true - data: - configure.sh: | - #!/bin/sh - set -e - configDir=/var/syncthing/config - - # Make sure the file exists - until [ -f "$configDir/config.xml" ]; do - sleep 2 - done - - # Check the API is running - until curl --silent --output /dev/null http://localhost:{{ .Values.syncthingNetwork.webPort }}/rest/noauth/health; do - sleep 2 - done - - function setConfig() { - syncthing cli --home "$configDir" config $@ - } - - # Now we can use the syncthing cli (wrapper around the API) to set the defaults. - # Keep in mind that all the below values are not enforced, user can change them - # while the app is running, but will be re-applied on restart. - - # Category "options" is more like "general" or "global" settings. - setConfig options announce-lanaddresses set -- {{ ternary "1" "0" .Values.syncthingConfig.announceLANAddresses | quote }} - setConfig options global-ann-enabled set -- {{ ternary "1" "0" .Values.syncthingConfig.globalDiscovery | quote }} - setConfig options local-ann-enabled set -- {{ ternary "1" "0" .Values.syncthingConfig.localDiscovery | quote }} - setConfig options natenabled set -- {{ ternary "1" "0" .Values.syncthingConfig.natTraversal | quote }} - setConfig options relays-enabled set -- {{ ternary "1" "0" .Values.syncthingConfig.relaying | quote }} - setConfig options uraccepted set -- {{ ternary "1" "-1" .Values.syncthingConfig.telemetry | quote }} - setConfig options auto-upgrade-intervalh set -- "0" - - # Category "defaults/folder" contains the default settings for new folders. - setConfig defaults folder xattr-filter max-total-size set -- 10485760 - setConfig defaults folder xattr-filter max-single-entry-size set -- 2097152 - setConfig defaults folder send-ownership set -- 1 - setConfig defaults folder sync-ownership set -- 1 - setConfig defaults folder send-xattrs set -- 1 - setConfig defaults folder sync-xattrs set -- 1 - -{{- end -}} diff --git a/enterprise/syncthing/1.0.6/templates/_syncthing.tpl b/enterprise/syncthing/1.0.6/templates/_syncthing.tpl deleted file mode 100644 index b0ae4e57dc..0000000000 --- a/enterprise/syncthing/1.0.6/templates/_syncthing.tpl +++ /dev/null @@ -1,178 +0,0 @@ -{{- define "syncthing.workload" -}} -workload: - syncthing: - enabled: true - primary: true - type: Deployment - podSpec: - hostNetwork: {{ .Values.syncthingNetwork.hostNetwork }} - securityContext: - fsGroup: {{ .Values.syncthingID.group }} - containers: - syncthing: - enabled: true - primary: true - imageSelector: image - securityContext: - runAsUser: 0 - runAsGroup: 0 - runAsNonRoot: false - readOnlyRootFilesystem: false - # This is needed to allow syncthing assign - # PCAPs to its child processes - allowPrivilegeEscalation: true - capabilities: - add: - - FOWNER - - DAC_OVERRIDE - - CHOWN - - SETUID - - SETGID - - SETFCAP - - SETPCAP - env: - PCAP: cap_chown,cap_dac_override,cap_fowner+ep - STGUIADDRESS: "0.0.0.0:{{ .Values.syncthingNetwork.webPort }}" - # Disable automatic upgrades - STNOUPGRADE: "true" - fixedEnv: - PUID: {{ .Values.syncthingID.user }} - probes: - liveness: - enabled: true - type: http - path: /rest/noauth/health - port: "{{ .Values.syncthingNetwork.webPort }}" - readiness: - enabled: true - type: http - path: /rest/noauth/health - port: "{{ .Values.syncthingNetwork.webPort }}" - startup: - enabled: true - type: http - path: /rest/noauth/health - port: "{{ .Values.syncthingNetwork.webPort }}" - # We use this hook as we need the API - # to be running when we run the configure script - lifecycle: - postStart: - type: exec - command: - - su-exec - - "{{ .Values.syncthingID.user }}:{{ .Values.syncthingID.group }}" - - /configure.sh - {{- if .Values.syncthingNetwork.certificateID }} - initContainers: - {{- include "syncthing.certContainer" $ | nindent 8 -}} - {{- end }} -{{/* Service */}} -service: - syncthing-web: - enabled: true - primary: true - type: NodePort - targetSelector: syncthing - ports: - webui: - enabled: true - primary: true - port: {{ .Values.syncthingNetwork.webPort }} - nodePort: {{ .Values.syncthingNetwork.webPort }} - targetSelector: syncthing - syncthing-discovery: - # Only enable this service if local discovery is enabled - enabled: {{ .Values.syncthingConfig.localDiscovery }} - type: NodePort - targetSelector: syncthing - ports: - discovery: - enabled: true - port: {{ .Values.syncthingNetwork.localDiscoveryPort }} - nodePort: {{ .Values.syncthingNetwork.localDiscoveryPort }} - targetPort: 21017 - protocol: udp - targetSelector: syncthing - syncthing-transfer: - enabled: true - type: NodePort - targetSelector: syncthing - ports: - tcp: - enabled: true - primary: true - port: {{ .Values.syncthingNetwork.tcpPort }} - nodePort: {{ .Values.syncthingNetwork.tcpPort }} - targetPort: 22000 - targetSelector: syncthing - quic: - enabled: true - port: {{ .Values.syncthingNetwork.quicPort }} - nodePort: {{ .Values.syncthingNetwork.quicPort }} - targetPort: 22000 - protocol: udp - targetSelector: syncthing - -{{/* Persistence */}} -persistence: - home: - enabled: true - type: {{ .Values.syncthingStorage.home.type }} - datasetName: {{ .Values.syncthingStorage.home.datasetName | default "" }} - hostPath: {{ .Values.syncthingStorage.home.hostPath | default "" }} - targetSelector: - syncthing: - syncthing: - mountPath: /var/syncthing - 01-certs: - mountPath: /var/syncthing - configure: - enabled: true - type: configmap - objectName: syncthing-configure - defaultMode: "0770" - targetSelector: - syncthing: - syncthing: - mountPath: /configure.sh - subPath: configure.sh - - {{- if not .Values.syncthingStorage.additionalStorages -}} - {{- fail "Syncthing - Expected at least one additional storage defined" -}} - {{- end -}} - - {{- range $idx, $storage := .Values.syncthingStorage.additionalStorages }} - {{ printf "sync-%v" (int $idx) }}: - enabled: true - type: {{ $storage.type }} - datasetName: {{ $storage.datasetName | default "" }} - hostPath: {{ $storage.hostPath | default "" }} - targetSelector: - syncthing: - syncthing: - mountPath: {{ $storage.mountPath }} - {{- end }} - - {{- if .Values.syncthingNetwork.certificateID }} - certs: - enabled: true - type: secret - objectName: syncthing-cert - defaultMode: "0600" - items: - - key: tls.key - path: https-key.pem - - key: tls.crt - path: https-cert.pem - targetSelector: - syncthing: - 01-certs: - mountPath: /certs - readOnly: true - -scaleCertificate: - syncthing-cert: - enabled: true - id: {{ .Values.syncthingNetwork.certificateID }} - {{- end -}} -{{- end -}} diff --git a/enterprise/syncthing/1.0.6/Chart.lock b/enterprise/syncthing/1.0.7/Chart.lock similarity index 100% rename from enterprise/syncthing/1.0.6/Chart.lock rename to enterprise/syncthing/1.0.7/Chart.lock diff --git a/enterprise/syncthing/1.0.6/Chart.yaml b/enterprise/syncthing/1.0.7/Chart.yaml similarity index 97% rename from enterprise/syncthing/1.0.6/Chart.yaml rename to enterprise/syncthing/1.0.7/Chart.yaml index 8e27920fdf..581e561bf7 100644 --- a/enterprise/syncthing/1.0.6/Chart.yaml +++ b/enterprise/syncthing/1.0.7/Chart.yaml @@ -3,7 +3,7 @@ description: Syncthing is a continuous file synchronization program. annotations: title: Syncthing type: application -version: 1.0.6 +version: 1.0.7 apiVersion: v2 appVersion: '1.23.3' kubeVersion: '>=1.16.0-0' diff --git a/enterprise/syncthing/1.0.6/README.md b/enterprise/syncthing/1.0.7/README.md similarity index 100% rename from enterprise/syncthing/1.0.6/README.md rename to enterprise/syncthing/1.0.7/README.md diff --git a/enterprise/syncthing/1.0.6/app-readme.md b/enterprise/syncthing/1.0.7/app-readme.md similarity index 100% rename from enterprise/syncthing/1.0.6/app-readme.md rename to enterprise/syncthing/1.0.7/app-readme.md diff --git a/enterprise/syncthing/1.0.6/charts/common-1.0.11.tgz b/enterprise/syncthing/1.0.7/charts/common-1.0.11.tgz similarity index 100% rename from enterprise/syncthing/1.0.6/charts/common-1.0.11.tgz rename to enterprise/syncthing/1.0.7/charts/common-1.0.11.tgz diff --git a/enterprise/syncthing/1.0.6/ci/basic-no-hostnet-values.yaml b/enterprise/syncthing/1.0.7/ci/basic-no-hostnet-values.yaml similarity index 100% rename from enterprise/syncthing/1.0.6/ci/basic-no-hostnet-values.yaml rename to enterprise/syncthing/1.0.7/ci/basic-no-hostnet-values.yaml diff --git a/enterprise/syncthing/1.0.6/ci/basic-values.yaml b/enterprise/syncthing/1.0.7/ci/basic-values.yaml similarity index 100% rename from enterprise/syncthing/1.0.6/ci/basic-values.yaml rename to enterprise/syncthing/1.0.7/ci/basic-values.yaml diff --git a/enterprise/syncthing/1.0.6/ci/https-no-hostnet-values.yaml b/enterprise/syncthing/1.0.7/ci/https-no-hostnet-values.yaml similarity index 100% rename from enterprise/syncthing/1.0.6/ci/https-no-hostnet-values.yaml rename to enterprise/syncthing/1.0.7/ci/https-no-hostnet-values.yaml diff --git a/enterprise/syncthing/1.0.6/ci/https-values.yaml b/enterprise/syncthing/1.0.7/ci/https-values.yaml similarity index 100% rename from enterprise/syncthing/1.0.6/ci/https-values.yaml rename to enterprise/syncthing/1.0.7/ci/https-values.yaml diff --git a/enterprise/syncthing/1.0.6/ix_values.yaml b/enterprise/syncthing/1.0.7/ix_values.yaml similarity index 100% rename from enterprise/syncthing/1.0.6/ix_values.yaml rename to enterprise/syncthing/1.0.7/ix_values.yaml diff --git a/enterprise/syncthing/1.0.6/metadata.yaml b/enterprise/syncthing/1.0.7/metadata.yaml similarity index 100% rename from enterprise/syncthing/1.0.6/metadata.yaml rename to enterprise/syncthing/1.0.7/metadata.yaml diff --git a/enterprise/syncthing/1.0.6/questions.yaml b/enterprise/syncthing/1.0.7/questions.yaml similarity index 100% rename from enterprise/syncthing/1.0.6/questions.yaml rename to enterprise/syncthing/1.0.7/questions.yaml diff --git a/enterprise/syncthing/1.0.6/templates/NOTES.txt b/enterprise/syncthing/1.0.7/templates/NOTES.txt similarity index 100% rename from enterprise/syncthing/1.0.6/templates/NOTES.txt rename to enterprise/syncthing/1.0.7/templates/NOTES.txt diff --git a/enterprise/syncthing/1.0.6/templates/_certContainer.tpl b/enterprise/syncthing/1.0.7/templates/_certContainer.tpl similarity index 100% rename from enterprise/syncthing/1.0.6/templates/_certContainer.tpl rename to enterprise/syncthing/1.0.7/templates/_certContainer.tpl diff --git a/enterprise/syncthing/1.0.7/templates/_configure.tpl b/enterprise/syncthing/1.0.7/templates/_configure.tpl new file mode 100644 index 0000000000..989e3710c3 --- /dev/null +++ b/enterprise/syncthing/1.0.7/templates/_configure.tpl @@ -0,0 +1,94 @@ +{{- define "syncthing.configure" -}} +{{/* + https://docs.syncthing.net/users/config.html + Note: Configuration in the above link does not match the subcommands of the cli + To get the correct subcommands, run `syncthing cli config ` + It will print all the available subcommands for that category + "Knobs" are exposed under Values.syncthingConfig, We can exposed those to questions.yaml if we want + */}} +configmap: + syncthing-configure: + enabled: true + data: + configure.sh: | + #!/bin/sh + set -e + configDir=/var/syncthing/config + + # Make sure the file exists + until [ -f "$configDir/config.xml" ]; do + sleep 2 + done + + # Check the API is running + until curl --silent --output /dev/null http://localhost:{{ .Values.syncthingNetwork.webPort }}/rest/noauth/health; do + sleep 2 + done + + function setConfig() { + syncthing cli --home "$configDir" config $@ + } + + # Now we can use the syncthing cli (wrapper around the API) to set the defaults. + # Keep in mind that all the below values are not enforced, user can change them + # while the app is running, but will be re-applied on restart. + + # Category "options" is more like "general" or "global" settings. + setConfig options announce-lanaddresses set -- {{ ternary "1" "0" .Values.syncthingConfig.announceLANAddresses | quote }} + setConfig options global-ann-enabled set -- {{ ternary "1" "0" .Values.syncthingConfig.globalDiscovery | quote }} + setConfig options local-ann-enabled set -- {{ ternary "1" "0" .Values.syncthingConfig.localDiscovery | quote }} + setConfig options natenabled set -- {{ ternary "1" "0" .Values.syncthingConfig.natTraversal | quote }} + setConfig options relays-enabled set -- {{ ternary "1" "0" .Values.syncthingConfig.relaying | quote }} + setConfig options uraccepted set -- {{ ternary "1" "-1" .Values.syncthingConfig.telemetry | quote }} + setConfig options auto-upgrade-intervalh set -- "0" + + # Category "defaults/folder" contains the default settings for new folders. + setConfig defaults folder xattr-filter max-total-size set -- 10485760 + setConfig defaults folder xattr-filter max-single-entry-size set -- 2097152 + setConfig defaults folder send-ownership set -- 1 + setConfig defaults folder sync-ownership set -- 1 + setConfig defaults folder send-xattrs set -- 1 + setConfig defaults folder sync-xattrs set -- 1 + syncthing-truenas-logo: + enabled: true + data: + logo-horizontal.svg: | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +{{- end -}} diff --git a/enterprise/syncthing/1.0.7/templates/_persistence.tpl b/enterprise/syncthing/1.0.7/templates/_persistence.tpl new file mode 100644 index 0000000000..48f862e341 --- /dev/null +++ b/enterprise/syncthing/1.0.7/templates/_persistence.tpl @@ -0,0 +1,73 @@ +{{- define "syncthing.persistence" -}} +persistence: + home: + enabled: true + type: {{ .Values.syncthingStorage.home.type }} + datasetName: {{ .Values.syncthingStorage.home.datasetName | default "" }} + hostPath: {{ .Values.syncthingStorage.home.hostPath | default "" }} + targetSelector: + syncthing: + syncthing: + mountPath: /var/syncthing + 01-certs: + mountPath: /var/syncthing + configure: + enabled: true + type: configmap + objectName: syncthing-configure + defaultMode: "0770" + targetSelector: + syncthing: + syncthing: + mountPath: /configure.sh + subPath: configure.sh + truenas-logo: + enabled: true + type: configmap + objectName: syncthing-truenas-logo + defaultMode: "0770" + targetSelector: + syncthing: + syncthing: + mountPath: /var/truenas/assets/gui/default/assets/img/logo-horizontal.svg + subPath: logo-horizontal.svg + + {{- if not .Values.syncthingStorage.additionalStorages -}} + {{- fail "Syncthing - Expected at least one additional storage defined" -}} + {{- end -}} + + {{- range $idx, $storage := .Values.syncthingStorage.additionalStorages }} + {{ printf "sync-%v" (int $idx) }}: + enabled: true + type: {{ $storage.type }} + datasetName: {{ $storage.datasetName | default "" }} + hostPath: {{ $storage.hostPath | default "" }} + targetSelector: + syncthing: + syncthing: + mountPath: {{ $storage.mountPath }} + {{- end }} + + {{- if .Values.syncthingNetwork.certificateID }} + certs: + enabled: true + type: secret + objectName: syncthing-cert + defaultMode: "0600" + items: + - key: tls.key + path: https-key.pem + - key: tls.crt + path: https-cert.pem + targetSelector: + syncthing: + 01-certs: + mountPath: /certs + readOnly: true + +scaleCertificate: + syncthing-cert: + enabled: true + id: {{ .Values.syncthingNetwork.certificateID }} + {{- end -}} +{{- end -}} diff --git a/enterprise/syncthing/1.0.6/templates/_portal.tpl b/enterprise/syncthing/1.0.7/templates/_portal.tpl similarity index 100% rename from enterprise/syncthing/1.0.6/templates/_portal.tpl rename to enterprise/syncthing/1.0.7/templates/_portal.tpl diff --git a/enterprise/syncthing/1.0.7/templates/_service.tpl b/enterprise/syncthing/1.0.7/templates/_service.tpl new file mode 100644 index 0000000000..c977aa413a --- /dev/null +++ b/enterprise/syncthing/1.0.7/templates/_service.tpl @@ -0,0 +1,47 @@ +{{- define "syncthing.service" -}} +service: + syncthing-web: + enabled: true + primary: true + type: NodePort + targetSelector: syncthing + ports: + webui: + enabled: true + primary: true + port: {{ .Values.syncthingNetwork.webPort }} + nodePort: {{ .Values.syncthingNetwork.webPort }} + targetSelector: syncthing + syncthing-discovery: + # Only enable this service if local discovery is enabled + enabled: {{ .Values.syncthingConfig.localDiscovery }} + type: NodePort + targetSelector: syncthing + ports: + discovery: + enabled: true + port: {{ .Values.syncthingNetwork.localDiscoveryPort }} + nodePort: {{ .Values.syncthingNetwork.localDiscoveryPort }} + targetPort: 21017 + protocol: udp + targetSelector: syncthing + syncthing-transfer: + enabled: true + type: NodePort + targetSelector: syncthing + ports: + tcp: + enabled: true + primary: true + port: {{ .Values.syncthingNetwork.tcpPort }} + nodePort: {{ .Values.syncthingNetwork.tcpPort }} + targetPort: 22000 + targetSelector: syncthing + quic: + enabled: true + port: {{ .Values.syncthingNetwork.quicPort }} + nodePort: {{ .Values.syncthingNetwork.quicPort }} + targetPort: 22000 + protocol: udp + targetSelector: syncthing +{{- end -}} diff --git a/enterprise/syncthing/1.0.7/templates/_syncthing.tpl b/enterprise/syncthing/1.0.7/templates/_syncthing.tpl new file mode 100644 index 0000000000..a15113cd20 --- /dev/null +++ b/enterprise/syncthing/1.0.7/templates/_syncthing.tpl @@ -0,0 +1,71 @@ +{{- define "syncthing.workload" -}} +workload: + syncthing: + enabled: true + primary: true + type: Deployment + podSpec: + hostNetwork: {{ .Values.syncthingNetwork.hostNetwork }} + securityContext: + fsGroup: {{ .Values.syncthingID.group }} + containers: + syncthing: + enabled: true + primary: true + imageSelector: image + securityContext: + runAsUser: 0 + runAsGroup: 0 + runAsNonRoot: false + readOnlyRootFilesystem: false + # This is needed to allow syncthing assign + # PCAPs to its child processes + allowPrivilegeEscalation: true + capabilities: + add: + - FOWNER + - DAC_OVERRIDE + - CHOWN + - SETUID + - SETGID + - SETFCAP + - SETPCAP + env: + PCAP: cap_chown,cap_dac_override,cap_fowner+ep + STGUIADDRESS: "0.0.0.0:{{ .Values.syncthingNetwork.webPort }}" + # Set a custom override for the GUI assets + STGUIASSETS: /var/truenas/assets/gui + # Disable automatic upgrades + STNOUPGRADE: "true" + fixedEnv: + PUID: {{ .Values.syncthingID.user }} + probes: + liveness: + enabled: true + type: http + path: /rest/noauth/health + port: "{{ .Values.syncthingNetwork.webPort }}" + readiness: + enabled: true + type: http + path: /rest/noauth/health + port: "{{ .Values.syncthingNetwork.webPort }}" + startup: + enabled: true + type: http + path: /rest/noauth/health + port: "{{ .Values.syncthingNetwork.webPort }}" + # We use this hook as we need the API + # to be running when we run the configure script + lifecycle: + postStart: + type: exec + command: + - su-exec + - "{{ .Values.syncthingID.user }}:{{ .Values.syncthingID.group }}" + - /configure.sh + {{- if .Values.syncthingNetwork.certificateID }} + initContainers: + {{- include "syncthing.certContainer" $ | nindent 8 -}} + {{- end }} +{{- end -}} diff --git a/enterprise/syncthing/1.0.6/templates/common.yaml b/enterprise/syncthing/1.0.7/templates/common.yaml similarity index 69% rename from enterprise/syncthing/1.0.6/templates/common.yaml rename to enterprise/syncthing/1.0.7/templates/common.yaml index f9f4fded52..fc970dffa5 100644 --- a/enterprise/syncthing/1.0.6/templates/common.yaml +++ b/enterprise/syncthing/1.0.7/templates/common.yaml @@ -2,6 +2,8 @@ {{/* Merge the templates with Values */}} {{- $_ := mustMergeOverwrite .Values (include "syncthing.workload" $ | fromYaml) -}} +{{- $_ := mustMergeOverwrite .Values (include "syncthing.persistence" $ | fromYaml) -}} +{{- $_ := mustMergeOverwrite .Values (include "syncthing.service" $ | fromYaml) -}} {{- $_ := mustMergeOverwrite .Values (include "syncthing.configure" $ | fromYaml) -}} {{/* Create the configmap for portal manually*/}} diff --git a/enterprise/syncthing/1.0.6/upgrade_strategy_disable b/enterprise/syncthing/1.0.7/upgrade_strategy_disable similarity index 100% rename from enterprise/syncthing/1.0.6/upgrade_strategy_disable rename to enterprise/syncthing/1.0.7/upgrade_strategy_disable