From 99679df079ae07135e8eb7c15c5574ced6e2fcd3 Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Mon, 18 Nov 2024 19:04:52 +0100 Subject: [PATCH 1/2] Update Dex and oauth2-proxy to 2.41.1 and 7.7.1 Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> --- common/dex/base/deployment.yaml | 7 ++++++- common/oauth2-proxy/base/kustomization.yaml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/dex/base/deployment.yaml b/common/dex/base/deployment.yaml index 5d9fcc7772..eb86c70033 100644 --- a/common/dex/base/deployment.yaml +++ b/common/dex/base/deployment.yaml @@ -16,7 +16,7 @@ spec: spec: serviceAccountName: dex containers: - - image: ghcr.io/dexidp/dex:v2.39.1 + - image: ghcr.io/dexidp/dex:v2.41.1 name: dex command: ["dex", "serve", "/etc/dex/cfg/config.yaml"] ports: @@ -35,6 +35,11 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + readinessProbe: + httpGet: + path: /healthz + port: 5556 + scheme: HTTPS volumes: - name: config configMap: diff --git a/common/oauth2-proxy/base/kustomization.yaml b/common/oauth2-proxy/base/kustomization.yaml index 57e5ac1828..f347dc753d 100644 --- a/common/oauth2-proxy/base/kustomization.yaml +++ b/common/oauth2-proxy/base/kustomization.yaml @@ -92,4 +92,4 @@ replacements: images: - name: quay.io/oauth2-proxy/oauth2-proxy newName: quay.io/oauth2-proxy/oauth2-proxy - newTag: v7.6.0 + newTag: v7.7.1 From f175ef78f2e736bc950387c839384206e228e8a2 Mon Sep 17 00:00:00 2001 From: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Mon, 18 Nov 2024 19:13:36 +0100 Subject: [PATCH 2/2] remove readinessprobe again and fix formatting for yamllint Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> --- common/dex/base/deployment.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/common/dex/base/deployment.yaml b/common/dex/base/deployment.yaml index eb86c70033..bf4de2baab 100644 --- a/common/dex/base/deployment.yaml +++ b/common/dex/base/deployment.yaml @@ -8,7 +8,7 @@ spec: replicas: 1 selector: matchLabels: - app: dex + app: dex template: metadata: labels: @@ -26,20 +26,20 @@ spec: - name: config mountPath: /etc/dex/cfg envFrom: - - secretRef: - name: dex-oidc-client - - secretRef: - name: dex-passwords + - secretRef: + name: dex-oidc-client + - secretRef: + name: dex-passwords env: - - name: KUBERNETES_POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - readinessProbe: - httpGet: - path: /healthz - port: 5556 - scheme: HTTPS + - name: KUBERNETES_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + #readinessProbe: + # httpGet: + # path: /healthz + # port: 5556 + # scheme: HTTPS volumes: - name: config configMap: