Merge branch 'main' into main

Author: pierluigilenoci

helm/oauth2-proxy/README.md

@@ -150,7 +150,7 @@ Parameter | Description | Default
 `priorityClassName` | priorityClassName | `nil`
 `readinessProbe.enabled` | enable Kubernetes readinessProbe. Disable to use oauth2-proxy with Istio mTLS. See [Istio FAQ](https://istio.io/help/faq/security/#k8s-health-checks) | `true`
 `readinessProbe.initialDelaySeconds` | number of seconds | 0
-`readinessProbe.timeoutSeconds` | number of seconds | 1
+`readinessProbe.timeoutSeconds` | number of seconds | 5
 `readinessProbe.periodSeconds` | number of seconds | 10
 `readinessProbe.successThreshold` | number of successes | 1
 `replicaCount` | desired number of pods | `1`

helm/oauth2-proxy/templates/_helpers.tpl

@@ -101,3 +101,10 @@ Compute the redis url if not set explicitly.
 {{ fail "please set sessionStorage.redis.standalone.connectionUrl or enable the redis subchart via redis.enabled" }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Returns the version
+*/}}
+{{- define "oauth2-proxy.version" -}}
+{{ trimPrefix "v" (lower (.Values.image.tag | default (printf "v%s" .Chart.AppVersion))) }}
+{{- end -}}

helm/oauth2-proxy/templates/deployment.yaml

@@ -55,7 +55,7 @@ spec:
       {{- end }}
       containers:
       - name: {{ .Chart.Name }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
+        image: "{{ .Values.image.repository }}:v{{ include "oauth2-proxy.version" . }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         args:
         {{- if .Values.alphaConfig.enabled }}
@@ -201,7 +201,7 @@ spec:
 {{- if .Values.readinessProbe.enabled }}
         readinessProbe:
           httpGet:
-            path: /ping
+            path: {{ if gt (include "oauth2-proxy.version" .) "7.4.0" }}/ready{{ else }}/ping{{ end }}
             port: {{ .Values.httpScheme }}
             scheme: {{ .Values.httpScheme | upper }}
           initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}

helm/oauth2-proxy/values.yaml

@@ -211,7 +211,7 @@ livenessProbe:
 readinessProbe:
   enabled: true
   initialDelaySeconds: 0
-  timeoutSeconds: 1
+  timeoutSeconds: 5
   periodSeconds: 10
   successThreshold: 1