Skip to content

Commit 4cb7dba

Browse files
Merge remote-tracking branch 'origin/development/133.0' into HEAD
2 parents 45b2276 + 0483a17 commit 4cb7dba

File tree

62 files changed

+1092
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1092
-75
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
- Bump prometheus-adapter chart version to [5.3.0](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-adapter-5.3.0)
4040
(PR[#4825](https://github.com/scality/metalk8s/pull/4825))
4141

42+
- Bump ingress-nginx chart version to [4.15.0](https://github.com/kubernetes/ingress-nginx/releases/tag/helm-chart-4.15.0)
43+
and ingress-nginx controller to [v1.15.0](https://github.com/kubernetes/ingress-nginx/releases/tag/controller-v1.15.0)
44+
(PR[#4824](https://github.com/scality/metalk8s/pull/4824))
45+
4246
### Bug Fixes
4347

4448
- Fix a bug where part of the upgrade process would silently be skipped
@@ -65,7 +69,9 @@
6569
net.bridge.bridge-nf-call-iptables sysctls
6670
(PR[#4724](https://github.com/scality/metalk8s/pull/4724))
6771

68-
## Release 131.0.11 (in development)
72+
## Release 131.0.12 (in development)
73+
74+
## Release 131.0.11
6975

7076
## Release 131.0.10
7177

buildchain/buildchain/constants.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
PROMETHEUS_REPOSITORY: str = "quay.io/prometheus"
3333
THANOS_REPOSITORY: str = "quay.io/thanos"
3434
CERT_MANAGER_REPOSITORY: str = "quay.io/jetstack"
35+
OAUTH2_PROXY_REPOSITORY: str = "quay.io/oauth2-proxy"
3536
SCALITY_REPOSITORY: str = "ghcr.io/scality"
3637

3738
# Paths {{{

buildchain/buildchain/image.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,9 @@ def _local_image(name: str, **kwargs: Any) -> targets.LocalImage:
217217
"cert-manager-cainjector",
218218
"cert-manager-acmesolver",
219219
],
220+
constants.OAUTH2_PROXY_REPOSITORY: [
221+
"oauth2-proxy",
222+
],
220223
constants.SCALITY_REPOSITORY: [
221224
"ui-operator",
222225
"crl-operator",

buildchain/buildchain/versions.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def load_version_information() -> None:
8686
NODEJS_IMAGE_VERSION: str = "20.11.1"
8787
KEEPALIVED_VERSION: str = "2.3.3"
8888
CERT_MANAGER_VERSION: str = "1.17.1"
89-
UI_OPERATOR_VERSION: str = "1.0.15"
89+
UI_OPERATOR_VERSION: str = "1.0.16"
9090

9191
# Current build IDs, to be augmented whenever we rebuild the corresponding
9292
# image, e.g. because the `Dockerfile` is changed, or one of the dependencies
@@ -188,14 +188,19 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
188188
),
189189
Image(
190190
name="nginx-ingress-controller",
191-
version="v1.12.1",
192-
digest="sha256:d2fbc4ec70d8aa2050dd91a91506e998765e86c96f32cffb56c503c9c34eed5b",
191+
version="v1.15.0",
192+
digest="sha256:4eea9a4cc2cb6ddcb7da14d377aaf452e68bd3dbe87fe280755d225c4d5e7e4e",
193193
),
194194
Image(
195195
name="node-exporter",
196196
version="v1.8.2",
197197
digest="sha256:4032c6d5bfd752342c3e631c2f1de93ba6b86c41db6b167b9a35372c139e7706",
198198
),
199+
Image(
200+
name="oauth2-proxy",
201+
version="v7.14.3",
202+
digest="sha256:68336da945bdaff799262c8d14fb1d1aa9354df5e02b87e0955addc040344618",
203+
),
199204
Image(
200205
name="pause",
201206
version="3.10",
@@ -272,7 +277,7 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
272277
Image(
273278
name="ui-operator",
274279
version=UI_OPERATOR_VERSION,
275-
digest="sha256:ab78cb6f8094e846af8c5c09d2b26b1641c66f751f6dbb8fc22b520dd898f84c",
280+
digest="sha256:9dcdb02407fc452b2d6334c796558ebd79ca2f1abca1496ebdf79592f7fff66f",
276281
),
277282
Image(
278283
name="loki",

charts/ingress-nginx/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
annotations:
22
artifacthub.io/changes: |
3-
- Update Ingress-Nginx version controller-v1.12.1
3+
- Update Ingress-Nginx version controller-v1.15.0
44
artifacthub.io/prerelease: "false"
55
apiVersion: v2
6-
appVersion: 1.12.1
6+
appVersion: 1.15.0
77
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
88
load balancer
99
home: https://github.com/kubernetes/ingress-nginx
@@ -20,4 +20,4 @@ maintainers:
2020
name: ingress-nginx
2121
sources:
2222
- https://github.com/kubernetes/ingress-nginx
23-
version: 4.12.1
23+
version: 4.15.0

charts/ingress-nginx/README.md

Lines changed: 32 additions & 7 deletions
Large diffs are not rendered by default.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Changelog
2+
3+
This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
4+
5+
### 4.10.5
6+
7+
* Update Ingress-Nginx version controller-v1.10.5
8+
9+
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.10.4...helm-chart-4.10.5
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Changelog
2+
3+
This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
4+
5+
### 4.10.6
6+
7+
* CI: Fix chart testing. (#12260)
8+
* Update Ingress-Nginx version controller-v1.10.6
9+
10+
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.10.5...helm-chart-4.10.6
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Changelog
2+
3+
This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
4+
5+
### 4.11.3
6+
7+
* Update Ingress-Nginx version controller-v1.11.3
8+
9+
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.11.2...helm-chart-4.11.3
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Changelog
2+
3+
This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
4+
5+
### 4.11.4
6+
7+
* CI: Fix chart testing. (#12259)
8+
* Update Ingress-Nginx version controller-v1.11.4
9+
10+
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.11.3...helm-chart-4.11.4

0 commit comments

Comments
 (0)