From edc2dd1cdd71a581eda85ed22203060f2a38425f Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Sun, 30 Apr 2023 17:46:40 +0300 Subject: [PATCH] fix(plex): fix probe protocol->scheme (#8616) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ 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?** **📃 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._ --- charts/stable/plex/Chart.yaml | 2 +- charts/stable/plex/ci/basic-values.yaml | 0 charts/stable/plex/ci/https-values.yaml | 2 -- charts/stable/plex/questions.yaml | 8 ++++++-- charts/stable/plex/templates/common.yaml | 7 ++++--- charts/stable/plex/values.yaml | 7 ++----- 6 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 charts/stable/plex/ci/basic-values.yaml delete mode 100644 charts/stable/plex/ci/https-values.yaml diff --git a/charts/stable/plex/Chart.yaml b/charts/stable/plex/Chart.yaml index 4de78bf03ed..f86ed6ea41e 100644 --- a/charts/stable/plex/Chart.yaml +++ b/charts/stable/plex/Chart.yaml @@ -21,7 +21,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/plex - https://github.com/k8s-at-home/container-images/pkgs/container/plex type: application -version: 13.0.12 +version: 13.0.13 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/plex/ci/basic-values.yaml b/charts/stable/plex/ci/basic-values.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/charts/stable/plex/ci/https-values.yaml b/charts/stable/plex/ci/https-values.yaml deleted file mode 100644 index de386234206..00000000000 --- a/charts/stable/plex/ci/https-values.yaml +++ /dev/null @@ -1,2 +0,0 @@ -plex: - requireHTTPS: true diff --git a/charts/stable/plex/questions.yaml b/charts/stable/plex/questions.yaml index 411b55bcf1f..892b1a260f7 100644 --- a/charts/stable/plex/questions.yaml +++ b/charts/stable/plex/questions.yaml @@ -61,10 +61,14 @@ questions: default: true - variable: requireHTTPS label: Require HTTPS - description: Please use this toggle to "Require HTTPS", do not use the Plex UI. + description: | + NOTE: Only enable this setting AFTER you are done with the initial configuration + of your Plex Server and verify that remote access is working.
+ Please use this toggle to "Require HTTPS", instead of using the Plex UI, + so probes are configured correctly. schema: type: boolean - default: true + default: false # Include{containerConfig} # Include{podOptions} diff --git a/charts/stable/plex/templates/common.yaml b/charts/stable/plex/templates/common.yaml index 821a261b085..7f4568886df 100644 --- a/charts/stable/plex/templates/common.yaml +++ b/charts/stable/plex/templates/common.yaml @@ -8,9 +8,10 @@ {{- $protocol = "https" -}} {{- end -}} -{{- $_ := set .Values.workload.main.podSpec.containers.main.probes.liveness "protocol" $protocol -}} -{{- $_ := set .Values.workload.main.podSpec.containers.main.probes.readiness "protocol" $protocol -}} -{{- $_ := set .Values.workload.main.podSpec.containers.main.probes.startup "protocol" $protocol -}} +{{- $_ := set .Values.workload.main.podSpec.containers.main.probes.liveness "scheme" $protocol -}} +{{- $_ := set .Values.workload.main.podSpec.containers.main.probes.readiness "scheme" $protocol -}} +{{- $_ := set .Values.workload.main.podSpec.containers.main.probes.startup "scheme" $protocol -}} +{{- $_ := set .Values.service.main.ports.main "protocol" $protocol -}} {{- if not (eq .Values.service.main.type "ClusterIP") -}} {{- $serverURL = (printf "%v://%v:%v" $protocol .Values.plex.serverIP .Values.service.main.ports.main.port) -}} diff --git a/charts/stable/plex/values.yaml b/charts/stable/plex/values.yaml index c3b01760d92..479f4608b41 100644 --- a/charts/stable/plex/values.yaml +++ b/charts/stable/plex/values.yaml @@ -1,7 +1,7 @@ image: repository: tccr.io/truecharts/plex pullPolicy: IfNotPresent - tag: 1.31.3.6868@sha256:15a438c7e741a3158a04be54916dbb56be7bbe78129519b2fd91b285567029e3 + tag: v1.32.0.6973@sha256:25f3e489457a7351bb25badba6b288b8c6b68c67ff973f6ff792010d7ecae110 service: main: ports: @@ -20,7 +20,7 @@ plex: serverIP: "127.0.0.1" additionalAdvertiseURL: "" disableGDM: true - requireHTTPS: true + requireHTTPS: false workload: main: @@ -31,15 +31,12 @@ workload: liveness: enabled: true path: /identity - protocol: http readiness: enabled: true path: /identity - protocol: http startup: enabled: true path: /identity - protocol: http env: PLEX_PREFERENCE_GDM: 'GdmEnabled={{ ternary "0" "1" .Values.plex.disableGDM }}' # 0=Required, 1=Preferred