Merge branch 'master' into qbittorrent

charts/traefik-forward-auth/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: traefik-forward-auth
 description: A minimal forward authentication service that provides OAuth/SSO login and authentication for the traefik reverse proxy/load balancer
 type: application
-version: 1.0.0
+version: 1.0.1
 appVersion: 2.2.0
 keywords:
   - traefik

charts/traefik-forward-auth/README.md

@@ -1,6 +1,6 @@
 # traefik-forward-auth
 
-![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square) [![ArtifactHub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/traefik-forward-auth)](https://artifacthub.io/packages/helm/traefik-forward-auth)
+![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square) [![ArtifactHub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/traefik-forward-auth)](https://artifacthub.io/packages/helm/traefik-forward-auth)
 
 A minimal forward authentication service that provides OAuth/SSO login and authentication for the traefik reverse proxy/load balancer
 
@@ -75,6 +75,8 @@ helm install traefik-forward-auth k8s-at-home/traefik-forward-auth --values valu
 | ingress.hosts[0].paths | list | `[]` |  |
 | ingress.tls | list | `[]` |  |
 | lifetime | string | `""` | Lifetime in seconds (default: 43200) |
+| livenessProbe | object | {"periodSeconds":20,"tcpSocket":{"port":"http"}} | Liveness probe configuration |
+| livenessProbe.enabled | bool | `true` | Enable liveness probe |
 | logging.format | string | `""` | [text|json|pretty] Log format (default: text) |
 | logging.level | string | `""` | [trace|debug|info|warn|error|fatal|panic] Log level (default: warn) |
 | logoutRedirect | string | `""` | URL to redirect to following logout |
@@ -102,6 +104,8 @@ helm install traefik-forward-auth k8s-at-home/traefik-forward-auth --values valu
 | providers.oidc.enabled | bool | `false` | Enable the generic OIDC provider |
 | providers.oidc.issuerUrl | string | `""` | Issuer URL |
 | providers.oidc.resource | string | `""` | Optional resource indicator |
+| readinessProbe | object | {"periodSeconds":10,"tcpSocket":{"port":"http"}} | Readiness probe configuration |
+| readinessProbe.enabled | bool | `true` | Enable readiness probe |
 | replicaCount | int | `1` |  |
 | resources | object | `{}` |  |
 | restrictions.domain | string | `""` | Only allow given email domains. (Comma delimited) |
@@ -117,4 +121,4 @@ helm install traefik-forward-auth k8s-at-home/traefik-forward-auth --values valu
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.name | string | `""` |  |
 | tolerations | list | `[]` |  |
-| urlPath | string | `""` | Callback URL Path (default: /_oauth) |
+| urlPath | string | `""` | Callback URL Path (default: /_oauth) |

charts/traefik-forward-auth/templates/deployment.yaml

@@ -181,14 +181,18 @@ spec:
             - name: http
               containerPort: 4181
               protocol: TCP
+        {{- $livenessProbe := .Values.livenessProbe }}
+        {{- if $livenessProbe.enabled }}
           livenessProbe:
-            httpGet:
+          {{- $livenessProbe := unset $livenessProbe "enabled" }}
-              path: /
+          {{- toYaml $livenessProbe | nindent 12 }}
-              port: http
+        {{- end }}
+        {{- $readinessProbe := .Values.readinessProbe }}
+        {{- if $readinessProbe.enabled }}
           readinessProbe:
-            httpGet:
+            {{- $readinessProbe := unset $readinessProbe "enabled" }}
-              path: /
+            {{- toYaml $readinessProbe | nindent 12 }}
-              port: http
+        {{- end }}
           {{- with .Values.resources }}
           resources:
       {{- toYaml . | nindent 12 }}

charts/traefik-forward-auth/values.yaml

@@ -117,6 +117,24 @@ securityContext: {}
   # runAsNonRoot: true
   # runAsUser: 1000
 
+# livenessProbe -- Liveness probe configuration
+# @default -- {"periodSeconds":20,"tcpSocket":{"port":"http"}}
+livenessProbe:
+  # livenessProbe.enabled -- Enable liveness probe
+  enabled: true
+  tcpSocket:
+    port: http
+  periodSeconds: 20
+
+# readinessProbe -- Readiness probe configuration
+# @default -- {"periodSeconds":10,"tcpSocket":{"port":"http"}}
+readinessProbe:
+  # readinessProbe.enabled -- Enable readiness probe
+  enabled: true
+  tcpSocket:
+    port: http
+  periodSeconds: 10
+
 service:
   type: ClusterIP
   port: 4181