UPSTREAM: <carry>: Update OPM for 4.12

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit da609f9)
(cherry picked from commit 7447b28)
(cherry picked from commit 7eb7622)
(cherry picked from commit ef6441a)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 474f679)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 685a707)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 95d1a42)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 65fc3dd)
Signed-off-by: Mat Kowalski <mko@redhat.com>

Makefile

@@ -59,7 +59,7 @@ export SSH ?= ./cluster/ssh.sh
 export KUBECTL ?= ./cluster/kubectl.sh
 
 KUBECTL ?= ./cluster/kubectl.sh
-OPERATOR_SDK_VERSION ?= 1.21.0
+OPERATOR_SDK_VERSION ?= 1.22.2
 
 GINKGO = GOFLAGS=-mod=mod go run github.com/onsi/ginkgo/v2/ginkgo@v2.1.5
 CONTROLLER_GEN = GOFLAGS=-mod=mod go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0
@@ -252,7 +252,7 @@ bundle-build:
 
 # Build the index
 index-build: bundle-build
-	$(OPM) index add --bundles $(BUNDLE_IMG) --tag $(INDEX_IMG) --build-tool $(IMAGE_BUILDER)
+	$(OPM) index add --bundles $(BUNDLE_IMG) --tag $(INDEX_IMG) --build-tool $(IMAGE_BUILDER) --binary-image quay.io/operator-framework/opm:v1.24.0
 
 bundle-push: bundle-build
 	$(IMAGE_BUILDER) push $(BUNDLE_IMG)

hack/ocp-update-bundle-manifests.sh

@@ -67,7 +67,7 @@ $(yq4) --inplace eval '.spec.customresourcedefinitions.owned |= [{"kind":"NMStat
 rm -f ${BUNDLE_DIR}/manifests/nmstate.io_nodenetwork*.yaml
 
 # save new bundle.Dockerfile with new paths
-sed 's#manifests\/$(CHANNEL)/##g' bundle.Dockerfile | head -n -1 > ${BUNDLE_DIR}/bundle.Dockerfile
+sed 's#manifests\/$(CHANNEL)/##g' bundle.Dockerfile > ${BUNDLE_DIR}/bundle.Dockerfile
 
 # save image-refences file
 cat > ${BUNDLE_DIR}/manifests/image-references <<EOF

hack/opm.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -xe
 
-curl -L https://github.com/operator-framework/operator-registry/releases/download/v1.19.5/linux-amd64-opm -o /tmp/opm
+curl -L https://github.com/operator-framework/operator-registry/releases/download/v1.24.0/linux-amd64-opm -o /tmp/opm
 chmod 755 /tmp/opm
 /tmp/opm $@

manifests/4.12/bundle.Dockerfile

@@ -7,14 +7,10 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=kubernetes-nmstate-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=4.12,alpha
 LABEL operators.operatorframework.io.bundle.channel.default.v1=4.12
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.21.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.22.2
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 
-# Labels for testing.
-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 manifests/4.12/manifests /manifests/
 COPY manifests/4.12/metadata /metadata/

manifests/4.12/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml

@@ -69,7 +69,7 @@ metadata:
     olm.skipRange: '>=4.3.0 <4.12.0'
     operatorframework.io/suggested-namespace: openshift-nmstate
     operators.openshift.io/infrastructure-features: '["disconnected"]'
-    operators.operatorframework.io/builder: operator-sdk-v1.21.0
+    operators.operatorframework.io/builder: operator-sdk-v1.22.2
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/openshift/kubernetes-nmstate
     support: Red Hat, Inc.

manifests/4.12/metadata/annotations.yaml

@@ -6,10 +6,6 @@ annotations:
   operators.operatorframework.io.bundle.package.v1: kubernetes-nmstate-operator
   operators.operatorframework.io.bundle.channels.v1: 4.12,alpha
   operators.operatorframework.io.bundle.channel.default.v1: 4.12
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.21.0
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.2
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
-
-  # Annotations for testing.
-  operators.operatorframework.io.test.mediatype.v1: scorecard+v1
-  operators.operatorframework.io.test.config.v1: tests/scorecard/