Merge branch 'master' into add-jellyfin

kubealex · Jan 3, 2024 · de26d9a · de26d9a
2 parents 896e475 + 89862e1
commit de26d9a
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 11 deletions.
diff --git a/helm-charts/k8s-mediaserver/Chart.yaml b/helm-charts/k8s-mediaserver/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: 0.9.1
+appVersion: 0.9.2
 description: A Helm chart for Kubernetes mediaserver
 name: k8s-mediaserver
 type: application
-version: 0.9.1
+version: 0.9.2
diff --git a/helm-charts/k8s-mediaserver/templates/jackett-resources.yml b/helm-charts/k8s-mediaserver/templates/jackett-resources.yml
@@ -72,10 +72,9 @@ spec:
           image: "{{ .Values.jackett.container.image }}:{{ .Values.jackett.container.tag | default .Values.general.image_tag }}"
           imagePullPolicy: Always
           readinessProbe:
-            httpGet:
+            tcpSocket:
               port: {{ .Values.jackett.container.port }}
-              path: /{{ .Values.radarr.ingress.path }}/UI/Dashboard
-            initialDelaySeconds: 5
+            initialDelaySeconds: 15
             periodSeconds: 10
           ports:
             - name: jackett-port

diff --git a/helm-charts/k8s-mediaserver/templates/plex-resources.yml b/helm-charts/k8s-mediaserver/templates/plex-resources.yml
@@ -57,6 +57,7 @@ spec:
               path: "/"
             initialDelaySeconds: 20
             periodSeconds: 15
+            timeoutSeconds: 20
           ports:
             - name: plex-port
               containerPort: {{ .Values.plex.container.port }}

diff --git a/helm-charts/k8s-mediaserver/templates/prowlarr-resources.yml b/helm-charts/k8s-mediaserver/templates/prowlarr-resources.yml
@@ -75,10 +75,11 @@ spec:
           imagePullPolicy: Always
           readinessProbe:
             httpGet:
-              path: "/{{ .Values.prowlarr.ingress.path }}/ping"
+              path: "{{ .Values.prowlarr.ingress.path }}/ping"
               port: {{ .Values.prowlarr.container.port }}
             initialDelaySeconds: 10
             periodSeconds: 20
+            timeoutSeconds: 20
           ports:
             - name: prowlarr-port
               containerPort: {{ .Values.prowlarr.container.port }}

diff --git a/helm-charts/k8s-mediaserver/templates/radarr-resources.yml b/helm-charts/k8s-mediaserver/templates/radarr-resources.yml
@@ -76,10 +76,11 @@ spec:
           imagePullPolicy: Always
           readinessProbe:
             httpGet:
-              path: "/{{ .Values.radarr.ingress.path }}/ping"
+              path: "{{ .Values.radarr.ingress.path }}/ping"
               port: {{ .Values.radarr.container.port }}
             initialDelaySeconds: 10
             periodSeconds: 20
+            timeoutSeconds: 20
           ports:
             - name: radarr-port
               containerPort: {{ .Values.radarr.container.port }}

diff --git a/helm-charts/k8s-mediaserver/templates/sabnzbd-resources.yml b/helm-charts/k8s-mediaserver/templates/sabnzbd-resources.yml
@@ -378,10 +378,11 @@ spec:
           imagePullPolicy: Always
           readinessProbe:
             httpGet:
-              path: /{{ .Values.sabnzbd.ingress.path }}/wizard/
+              path: "{{ .Values.sabnzbd.ingress.path }}/wizard/"
               port: {{ .Values.sabnzbd.container.port.http }}
             initialDelaySeconds: 5
             periodSeconds: 10
+            timeoutSeconds: 20
           ports:
             - name: sabnzbd-http
               containerPort: {{ .Values.sabnzbd.container.port.http }}

diff --git a/helm-charts/k8s-mediaserver/templates/sonarr-resources.yml b/helm-charts/k8s-mediaserver/templates/sonarr-resources.yml
@@ -75,10 +75,11 @@ spec:
           imagePullPolicy: Always
           readinessProbe:
             httpGet:
-              path: "/{{ .Values.sonarr.ingress.path }}/ping"
+              path: "{{ .Values.sonarr.ingress.path }}/ping"
               port: {{ .Values.sonarr.container.port }}
             initialDelaySeconds: 10
             periodSeconds: 20
+            timeoutSeconds: 20
           ports:
             - name: sonarr-port
               containerPort: {{ .Values.sonarr.container.port }}

diff --git a/helm-charts/k8s-mediaserver/templates/transmission-resources.yml b/helm-charts/k8s-mediaserver/templates/transmission-resources.yml
@@ -142,10 +142,11 @@ spec:
           imagePullPolicy: Always
           readinessProbe:
             httpGet:
-              path: /{{ .Values.transmission.ingress.path }}/
+              path: "{{ .Values.transmission.ingress.path }}/"
               port: {{ .Values.transmission.container.port.utp }}
             initialDelaySeconds: 5
             periodSeconds: 10
+            timeoutSeconds: 20
           ports:
             - name: trans-port
               containerPort: {{ .Values.transmission.container.port.utp }}

diff --git a/k8s-mediaserver-operator.yml b/k8s-mediaserver-operator.yml
@@ -374,7 +374,7 @@ spec:
         - --metrics-bind-address=127.0.0.1:8080
         - --leader-elect
         - --leader-election-id=k8s-mediaserver-operator
-        image: quay.io/kubealex/k8s-mediaserver-operator:v0.9.1
+        image: quay.io/kubealex/k8s-mediaserver-operator:v0.9.2
         livenessProbe:
           httpGet:
             path: /healthz