Merge remote-tracking branch 'origin/improvement/bump-ingress-nginx-4.12.1' into w/130.0/improvement/bump-ingress-nginx-4.12.1

Author: Yoan Moscatelli

BUMPING.md

@@ -4,26 +4,6 @@ Here is a short list of chart and component bumps and how to perform them
 
 ## Charts
 
-### General Outline
-
-All charts are in the `charts/` directory, they are usually represented
-in one file and one directory:
-
- - `$CHART_NAME/` contains the untouched chart files fetched using helm.
- - `$CHART_NAME.yaml` our personalized helm values file.
-
-In order to Bump this chart, one has to:
-
- - remove the current chart files:
-   ```rm -rf charts/$CHART_NAME/```
- - add the chart's repo using helm:
-   ```helm repo add $REPO_NAME $REPO_URL && helm repo update```
- - fetch the repo again:
-   ```helm fetch -d charts --untar $REPO_NAME/$CHART_NAME```
- - make any necessary patches to the chart (chart-specific).
- - generate the sls state from the chart:
-   ```./doit.sh codegen:chart_$CHART_NAME```
-
 ### fluent-bit
 
 ```
@@ -81,9 +61,9 @@ set `$VERSION` with the appropriate value.
 run
 
 ```
-curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/helm-chart-$VERSION/deploy/grafana/dashboards/nginx.json \
+curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/refs/tags/controller-$VERSION/deploy/grafana/dashboards/nginx.json \
   -Lo salt/metalk8s/addons/nginx-ingress/deployed/files/ingress-nginx.json
-curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/helm-chart-$VERSION/deploy/grafana/dashboards/request-handling-performance.json \
+curl https://raw.githubusercontent.com/kubernetes/ingress-nginx/refs/tags/controller-$VERSION/deploy/grafana/dashboards/request-handling-performance.json \
   -Lo salt/metalk8s/addons/nginx-ingress/deployed/files/ingress-nginx-performance.json
 ```
 
@@ -116,6 +96,24 @@ REPO_NAME=banzaicloud-stable
 REPO_URL=https://kubernetes-charts.banzaicloud.com/
 ```
 
+### General Outline
+
+All charts are in the `charts/` directory, they are usually represented
+in one file and one directory:
+
+ - `$CHART_NAME/` contains the untouched chart files fetched using helm.
+ - `$CHART_NAME.yaml` our personalized helm values file.
+
+In order to Bump this chart, one has to:
+
+ - remove the current chart files:
+   ```rm -rf charts/$CHART_NAME/```
+ - add the chart's repo using helm:
+   ```helm repo add $REPO_NAME $REPO_URL && helm repo update```
+ - fetch the repo again:
+   ```helm fetch -d charts --untar $REPO_NAME/$CHART_NAME```
+ - make any necessary patches to the chart (chart-specific).
+
 ## Images
 
 A few tips to bump image versions and SHAs:
@@ -151,3 +149,9 @@ This guide is applied for both `metalk8s-operator` and `storage-operator`.
 ## Containerd
 
 Instructions to bump Containerd version are in its [spec file](./packages/redhat/common/containerd.spec)
+
+## Update the sls state
+
+ - git add changes because codegen need to list them.
+ - generate the sls state from the chart:
+   ```./doit.sh codegen:chart_$CHART_NAME```

CHANGELOG.md

@@ -31,7 +31,21 @@
 - Bump Calico version to [3.29.3](https://github.com/projectcalico/calico/releases/tag/v3.29.3)
   (PR[#4571](https://github.com/scality/metalk8s/pull/4571))
 
-## Release 129.0.1 (in development)
+## Release 129.0.3 (in development)
+
+### Enhancements
+
+- Bump ingress-nginx chart version to
+  [4.12.1](https://github.com/kubernetes/ingress-nginx/releases/tag/helm-chart-4.12.1)
+  The controller image has been bumped accordingly to
+  [v1.12.1](https://github.com/kubernetes/ingress-nginx/releases/tag/controller-v1.12.1)
+
+- Bump nginx image to [1.27.5-alpine](https://github.com/nginx/nginx/releases/tag/release-1.27.5)
+  (PR[#4544](https://github.com/scality/metalk8s/pull/4544))
+
+## Release 129.0.2
+
+## Release 129.0.1
 
 ### Enhancements
 

buildchain/buildchain/versions.py

@@ -82,7 +82,7 @@ def load_version_information() -> None:
 
 ETCD_VERSION: str = "3.5.21"
 ETCD_IMAGE_VERSION: str = f"{ETCD_VERSION}-0"
-NGINX_IMAGE_VERSION: str = "1.27.2-alpine"
+NGINX_IMAGE_VERSION: str = "1.27.5-alpine"
 NODEJS_IMAGE_VERSION: str = "20.11.1"
 KEEPALIVED_VERSION: str = "2.3.1"
 CERT_MANAGER_VERSION: str = "1.16.1"
@@ -187,8 +187,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="nginx-ingress-controller",
-        version="v1.11.3",
-        digest="sha256:d56f135b6462cfc476447cfe564b83a45e8bb7da2774963b00d12161112270b7",
+        version="v1.12.1",
+        digest="sha256:d2fbc4ec70d8aa2050dd91a91506e998765e86c96f32cffb56c503c9c34eed5b",
     ),
     Image(
         name="node-exporter",

charts/ingress-nginx/Chart.yaml

@@ -1,9 +1,9 @@
 annotations:
   artifacthub.io/changes: |
-    - Update Ingress-Nginx version controller-v1.11.3
+    - Update Ingress-Nginx version controller-v1.12.1
   artifacthub.io/prerelease: "false"
 apiVersion: v2
-appVersion: 1.11.3
+appVersion: 1.12.1
 description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
   load balancer
 home: https://github.com/kubernetes/ingress-nginx
@@ -15,11 +15,9 @@ kubeVersion: '>=1.21.0-0'
 maintainers:
 - name: cpanato
 - name: Gacko
-- name: puerco
-- name: rikatz
 - name: strongjz
 - name: tao12345666333
 name: ingress-nginx
 sources:
 - https://github.com/kubernetes/ingress-nginx
-version: 4.11.3
+version: 4.12.1

charts/ingress-nginx/OWNERS

@@ -1,10 +1,4 @@
 # See the OWNERS docs: https://www.kubernetes.dev/docs/guide/owners
 
-approvers:
-- ingress-nginx-helm-maintainers
-
-reviewers:
-- ingress-nginx-helm-reviewers
-
 labels:
 - area/helm