Merge pull request #94 from kubealex/fix-jackett-probe

fix(jackett): readiness probe

Author: kubealex

.github/workflows/integration-tests.yml

@@ -48,7 +48,7 @@ jobs:
           cp k8s-mediaserver.yml k8s-mediaserver-operator.yml tests/
           sed -i 's/accessMode: ""/accessMode: ReadWriteOnce/g' tests/k8s-mediaserver.yml
           sed -i 's/pvcStorageClass: ""/pvcStorageClass: standard/g' tests/k8s-mediaserver.yml
-          sed 's|quay.io\/kubealex.*|${{ env.image_name }}:${{ github.sha }}|g' tests/k8s-mediaserver-operator.yml
+          sed -i 's|quay.io\/kubealex.*|${{ env.image_name }}:${{ github.sha }}|g' tests/k8s-mediaserver-operator.yml
 
       - name: Kind Cluster
         uses: helm/[email protected]
@@ -76,15 +76,13 @@ jobs:
           kubectl apply -f tests/k8s-mediaserver.yml -n mediaserver
           sleep 15
           for pod in $(kubectl get pods -n mediaserver | awk 'NR>1{ print $1 }'); do while [[ $(kubectl get pods $pod -n mediaserver -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') != "True" ]]; do echo "Waiting for mediaserver pods to be ready" && sleep 10; done ; done
-          sleep 15
+          sleep 30
       - name: Edit hosts file and test apps
         run: |
           sudo echo "127.0.0.1   ${{ env.plex_ingress_host }} ${{ env.ingress_host }}" | sudo tee -a /etc/hosts
-          sudo echo "127.0.0.1   ${{ env.jellyfin_ingress_host }} ${{ env.ingress_host }}" | sudo tee -a /etc/hosts
-          wget ${{ env.ingress_host }}/jackett
           wget ${{ env.ingress_host }}/sonarr
           wget ${{ env.ingress_host }}/radarr
           wget ${{ env.ingress_host }}/sabnzbd
           wget ${{ env.ingress_host }}/prowlarr
+          wget --retry-on-http-error=503,500 ${{ env.ingress_host }}/jackett
           curl ${{ env.plex_ingress_host }}
-          curl ${{ env.jellyfin_ingress_host }}

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

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

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}