From 3aa8f2d90e91dce471626245141d0ce8808353a3 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Sun, 16 Apr 2023 12:51:02 +0300 Subject: [PATCH] fix(syncthing,traefik,blocky): fix probes, protocol, config structure (#8057) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes #8054 **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- charts/enterprise/blocky/Chart.yaml | 2 +- .../blocky/templates/_blockyConfig.tpl | 50 +++++++++---------- charts/enterprise/traefik/Chart.yaml | 2 +- charts/enterprise/traefik/questions.yaml | 8 +-- charts/stable/syncthing/Chart.yaml | 2 +- charts/stable/syncthing/values.yaml | 16 ++++++ 6 files changed, 46 insertions(+), 34 deletions(-) diff --git a/charts/enterprise/blocky/Chart.yaml b/charts/enterprise/blocky/Chart.yaml index cc51c5055ec..3b32c75f184 100644 --- a/charts/enterprise/blocky/Chart.yaml +++ b/charts/enterprise/blocky/Chart.yaml @@ -25,7 +25,7 @@ sources: - https://0xerr0r.github.io/blocky/ - https://github.com/0xERR0R/blocky - https://github.com/Mozart409/blocky-frontend -version: 5.0.18 +version: 5.0.19 annotations: truecharts.org/catagories: | - network diff --git a/charts/enterprise/blocky/templates/_blockyConfig.tpl b/charts/enterprise/blocky/templates/_blockyConfig.tpl index e14df2dc83d..66f8f78e96d 100644 --- a/charts/enterprise/blocky/templates/_blockyConfig.tpl +++ b/charts/enterprise/blocky/templates/_blockyConfig.tpl @@ -43,22 +43,19 @@ upstream: {{- $value.dnsservers | toYaml | nindent 8 }} {{- end }} -{{- if .Values.service.dnsudp.enabled }} -port: {{ .Values.service.dnsudp.ports.dnsudp.targetPort }} -{{- end }} - -{{- if .Values.service.dot.enabled }} -tlsPort: {{ .Values.service.dot.ports.dot.targetPort }} -{{- end }} - -{{- if .Values.service.main.enabled }} -httpPort: {{ .Values.service.main.ports.main.targetPort }} -{{- end }} - -{{- if .Values.service.https.enabled }} -httpsPort: {{ .Values.service.https.ports.https.targetPort }} -{{- end }} - +ports: + {{- if .Values.service.dnsudp.enabled }} + dns: {{ .Values.service.dnsudp.ports.dnsudp.targetPort }} + {{- end }} + {{- if .Values.service.dot.enabled }} + tls: {{ .Values.service.dot.ports.dot.targetPort }} + {{- end }} + {{- if .Values.service.main.enabled }} + http: {{ .Values.service.main.ports.main.targetPort }} + {{- end }} + {{- if .Values.service.https.enabled }} + https: {{ .Values.service.https.ports.https.targetPort }} + {{- end }} {{- if .Values.certFile }} certFile: {{ .Values.certFile }} @@ -68,17 +65,16 @@ certFile: {{ .Values.certFile }} keyFile: {{ .Values.keyFile }} {{- end }} -{{- if .Values.logLevel }} -logLevel: {{ .Values.logLevel }} -{{- end }} - -{{- if .Values.logTimestamp }} -logTimestamp: {{ .Values.logTimestamp }} -{{- end }} - -{{- if .Values.logPrivacy }} -logPrivacy: {{ .Values.logPrivacy }} -{{- end }} +log: + {{- if .Values.logLevel }} + level: {{ .Values.logLevel }} + {{- end }} + {{- if .Values.logTimestamp }} + timestamp: {{ .Values.logTimestamp }} + {{- end }} + {{- if .Values.logPrivacy }} + privacy: {{ .Values.logPrivacy }} + {{- end }} {{- if .Values.dohUserAgent }} dohUserAgent: {{ .Values.dohUserAgent }} diff --git a/charts/enterprise/traefik/Chart.yaml b/charts/enterprise/traefik/Chart.yaml index caeaa629a0e..ce93365ac12 100644 --- a/charts/enterprise/traefik/Chart.yaml +++ b/charts/enterprise/traefik/Chart.yaml @@ -23,7 +23,7 @@ sources: - https://github.com/traefik/traefik-helm-chart - https://traefik.io/ type: application -version: 17.0.20 +version: 17.0.21 annotations: truecharts.org/catagories: | - network diff --git a/charts/enterprise/traefik/questions.yaml b/charts/enterprise/traefik/questions.yaml index c7a053be6fa..66a9edda5f3 100644 --- a/charts/enterprise/traefik/questions.yaml +++ b/charts/enterprise/traefik/questions.yaml @@ -319,13 +319,13 @@ questions: label: "Entrypoints Type" schema: type: string - default: "TCP" + default: "tcp" enum: - - value: HTTP + - value: http description: "HTTP" - - value: "HTTPS" + - value: "https" description: "HTTPS" - - value: TCP + - value: tcp description: "TCP" - variable: port label: "Port" diff --git a/charts/stable/syncthing/Chart.yaml b/charts/stable/syncthing/Chart.yaml index 8b6c864efd1..39ab1cfa4de 100644 --- a/charts/stable/syncthing/Chart.yaml +++ b/charts/stable/syncthing/Chart.yaml @@ -21,7 +21,7 @@ sources: - https://syncthing.net/ - https://github.com/syncthing/syncthing type: application -version: 14.0.2 +version: 14.0.3 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/syncthing/values.yaml b/charts/stable/syncthing/values.yaml index 2298a67f712..33233cb78a6 100644 --- a/charts/stable/syncthing/values.yaml +++ b/charts/stable/syncthing/values.yaml @@ -2,6 +2,20 @@ image: repository: tccr.io/truecharts/syncthing pullPolicy: IfNotPresent tag: 1.23.1@sha256:d928faeb990eea787514d9fefb6c03c682235cfeda815178ca78e443ee64846a + +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + path: /rest/noauth/health + readiness: + path: /rest/noauth/health + startup: + path: /rest/noauth/health + service: main: ports: @@ -31,10 +45,12 @@ service: port: 21027 targetPort: 21027 protocol: udp + persistence: config: enabled: true mountPath: "/var/syncthing" + portal: open: enabled: true