Merge remote-tracking branch 'origin/improvement/bump-dexidp-2.40' in…

…to w/128.0/improvement/bump-dexidp-2.40
scality · Jul 18, 2024 · 994b546 · 994b546
2 parents f30fd9e + 2ccdc57
commit 994b546
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,10 +54,10 @@
   (PR[#4301](https://github.com/scality/metalk8s/pull/4301))
 
 - Bump dex chart version to
-  [0.17.0](https://github.com/dexidp/helm-charts/releases/tag/dex-0.17.0)
+  [0.18.0](https://github.com/dexidp/helm-charts/releases/tag/dex-0.18.0)
   Dex itself has been bumped accordingly to
-  [v2.39.0](https://github.com/dexidp/dex/releases/tag/v2.39.0)
-  (PR[#4284](https://github.com/scality/metalk8s/pull/4284))
+  [v2.40.0](https://github.com/dexidp/dex/releases/tag/v2.40.0)
+  (PR[#4367](https://github.com/scality/metalk8s/pull/4367))
 
 - Bump Loki chart version to
   [5.47.1](https://github.com/grafana/loki/releases/tag/helm-loki-5.47.1)
@@ -127,6 +127,12 @@
 - Bump Calico version to [3.28.0](https://github.com/projectcalico/calico/releases/tag/v3.28.0)
   (PR[#4363](https://github.com/scality/metalk8s/pull/4363))
 
+- Bump dex chart version to
+  [0.18.0](https://github.com/dexidp/helm-charts/releases/tag/dex-0.18.0)
+  Dex itself has been bumped accordingly to
+  [v2.40.0](https://github.com/dexidp/dex/releases/tag/v2.40.0)
+  (PR[#4367](https://github.com/scality/metalk8s/pull/4367))
+
 ## Release 127.0.3
 
 ### Enhancements

diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
@@ -130,8 +130,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="dex",
-        version="v2.39.0",
-        digest="sha256:935ef4c1ae6537bcbdec79f5a799cf2e2a123808d45c3af7e41b77767cd3ff6f",
+        version="v2.40.0",
+        digest="sha256:3e35d5d0f7dbd33fbadc36a71ff58cf4097ab98d73d22f6cb9a6471a32e028af",
     ),
     Image(
         name="etcd",

diff --git a/charts/dex/Chart.yaml b/charts/dex/Chart.yaml
@@ -1,12 +1,12 @@
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: "Dex 2.39.0 release"
+      description: "Dex 2.40.0 release"
   artifacthub.io/images: |
     - name: dex
-      image: ghcr.io/dexidp/dex:v2.39.0
+      image: ghcr.io/dexidp/dex:v2.40.0
 apiVersion: v2
-appVersion: 2.39.0
+appVersion: 2.40.0
 description: OpenID Connect (OIDC) identity and OAuth 2.0 provider with pluggable
   connectors.
 home: https://dexidp.io/
@@ -26,4 +26,4 @@ sources:
 - https://github.com/dexidp/dex
 - https://github.com/dexidp/helm-charts/tree/master/charts/dex
 type: application
-version: 0.17.0
+version: 0.18.0
diff --git a/charts/dex/README.md b/charts/dex/README.md
@@ -1,6 +1,6 @@
 # dex
 
-![version: 0.17.0](https://img.shields.io/badge/version-0.17.0-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 2.39.0](https://img.shields.io/badge/app%20version-2.39.0-informational?style=flat-square) ![kube version: >=1.14.0-0](https://img.shields.io/badge/kube%20version->=1.14.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-dex-informational?style=flat-square)](https://artifacthub.io/packages/helm/dex/dex)
+![version: 0.18.0](https://img.shields.io/badge/version-0.18.0-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 2.40.0](https://img.shields.io/badge/app%20version-2.40.0-informational?style=flat-square) ![kube version: >=1.14.0-0](https://img.shields.io/badge/kube%20version->=1.14.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-dex-informational?style=flat-square)](https://artifacthub.io/packages/helm/dex/dex)
 
 OpenID Connect (OIDC) identity and OAuth 2.0 provider with pluggable connectors.
 

diff --git a/salt/metalk8s/addons/dex/deployed/chart.sls b/salt/metalk8s/addons/dex/deployed/chart.sls
@@ -15,8 +15,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: dex
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.39.0
-    helm.sh/chart: dex-0.17.0
+    app.kubernetes.io/version: 2.40.0
+    helm.sh/chart: dex-0.18.0
     heritage: metalk8s
   name: dex
   namespace: metalk8s-auth
@@ -29,8 +29,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: dex
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.39.0
-    helm.sh/chart: dex-0.17.0
+    app.kubernetes.io/version: 2.40.0
+    helm.sh/chart: dex-0.18.0
     heritage: metalk8s
   name: dex
   namespace: metalk8s-auth
@@ -51,8 +51,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: dex
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.39.0
-    helm.sh/chart: dex-0.17.0
+    app.kubernetes.io/version: 2.40.0
+    helm.sh/chart: dex-0.18.0
     heritage: metalk8s
   name: dex-cluster
   namespace: metalk8s-auth
@@ -73,8 +73,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: dex
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.39.0
-    helm.sh/chart: dex-0.17.0
+    app.kubernetes.io/version: 2.40.0
+    helm.sh/chart: dex-0.18.0
     heritage: metalk8s
   name: dex
   namespace: metalk8s-auth
@@ -94,8 +94,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: dex
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.39.0
-    helm.sh/chart: dex-0.17.0
+    app.kubernetes.io/version: 2.40.0
+    helm.sh/chart: dex-0.18.0
     heritage: metalk8s
   name: dex
   namespace: metalk8s-auth
@@ -116,8 +116,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: dex
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.39.0
-    helm.sh/chart: dex-0.17.0
+    app.kubernetes.io/version: 2.40.0
+    helm.sh/chart: dex-0.18.0
     heritage: metalk8s
   name: dex
   namespace: metalk8s-auth
@@ -152,8 +152,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: dex
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.39.0
-    helm.sh/chart: dex-0.17.0
+    app.kubernetes.io/version: 2.40.0
+    helm.sh/chart: dex-0.18.0
     heritage: metalk8s
   name: dex
   namespace: metalk8s-auth
@@ -194,7 +194,7 @@ spec:
         env:
         - name: KUBERNETES_POD_NAMESPACE
           value: metalk8s-auth
-        image: {% endraw -%}{{ build_image_name("dex", False) }}{%- raw %}:v2.39.0
+        image: {% endraw -%}{{ build_image_name("dex", False) }}{%- raw %}:v2.40.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
@@ -264,8 +264,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: dex
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: 2.39.0
-    helm.sh/chart: dex-0.17.0
+    app.kubernetes.io/version: 2.40.0
+    helm.sh/chart: dex-0.18.0
     heritage: metalk8s
   name: dex
   namespace: metalk8s-auth