Revert "[TMP] rollback operator-sdk to 4.11.3"

This reverts commit d178ad4.

Author: eg-ayoub

buildchain/buildchain/versions.py

@@ -28,7 +28,7 @@
 CALICO_VERSION: str = "3.29.0"
 SALT_VERSION: str = "3002.9"
 CONTAINERD_VERSION: str = "1.6.36"
-NGINX_OPERATOR_VERSION: str = "4.11.3"
+NGINX_OPERATOR_VERSION: str = "4.12.0"
 
 CONTAINERD_RELEASE: str = "1"
 SOSREPORT_RELEASE: str = "2"
@@ -190,8 +190,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.0",
+        digest="sha256:e6b8de175acda6ca913891f0f727bca4527e797d52688cbe9fec9040d6f6b6fa",
     ),
     Image(
         name="node-exporter",

…alog/nginx-operator/bundles/v4.11.3.yaml …alog/nginx-operator/bundles/v4.12.0.yamlcatalog-source/catalog/nginx-operator/bundles/v4.11.3.yaml renamed to catalog-source/catalog/nginx-operator/bundles/v4.12.0.yaml catalog-source/catalog/nginx-operator/bundles/v4.11.3.yaml renamed to catalog-source/catalog/nginx-operator/bundles/v4.12.0.yaml

@@ -1,6 +1,6 @@
 ---
-image: registry.metalk8s.lan/metalk8s-MK8S_VERSION_STUB/nginx-operator-bundle:v4.11.3
-name: nginx-operator.v4.11.3
+image: registry.metalk8s.lan/metalk8s-MK8S_VERSION_STUB/nginx-operator-bundle:v4.12.0
+name: nginx-operator.v4.12.0
 package: nginx-operator
 properties:
 - type: olm.gvk
@@ -11,7 +11,7 @@ properties:
 - type: olm.package
   value:
     packageName: nginx-operator
-    version: 4.11.3
+    version: 4.12.0
 - type: olm.csv.metadata
   value:
     annotations:
@@ -519,7 +519,7 @@ properties:
           }
         ]
       capabilities: Basic Install
-      createdAt: "2025-02-12T09:00:14Z"
+      createdAt: "2025-01-30T15:00:57Z"
       operators.operatorframework.io/builder: operator-sdk-v1.39.1
       operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
     apiServiceDefinitions: {}
@@ -556,8 +556,8 @@ properties:
       name: scality
       url: scality.com
 relatedImages:
-- image: registry.metalk8s.lan/metalk8s-MK8S_VERSION_STUB/nginx-operator-bundle:v4.11.3
+- image: registry.metalk8s.lan/metalk8s-MK8S_VERSION_STUB/nginx-operator-bundle:v4.12.0
   name: ""
-- image: registry.metalk8s.lan/metalk8s-MK8S_VERSION_STUB/nginx-operator:v4.11.3
+- image: registry.metalk8s.lan/metalk8s-MK8S_VERSION_STUB/nginx-operator:v4.12.0
   name: ""
 schema: olm.bundle

catalog-source/catalog/nginx-operator/channels/stable.yaml

@@ -3,4 +3,4 @@ schema: olm.channel
 package: nginx-operator
 name: stable
 entries:
-  - name: nginx-operator.v4.11.3
+  - name: nginx-operator.v4.12.0

nginx-operator/Makefile

@@ -6,7 +6,7 @@
 #
 # We keep this aligned with the chart version
 # Will also be set in versions.py
-VERSION ?= 4.11.3
+VERSION ?= 4.12.0
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

nginx-operator/bundle.Dockerfile

@@ -1,3 +1,15 @@
+ARG BUILDER_IMG=alpine:latest
+FROM ${BUILDER_IMG} AS builder
+
+# Copy files to locations specified by labels.
+COPY bundle/manifests /manifests/
+COPY bundle/metadata /metadata/
+COPY bundle/tests/scorecard /tests/scorecard/
+
+# Replace MK8S_VERSION_STUB with the actual version.
+ARG METALK8S_VERSION=MK8S_VERSION_STUB
+RUN sed -i "s/MK8S_VERSION_STUB/${METALK8S_VERSION}/g" /manifests/nginx-operator.clusterserviceversion.yaml
+
 FROM scratch
 
 # Core bundle labels.
@@ -14,7 +26,7 @@ LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorfra
 LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
 LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
 
-# Copy files to locations specified by labels.
-COPY bundle/manifests /manifests/
-COPY bundle/metadata /metadata/
-COPY bundle/tests/scorecard /tests/scorecard/
+# Copy files from builder to locations specified by labels.
+COPY --from=builder /manifests /manifests/
+COPY --from=builder /metadata /metadata/
+COPY --from=builder /tests/scorecard /tests/scorecard/

nginx-operator/bundle/manifests/nginx-operator.clusterserviceversion.yaml

@@ -506,10 +506,10 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2025-02-12T09:00:14Z"
+    createdAt: "2025-01-30T15:00:57Z"
     operators.operatorframework.io/builder: operator-sdk-v1.39.1
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
-  name: nginx-operator.v4.11.3
+  name: nginx-operator.v4.12.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -660,7 +660,7 @@ spec:
                 - --leader-elect
                 - --leader-election-id=nginx-operator
                 - --health-probe-bind-address=:8081
-                image: registry.metalk8s.lan/metalk8s-MK8S_VERSION_STUB/nginx-operator:v4.11.3
+                image: registry.metalk8s.lan/metalk8s-MK8S_VERSION_STUB/nginx-operator:v4.12.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -762,4 +762,4 @@ spec:
   provider:
     name: scality
     url: scality.com
-  version: 4.11.3
+  version: 4.12.0

nginx-operator/config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: registry.metalk8s.lan/metalk8s-MK8S_VERSION_STUB/nginx-operator
-  newTag: v4.11.3
+  newTag: v4.12.0

nginx-operator/helm-charts/ingress-nginx/Chart.yaml

@@ -1,9 +1,10 @@
 annotations:
   artifacthub.io/changes: |
-    - Update Ingress-Nginx version controller-v1.11.3
+    - 'CI: Fix chart testing. (#12258)'
+    - Update Ingress-Nginx version controller-v1.12.0
   artifacthub.io/prerelease: "false"
 apiVersion: v2
-appVersion: 1.11.3
+appVersion: 1.12.0
 description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
   load balancer
 home: https://github.com/kubernetes/ingress-nginx
@@ -15,11 +16,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.0

nginx-operator/helm-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