From 37a2e2975f9094b1e3262af0a0773956c0d1b4ad Mon Sep 17 00:00:00 2001
From: Thumbscrew <thumbscrw@pm.me>
Date: Sat, 15 Mar 2025 14:00:15 +0000
Subject: [PATCH] fix(freshrss): liveness and readiness probes should use the
 oidc path when OIDC is enabled (#109)

---
 charts/freshrss/Chart.yaml                | 2 +-
 charts/freshrss/README.md                 | 2 +-
 charts/freshrss/templates/deployment.yaml | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/charts/freshrss/Chart.yaml b/charts/freshrss/Chart.yaml
index 9c5bc40..a1cbab4 100644
--- a/charts/freshrss/Chart.yaml
+++ b/charts/freshrss/Chart.yaml
@@ -23,7 +23,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.6.1
+version: 1.6.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/freshrss/README.md b/charts/freshrss/README.md
index dd30120..e76dab2 100644
--- a/charts/freshrss/README.md
+++ b/charts/freshrss/README.md
@@ -1,6 +1,6 @@
 # freshrss
 
-![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.25.0](https://img.shields.io/badge/AppVersion-1.25.0-informational?style=flat-square)
+![Version: 1.6.2](https://img.shields.io/badge/Version-1.6.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.25.0](https://img.shields.io/badge/AppVersion-1.25.0-informational?style=flat-square)
 
 A Helm chart for FreshRSS
 
diff --git a/charts/freshrss/templates/deployment.yaml b/charts/freshrss/templates/deployment.yaml
index a1944c7..526bbee 100644
--- a/charts/freshrss/templates/deployment.yaml
+++ b/charts/freshrss/templates/deployment.yaml
@@ -113,7 +113,6 @@ spec:
               value: {{ printf "%s" (join " " .xForwardedHeaders) }}
             {{- end }}
             - name: OIDC_SESSION_INACTIVITY_TIMEOUT
-              # value: {{ printf "%d" (add .session.inactivityTimeout) }}
               value: "{{ .session.inactivityTimeout }}"
             {{- if ge .session.maxDuration 0.0 }}
             - name: OIDC_SESSION_MAX_DURATION
@@ -127,12 +126,20 @@ spec:
             {{- end }}
           livenessProbe:
             httpGet:
+              {{- if .Values.freshrss.oidc.enabled }}
+              path: /i/oidc/
+              {{- else }}
               path: /i/
+              {{- end }}
               port: http
             initialDelaySeconds: 30
           readinessProbe:
             httpGet:
+              {{- if .Values.freshrss.oidc.enabled }}
+              path: /i/oidc/
+              {{- else }}
               path: /i/
+              {{- end }}
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}