feat: add glueten sidecar pod & use port name for probe

M0NsTeRRR · Apr 1, 2024 · a934518 · a934518
1 parent 6948ef7
commit a934518
Show file tree

Hide file tree

Showing 31 changed files with 110 additions and 48 deletions.
diff --git a/charts/as212510-net/Chart.yaml b/charts/as212510-net/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: as212510-net
 description: as212510.net helm chart for Kubernetes
 type: application
-version: 0.3.3
+version: 0.3.4
 # image: ghcr.io/m0nsterrr/as212510.net
 appVersion: "2.1.0"
 sources:

diff --git a/charts/as212510-net/README.md b/charts/as212510-net/README.md
@@ -1,6 +1,6 @@
 # as212510-net
 
-![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square)
+![Version: 0.3.4](https://img.shields.io/badge/Version-0.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square)
 
 as212510.net helm chart for Kubernetes
 

diff --git a/charts/as212510-net/templates/deployment.yaml b/charts/as212510-net/templates/deployment.yaml
@@ -44,14 +44,17 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
+            - name: healthcheck
+              containerPort: 10240
+              protocol: TCP
           livenessProbe:
             httpGet:
               path: /healthcheck
-              port: 10240
+              port: healthcheck
           readinessProbe:
             httpGet:
               path: /healthcheck
-              port: 10240
+              port: healthcheck
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- with .Values.extraEnv }}

diff --git a/charts/bazarr/Chart.yaml b/charts/bazarr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bazarr
 description: bazarr helm chart for Kubernetes
 type: application
-version: 0.1.2
+version: 0.1.3
 # image: linuxserver/bazarr
 appVersion: "v1.4.2-ls244"
 sources:

diff --git a/charts/bazarr/README.md b/charts/bazarr/README.md
@@ -1,6 +1,6 @@
 # bazarr
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.4.2-ls244](https://img.shields.io/badge/AppVersion-v1.4.2--ls244-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.4.2-ls244](https://img.shields.io/badge/AppVersion-v1.4.2--ls244-informational?style=flat-square)
 
 bazarr helm chart for Kubernetes
 

diff --git a/charts/bazarr/templates/deployment.yaml b/charts/bazarr/templates/deployment.yaml
@@ -47,11 +47,11 @@ spec:
           livenessProbe:
             httpGet:
               path: /
-              port: 6767
+              port: http
           readinessProbe:
             httpGet:
               path: /
-              port: 6767
+              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- with .Values.extraEnv }}

diff --git a/charts/flaresolverr/Chart.yaml b/charts/flaresolverr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: flaresolverr
 description: flaresolverr helm chart for Kubernetes
 type: application
-version: 0.1.0
+version: 0.1.1
 # image: flaresolverr/flaresolverr
 appVersion: "v3.3.16"
 sources:

diff --git a/charts/flaresolverr/README.md b/charts/flaresolverr/README.md
@@ -1,6 +1,6 @@
 # flaresolverr
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.3.16](https://img.shields.io/badge/AppVersion-v3.3.16-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.3.16](https://img.shields.io/badge/AppVersion-v3.3.16-informational?style=flat-square)
 
 flaresolverr helm chart for Kubernetes
 

diff --git a/charts/flaresolverr/templates/deployment.yaml b/charts/flaresolverr/templates/deployment.yaml
@@ -47,11 +47,11 @@ spec:
           livenessProbe:
             httpGet:
               path: /
-              port: 8191
+              port: http
           readinessProbe:
             httpGet:
               path: /
-              port: 8191
+              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- with .Values.extraEnv }}

diff --git a/charts/kea-exporter/Chart.yaml b/charts/kea-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kea-exporter
 description: kea-exporter helm chart for Kubernetes
 type: application
-version: 0.1.2
+version: 0.1.3
 # image: ghcr.io/mweinelt/kea-exporter
 appVersion: "v0.7.0"
 sources:

diff --git a/charts/kea-exporter/README.md b/charts/kea-exporter/README.md
@@ -1,6 +1,6 @@
 # kea-exporter
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.7.0](https://img.shields.io/badge/AppVersion-v0.7.0-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.7.0](https://img.shields.io/badge/AppVersion-v0.7.0-informational?style=flat-square)
 
 kea-exporter helm chart for Kubernetes
 

diff --git a/charts/kea-exporter/templates/deployment.yaml b/charts/kea-exporter/templates/deployment.yaml
@@ -47,11 +47,11 @@ spec:
           livenessProbe:
             httpGet:
               path: /
-              port: 9547
+              port: http
           readinessProbe:
             httpGet:
               path: /
-              port: 9547
+              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- with .Values.extraEnv }}

diff --git a/charts/overseerr/Chart.yaml b/charts/overseerr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: overseerr
 description: overseerr helm chart for Kubernetes
 type: application
-version: 0.1.0
+version: 0.1.1
 # image: sct/overseerr
 appVersion: "1.33.2"
 sources:

diff --git a/charts/overseerr/README.md b/charts/overseerr/README.md
@@ -1,6 +1,6 @@
 # overseerr
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.33.2](https://img.shields.io/badge/AppVersion-1.33.2-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.33.2](https://img.shields.io/badge/AppVersion-1.33.2-informational?style=flat-square)
 
 overseerr helm chart for Kubernetes
 

diff --git a/charts/overseerr/templates/deployment.yaml b/charts/overseerr/templates/deployment.yaml
@@ -47,11 +47,11 @@ spec:
           livenessProbe:
             httpGet:
               path: /
-              port: 5055
+              port: http
           readinessProbe:
             httpGet:
               path: /
-              port: 5055
+              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- with .Values.extraEnv }}
@@ -64,7 +64,7 @@ spec:
           {{- end }}
           volumeMounts:
             - name: config
-              mountPath: /config
+              mountPath: /app/config
       volumes:
         - name: config
           persistentVolumeClaim:

diff --git a/charts/prometheus-pve-exporter/Chart.yaml b/charts/prometheus-pve-exporter/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: prometheus-pve-exporter
 description: prometheus-pve-exporter helm chart for Kubernetes
 type: application
-version: 0.1.5
+version: 0.1.6
 # image: prompve/prometheus-pve-exporter
 appVersion: "3.2.2"
 sources:

diff --git a/charts/prometheus-pve-exporter/README.md b/charts/prometheus-pve-exporter/README.md
@@ -1,6 +1,6 @@
 # prometheus-pve-exporter
 
-![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.2](https://img.shields.io/badge/AppVersion-3.2.2-informational?style=flat-square)
+![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.2](https://img.shields.io/badge/AppVersion-3.2.2-informational?style=flat-square)
 
 prometheus-pve-exporter helm chart for Kubernetes
 

diff --git a/charts/prometheus-pve-exporter/templates/deployment.yaml b/charts/prometheus-pve-exporter/templates/deployment.yaml
@@ -47,11 +47,11 @@ spec:
           livenessProbe:
             httpGet:
               path: /
-              port: 9221
+              port: http
           readinessProbe:
             httpGet:
               path: /
-              port: 9221
+              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- with .Values.extraEnv }}

diff --git a/charts/prowlarr/Chart.yaml b/charts/prowlarr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: prowlarr
 description: prowlarr helm chart for Kubernetes
 type: application
-version: 0.1.0
+version: 0.1.1
 # image: linuxserver/prowlarr
 appVersion: "1.15.0.4361-ls62"
 sources:

diff --git a/charts/prowlarr/README.md b/charts/prowlarr/README.md
@@ -1,6 +1,6 @@
 # prowlarr
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.15.0.4361-ls62](https://img.shields.io/badge/AppVersion-1.15.0.4361--ls62-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.15.0.4361-ls62](https://img.shields.io/badge/AppVersion-1.15.0.4361--ls62-informational?style=flat-square)
 
 prowlarr helm chart for Kubernetes
 

diff --git a/charts/prowlarr/templates/deployment.yaml b/charts/prowlarr/templates/deployment.yaml
@@ -47,11 +47,11 @@ spec:
           livenessProbe:
             httpGet:
               path: /
-              port: 9696
+              port: http
           readinessProbe:
             httpGet:
               path: /
-              port: 9696
+              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- with .Values.extraEnv }}

diff --git a/charts/qbittorrent/Chart.yaml b/charts/qbittorrent/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: qbittorrent
 description: qbittorrent helm chart for Kubernetes
 type: application
-version: 0.1.1
+version: 0.2.0
 # image: qbittorrent/docker-qbittorrent-nox
 appVersion: "4.6.4-1"
 sources:

diff --git a/charts/qbittorrent/README.md b/charts/qbittorrent/README.md
@@ -1,6 +1,6 @@
 # qbittorrent
 
-![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.6.4-1](https://img.shields.io/badge/AppVersion-4.6.4--1-informational?style=flat-square)
+![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.6.4-1](https://img.shields.io/badge/AppVersion-4.6.4--1-informational?style=flat-square)
 
 qbittorrent helm chart for Kubernetes
 
@@ -34,6 +34,17 @@ helm repo add adminafk https://helm-charts.adminafk.fr
 | extraEnv | list | `[]` | Environment variables to add to the qbittorrent pods |
 | extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the qbittorrent pods |
 | fullnameOverride | string | `""` |  |
+| gluetun.enabled | bool | `true` |  |
+| gluetun.extraEnv | list | `[]` |  |
+| gluetun.extraEnvFrom | list | `[]` |  |
+| gluetun.image.pullPolicy | string | `"IfNotPresent"` |  |
+| gluetun.image.registry | string | `"docker.io"` |  |
+| gluetun.image.repository | string | `"qmcgaw/gluetun"` |  |
+| gluetun.image.sha | string | `""` |  |
+| gluetun.image.tag | string | `"v3.38.0"` |  |
+| gluetun.resources | object | `{}` |  |
+| gluetun.securityContext.capabilities.add[0] | string | `"NET_ADMIN"` |  |
+| gluetun.volumeMounts | list | `[]` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.registry | string | `"ghcr.io"` |  |
 | image.repository | string | `"qbittorrent/docker-qbittorrent-nox"` |  |

diff --git a/charts/qbittorrent/templates/deployment.yaml b/charts/qbittorrent/templates/deployment.yaml
@@ -42,22 +42,14 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 8080
+              containerPort: {{ .Values.service.web.port }}
               protocol: TCP
             - name: torrent-tcp
               containerPort: 6881
               protocol: TCP
             - name: torrent-udp
               containerPort: 6881
               protocol: UDP
-          livenessProbe:
-            httpGet:
-              path: /
-              port: 8080
-          readinessProbe:
-            httpGet:
-              path: /
-              port: 8080
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- with .Values.extraEnv }}
@@ -74,6 +66,45 @@ spec:
               mountPath: /config
             {{- toYaml . | nindent 12 }}
           {{- end }}
+        {{- if .Values.gluetun.enabled }}
+        - name: gluten
+          securityContext:
+            {{- toYaml .Values.gluetun.securityContext | nindent 12 }}
+          {{- if .Values.gluetun.image.sha }}
+          image: "{{ .Values.gluetun.image.registry }}/{{ .Values.gluetun.image.repository }}:{{ .Values.gluetun.image.tag | default .Chart.AppVersion }}@sha256:{{ .Values.gluetun.image.sha }}"
+          {{- else }}
+          image: "{{ .Values.gluetun.image.registry }}/{{ .Values.gluetun.image.repository }}:{{ .Values.gluetun.image.tag | default .Chart.AppVersion }}"
+          {{- end }}
+          imagePullPolicy: {{ .Values.gluetun.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 8888
+              protocol: TCP
+            - name: shadowsocks-tcp
+              containerPort: 8388
+              protocol: TCP
+            - name: shadowsocks-udp
+              containerPort: 6881
+              protocol: UDP
+          resources:
+            {{- toYaml .Values.gluetun.resources | nindent 12 }}
+          {{- with .Values.gluetun.extraEnv }}
+          env:
+            - name: QBT_EULA
+              value: "accept"
+            - name: QBT_WEBUI_PORT
+              value: "{{ $.Values.service.web.port }}"
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.gluetun.extraEnvFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.gluetun.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+        {{- end }}
       {{- with .Values.volumes }}
       volumes:
         - name: config

diff --git a/charts/qbittorrent/values.yaml b/charts/qbittorrent/values.yaml
@@ -115,3 +115,20 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+gluetun:
+  enabled: true
+  image:
+    registry: docker.io
+    repository: qmcgaw/gluetun
+    pullPolicy: IfNotPresent
+    tag: "v3.38.0"
+    sha: ""
+  extraEnv: []
+  extraEnvFrom: []
+  volumeMounts: []
+  securityContext:
+    capabilities:
+      add:
+        - NET_ADMIN
+  resources: {}
diff --git a/charts/radarr/Chart.yaml b/charts/radarr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: radarr
 description: radarr helm chart for Kubernetes
 type: application
-version: 0.1.1
+version: 0.1.2
 # image: linuxserver/radarr
 appVersion: "5.3.6.8612-ls210"
 sources:

diff --git a/charts/radarr/README.md b/charts/radarr/README.md
@@ -1,6 +1,6 @@
 # radarr
 
-![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.3.6.8612-ls210](https://img.shields.io/badge/AppVersion-5.3.6.8612--ls210-informational?style=flat-square)
+![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.3.6.8612-ls210](https://img.shields.io/badge/AppVersion-5.3.6.8612--ls210-informational?style=flat-square)
 
 radarr helm chart for Kubernetes
 

diff --git a/charts/radarr/templates/deployment.yaml b/charts/radarr/templates/deployment.yaml
@@ -47,11 +47,11 @@ spec:
           livenessProbe:
             httpGet:
               path: /
-              port: 7878
+              port: http
           readinessProbe:
             httpGet:
               path: /
-              port: 7878
+              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- with .Values.extraEnv }}

diff --git a/charts/sonarr/Chart.yaml b/charts/sonarr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sonarr
 description: sonarr helm chart for Kubernetes
 type: application
-version: 0.1.0
+version: 0.1.1
 # image: linuxserver/sonarr
 appVersion: "4.0.2.1183-ls232"
 sources: