From 2ccdc57b5750d3d81c1cead96156cda88aec01ac Mon Sep 17 00:00:00 2001 From: Ayoub Nasr Date: Mon, 15 Jul 2024 17:50:18 +0200 Subject: [PATCH] charts, salt, build: Bump Dex chart to 0.18.0 --- CHANGELOG.md | 6 ++++ buildchain/buildchain/versions.py | 4 +-- charts/dex/Chart.yaml | 10 +++--- charts/dex/README.md | 4 ++- charts/dex/values.yaml | 6 ++++ salt/metalk8s/addons/dex/deployed/chart.sls | 34 ++++++++++----------- 6 files changed, 39 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 485b889247..8288c6fd42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,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 index 95baf5bbf8..0c87a5901f 100644 --- 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.37.0", - digest="sha256:f579d00721b0d842328c43a562f50343c54b0048ef2d58d6b54e750c21fc7938", + version="v2.40.0", + digest="sha256:3e35d5d0f7dbd33fbadc36a71ff58cf4097ab98d73d22f6cb9a6471a32e028af", ), Image( name="etcd", diff --git a/charts/dex/Chart.yaml b/charts/dex/Chart.yaml index 3fc1705435..a39c95d532 100644 --- a/charts/dex/Chart.yaml +++ b/charts/dex/Chart.yaml @@ -1,12 +1,12 @@ annotations: artifacthub.io/changes: | - - kind: fixed - description: "Fixed error stemming from the formatting of the new autoscaling API version" + - kind: changed + description: "Dex 2.40.0 release" artifacthub.io/images: | - name: dex - image: ghcr.io/dexidp/dex:v2.37.0 + image: ghcr.io/dexidp/dex:v2.40.0 apiVersion: v2 -appVersion: 2.37.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.15.2 +version: 0.18.0 diff --git a/charts/dex/README.md b/charts/dex/README.md index 4a74c87ace..53ef413118 100644 --- a/charts/dex/README.md +++ b/charts/dex/README.md @@ -1,6 +1,6 @@ # dex -![version: 0.15.2](https://img.shields.io/badge/version-0.15.2-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 2.37.0](https://img.shields.io/badge/app%20version-2.37.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. @@ -166,8 +166,10 @@ ingress: | serviceMonitor.labels | object | `{}` | Labels to be added to the ServiceMonitor. | | serviceMonitor.annotations | object | `{}` | Annotations to be added to the ServiceMonitor. | | serviceMonitor.scheme | string | `""` | HTTP scheme to use for scraping. Can be used with `tlsConfig` for example if using istio mTLS. | +| serviceMonitor.path | string | `"/metrics"` | HTTP path to scrape for metrics. | | serviceMonitor.tlsConfig | object | `{}` | TLS configuration to use when scraping the endpoint. For example if using istio mTLS. | | serviceMonitor.bearerTokenFile | string | `nil` | Prometheus scrape bearerTokenFile | +| serviceMonitor.honorLabels | bool | `false` | HonorLabels chooses the metric's labels on collisions with target labels. | | serviceMonitor.metricRelabelings | list | `[]` | Prometheus scrape metric relabel configs to apply to samples before ingestion. | | serviceMonitor.relabelings | list | `[]` | Relabel configs to apply to samples before ingestion. | | resources | object | No requests or limits. | Container resource [requests and limits](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/). See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#resources) for details. | diff --git a/charts/dex/values.yaml b/charts/dex/values.yaml index 9033b239ec..7452791e07 100644 --- a/charts/dex/values.yaml +++ b/charts/dex/values.yaml @@ -238,6 +238,9 @@ serviceMonitor: # Can be used with `tlsConfig` for example if using istio mTLS. scheme: "" + # -- HTTP path to scrape for metrics. + path: /metrics + # -- TLS configuration to use when scraping the endpoint. # For example if using istio mTLS. ## Of type: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#tlsconfig @@ -246,6 +249,9 @@ serviceMonitor: # -- Prometheus scrape bearerTokenFile bearerTokenFile: + # -- HonorLabels chooses the metric's labels on collisions with target labels. + honorLabels: false + # -- Prometheus scrape metric relabel configs # to apply to samples before ingestion. ## [Metric Relabeling](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs) diff --git a/salt/metalk8s/addons/dex/deployed/chart.sls b/salt/metalk8s/addons/dex/deployed/chart.sls index c863617068..007ff1fd4d 100644 --- 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.37.0 - helm.sh/chart: dex-0.15.2 + 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.37.0 - helm.sh/chart: dex-0.15.2 + 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.37.0 - helm.sh/chart: dex-0.15.2 + 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.37.0 - helm.sh/chart: dex-0.15.2 + 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.37.0 - helm.sh/chart: dex-0.15.2 + 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.37.0 - helm.sh/chart: dex-0.15.2 + 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.37.0 - helm.sh/chart: dex-0.15.2 + 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.37.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.37.0 - helm.sh/chart: dex-0.15.2 + app.kubernetes.io/version: 2.40.0 + helm.sh/chart: dex-0.18.0 heritage: metalk8s name: dex namespace: metalk8s-auth