Skip to content

Commit 1f78dfe

Browse files
ezekiel-alexrodezekiel-alexrod
committed
Merge remote-tracking branch 'origin/development/133.0' into HEAD
2 parents abcec75 + b045793 commit 1f78dfe

9 files changed

Lines changed: 44 additions & 28 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
and Fluent Bit Helm chart version to [0.55.0](https://github.com/fluent/helm-charts/releases/tag/fluent-bit-0.55.0)
2121
(PR[#4778](https://github.com/scality/metalk8s/pull/4778))
2222

23+
- Bump dex chart version to
24+
[0.24.0](https://github.com/dexidp/helm-charts/releases/tag/dex-0.24.0)
25+
Dex itself has been bumped accordingly to
26+
[v2.44.0](https://github.com/dexidp/dex/releases/tag/v2.44.0)
27+
(PR[#4774](https://github.com/scality/metalk8s/pull/4774))
28+
2329
## Release 132.0.0 (in development)
2430

2531
### Enhancements

‎buildchain/buildchain/versions.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
136136
),
137137
Image(
138138
name="dex",
139-
version="v2.42.0",
140-
digest="sha256:1b4a6eee8550240b0faedad04d984ca939513650e1d9bd423502c67355e3822f",
139+
version="v2.44.0",
140+
digest="sha256:5d0656fce7d453c0e3b2706abf40c0d0ce5b371fb0b73b3cf714d05f35fa5f86",
141141
),
142142
Image(
143143
name="etcd",

‎charts/dex/Chart.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
annotations:
22
artifacthub.io/changes: |
3-
- kind: added
4-
description: "Use tpl for dynamic image values and add digest support"
3+
- kind: changed
4+
description: "Update Dex to 2.44.0"
55
artifacthub.io/images: |
66
- name: dex
7-
image: ghcr.io/dexidp/dex:v2.42.0
7+
image: ghcr.io/dexidp/dex:v2.44.0
88
apiVersion: v2
9-
appVersion: 2.42.0
9+
appVersion: 2.44.0
1010
description: OpenID Connect (OIDC) identity and OAuth 2.0 provider with pluggable
1111
connectors.
1212
home: https://dexidp.io/
13-
icon: https://dexidp.io/favicon.png
13+
icon: https://dexidp.io/favicons/favicon.png
1414
keywords:
1515
- oidc
1616
- oauth
@@ -26,4 +26,4 @@ sources:
2626
- https://github.com/dexidp/dex
2727
- https://github.com/dexidp/helm-charts/tree/master/charts/dex
2828
type: application
29-
version: 0.23.0
29+
version: 0.24.0

‎charts/dex/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# dex
22

3-
![version: 0.23.0](https://img.shields.io/badge/version-0.23.0-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 2.42.0](https://img.shields.io/badge/app%20version-2.42.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)
3+
![version: 0.24.0](https://img.shields.io/badge/version-0.24.0-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 2.44.0](https://img.shields.io/badge/app%20version-2.44.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)
44

55
OpenID Connect (OIDC) identity and OAuth 2.0 provider with pluggable connectors.
66

‎operator/Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ IMG ?= controller:latest
5555
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5656
ENVTEST_K8S_VERSION = 1.30.0
5757

58+
# Force Go toolchain version to prevent automatic selection issues
59+
# See: https://go.dev/doc/toolchain
60+
export GOTOOLCHAIN = go1.22.12
61+
5862
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
5963
ifeq (,$(shell go env GOBIN))
6064
GOBIN=$(shell go env GOPATH)/bin
@@ -211,7 +215,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
211215
## Tool Versions
212216
KUSTOMIZE_VERSION ?= v5.4.2
213217
CONTROLLER_TOOLS_VERSION ?= v0.15.0
214-
ENVTEST_VERSION ?= release-0.18
218+
ENVTEST_VERSION ?= release-0.19
215219
GOLANGCI_LINT_VERSION ?= v1.59.1
216220

217221
.PHONY: kustomize

‎operator/go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module github.com/scality/metalk8s/operator
22

33
go 1.22.0
4+
toolchain go1.22.12
45

56
require (
67
github.com/go-logr/logr v1.4.1

‎salt/metalk8s/addons/dex/deployed/chart.sls‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ metadata:
1515
app.kubernetes.io/managed-by: salt
1616
app.kubernetes.io/name: dex
1717
app.kubernetes.io/part-of: metalk8s
18-
app.kubernetes.io/version: 2.42.0
19-
helm.sh/chart: dex-0.23.0
18+
app.kubernetes.io/version: 2.44.0
19+
helm.sh/chart: dex-0.24.0
2020
heritage: metalk8s
2121
name: dex
2222
namespace: metalk8s-auth
@@ -29,8 +29,8 @@ metadata:
2929
app.kubernetes.io/managed-by: salt
3030
app.kubernetes.io/name: dex
3131
app.kubernetes.io/part-of: metalk8s
32-
app.kubernetes.io/version: 2.42.0
33-
helm.sh/chart: dex-0.23.0
32+
app.kubernetes.io/version: 2.44.0
33+
helm.sh/chart: dex-0.24.0
3434
heritage: metalk8s
3535
name: dex
3636
namespace: metalk8s-auth
@@ -51,8 +51,8 @@ metadata:
5151
app.kubernetes.io/managed-by: salt
5252
app.kubernetes.io/name: dex
5353
app.kubernetes.io/part-of: metalk8s
54-
app.kubernetes.io/version: 2.42.0
55-
helm.sh/chart: dex-0.23.0
54+
app.kubernetes.io/version: 2.44.0
55+
helm.sh/chart: dex-0.24.0
5656
heritage: metalk8s
5757
name: dex-cluster
5858
namespace: metalk8s-auth
@@ -73,8 +73,8 @@ metadata:
7373
app.kubernetes.io/managed-by: salt
7474
app.kubernetes.io/name: dex
7575
app.kubernetes.io/part-of: metalk8s
76-
app.kubernetes.io/version: 2.42.0
77-
helm.sh/chart: dex-0.23.0
76+
app.kubernetes.io/version: 2.44.0
77+
helm.sh/chart: dex-0.24.0
7878
heritage: metalk8s
7979
name: dex
8080
namespace: metalk8s-auth
@@ -94,8 +94,8 @@ metadata:
9494
app.kubernetes.io/managed-by: salt
9595
app.kubernetes.io/name: dex
9696
app.kubernetes.io/part-of: metalk8s
97-
app.kubernetes.io/version: 2.42.0
98-
helm.sh/chart: dex-0.23.0
97+
app.kubernetes.io/version: 2.44.0
98+
helm.sh/chart: dex-0.24.0
9999
heritage: metalk8s
100100
name: dex
101101
namespace: metalk8s-auth
@@ -116,8 +116,8 @@ metadata:
116116
app.kubernetes.io/managed-by: salt
117117
app.kubernetes.io/name: dex
118118
app.kubernetes.io/part-of: metalk8s
119-
app.kubernetes.io/version: 2.42.0
120-
helm.sh/chart: dex-0.23.0
119+
app.kubernetes.io/version: 2.44.0
120+
helm.sh/chart: dex-0.24.0
121121
heritage: metalk8s
122122
name: dex
123123
namespace: metalk8s-auth
@@ -152,8 +152,8 @@ metadata:
152152
app.kubernetes.io/managed-by: salt
153153
app.kubernetes.io/name: dex
154154
app.kubernetes.io/part-of: metalk8s
155-
app.kubernetes.io/version: 2.42.0
156-
helm.sh/chart: dex-0.23.0
155+
app.kubernetes.io/version: 2.44.0
156+
helm.sh/chart: dex-0.24.0
157157
heritage: metalk8s
158158
name: dex
159159
namespace: metalk8s-auth
@@ -194,7 +194,7 @@ spec:
194194
env:
195195
- name: KUBERNETES_POD_NAMESPACE
196196
value: metalk8s-auth
197-
image: {% endraw -%}{{ build_image_name("dex", False) }}{%- raw %}:v2.42.0
197+
image: {% endraw -%}{{ build_image_name("dex", False) }}{%- raw %}:v2.44.0
198198
imagePullPolicy: IfNotPresent
199199
livenessProbe:
200200
httpGet:
@@ -264,8 +264,8 @@ metadata:
264264
app.kubernetes.io/managed-by: salt
265265
app.kubernetes.io/name: dex
266266
app.kubernetes.io/part-of: metalk8s
267-
app.kubernetes.io/version: 2.42.0
268-
helm.sh/chart: dex-0.23.0
267+
app.kubernetes.io/version: 2.44.0
268+
helm.sh/chart: dex-0.24.0
269269
heritage: metalk8s
270270
name: dex
271271
namespace: metalk8s-auth

‎storage-operator/Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ IMG ?= controller:latest
5555
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5656
ENVTEST_K8S_VERSION = 1.30.0
5757

58+
# Force Go toolchain version to prevent automatic selection issues
59+
# See: https://go.dev/doc/toolchain
60+
export GOTOOLCHAIN = go1.22.12
61+
5862
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
5963
ifeq (,$(shell go env GOBIN))
6064
GOBIN=$(shell go env GOPATH)/bin
@@ -211,7 +215,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
211215
## Tool Versions
212216
KUSTOMIZE_VERSION ?= v5.4.2
213217
CONTROLLER_TOOLS_VERSION ?= v0.15.0
214-
ENVTEST_VERSION ?= release-0.18
218+
ENVTEST_VERSION ?= release-0.19
215219
GOLANGCI_LINT_VERSION ?= v1.59.1
216220

217221
.PHONY: kustomize

‎storage-operator/go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module github.com/scality/metalk8s/storage-operator
22

33
go 1.22.0
4+
toolchain go1.22.12
45

56
require (
67
github.com/go-logr/logr v1.4.1

0 commit comments

Comments
 (0)