From 19a136f6368fa147f1349fbefdb30907de7adca7 Mon Sep 17 00:00:00 2001 From: Rickard Date: Sat, 17 Jun 2023 17:35:45 +0200 Subject: [PATCH] fix(transmission) fixing issue created by pull #8095 that was suppost to fix issue #8092 (#9728) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** The fix merged in pull #8095 didn't work because of the unfixed [issue 1474](https://github.com/transmission/transmission/issues/1474) in transmission. This fix reverts #8095 fix of issue #8092 and fixes #8092 by switching the probes from http to tcp. ⚒️ Fixes #8092 **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [x] 🪛 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?** Added my forked repo as source for truecharts and installed transmission **📃 Notes:** **✔️ Checklist:** - [x] ⚖️ My code follows the style guidelines of this project - [x] 👀 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 - [x] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [x] ⬆️ 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._ --------- Signed-off-by: Rickard --- charts/stable/transmission/Chart.yaml | 2 +- charts/stable/transmission/templates/common.yaml | 7 ------- charts/stable/transmission/values.yaml | 15 +++++++++------ 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/charts/stable/transmission/Chart.yaml b/charts/stable/transmission/Chart.yaml index 363776e2887..c07278acf7b 100644 --- a/charts/stable/transmission/Chart.yaml +++ b/charts/stable/transmission/Chart.yaml @@ -22,7 +22,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/transmission - https://github.com/transmission/transmission type: application -version: 16.0.26 +version: 16.0.27 annotations: truecharts.org/catagories: | - download-tools diff --git a/charts/stable/transmission/templates/common.yaml b/charts/stable/transmission/templates/common.yaml index ff3cc61a211..5e5e0d8c871 100644 --- a/charts/stable/transmission/templates/common.yaml +++ b/charts/stable/transmission/templates/common.yaml @@ -11,12 +11,5 @@ {{- $_ := set $.Values.workload.main.podSpec.containers.main.probes.startup "httpHeaders" $headers -}} {{- end -}} -{{- with .Values.workload.main.podSpec.containers.main.env.TRANSMISSION_RPC_WHITELIST -}} - {{- if not (contains $.Values.chartContext.podCIDR .) }} - {{/* Append CIDR in front */}} - {{- $_ := set $.Values.workload.main.podSpec.containers.main.env.TRANSMISSION_RPC_WHITELIST (printf "%v,%v" $.Values.chartContext.podCIDR .) }} - {{- end }} -{{- end -}} - {{/* Render the templates */}} {{ include "tc.v1.common.loader.apply" . }} diff --git a/charts/stable/transmission/values.yaml b/charts/stable/transmission/values.yaml index a07c1f9b808..0e5798ea29f 100644 --- a/charts/stable/transmission/values.yaml +++ b/charts/stable/transmission/values.yaml @@ -10,14 +10,17 @@ workload: main: probes: liveness: - type: http - path: "{{ .Values.workload.main.podSpec.containers.main.env.TRANSMISSION__RPC_URL }}" + enabled: true + type: tcp + port: "{{ .Values.service.main.ports.main.targetPort }}" startup: - type: http - path: "{{ .Values.workload.main.podSpec.containers.main.env.TRANSMISSION__RPC_URL }}" + enabled: true + type: tcp + port: "{{ .Values.service.main.ports.main.targetPort }}" readiness: - type: http - path: "{{ .Values.workload.main.podSpec.containers.main.env.TRANSMISSION__RPC_URL }}" + enabled: true + type: tcp + port: "{{ .Values.service.main.ports.main.targetPort }}" env: # PUID: 1001 # URL is set here so it wont be able to get overwritten by the user