Merge pull request #6251 from pacevedom/rebase-test-4.22.0-0.nightly-2026-02-18-151605_amd64-2026-02-18_arm64-2026-02-18

openshift-merge-bot[bot] · web-flow · commit 4e5d27c66044 · 2026-02-20T03:34:48.000Z
NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-02-18-151605_amd64-2026-02-18_arm64-2026-02-18
diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var
@@ -1 +1 @@
-OCP_VERSION := 4.22.0-0.nightly-arm64-2026-02-17-232712
+OCP_VERSION := 4.22.0-0.nightly-arm64-2026-02-18-222813
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.22.0-0.nightly-2026-02-17-112443
+OCP_VERSION := 4.22.0-0.nightly-2026-02-18-151605
diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-02-17-232712"
+    "base": "4.22.0-0.nightly-arm64-2026-02-18-222813"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5059097d17fbc06dbe7a9e7f0d61116eeb2750fcc2debc54842916cc35181a06",
diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-2026-02-17-112443"
+    "base": "4.22.0-0.nightly-2026-02-18-151605"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9b425020d10f9f7ab0ddf27b082dd69e7b5c97f498608f9761f88b533d593d8",
diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-02-17-232712"
+    "base": "4.22.0-0.nightly-arm64-2026-02-18-222813"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cae71a754b76203d01e23ec9c6730c1ce9be6c37a7451243d27bf419ceaddd8",
diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-2026-02-17-112443"
+    "base": "4.22.0-0.nightly-2026-02-18-151605"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5cacff5077abbababa5336b6ebb334377382817184b8ce7cfda87b589544b4cc",
diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-02-17-232712"
+    "base": "4.22.0-0.nightly-arm64-2026-02-18-222813"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3942ad8c93f5222836244549cbad53c745f3b16699824319f2a020257457703",
diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-2026-02-17-112443"
+    "base": "4.22.0-0.nightly-2026-02-18-151605"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12fcf0dfc2aef1d52a1a211a0edfb5a4d7f1992de99c84d6ee112c2ced50b1b6",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:64ae0a6b0bfcff7f70e0ec2c7f8ca3ec0f9b11408b1594062643001aab93c7af",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9060aa9a30b0ec7a2f99e40278fbf0f3a82b9371b256615604b9cfb019d89891",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d87740f4ff9ed6ead0e9af1ea0c9a58fd28676a3931eae9be1067409a84e7704",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74536a9ae64f64aa25dcd7ff3a529b2bddb76cef69847e6a4fbc5716b2f05a53",
diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/version/version.go b/etcd/vendor/github.com/openshift/microshift/pkg/version/version.go
diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -0,0 +1,8 @@
+- cluster-network-operator embedded-component 9d540eb7929f83879d3dafbcd1ae6cb1feca36b3 to f28e91e89d1ec31bda057e8ade21d4cc68aaefe1
+  - 93b77b1 2026-02-16T12:33:22+01:00 Add VTEP and CUDN EVPN APIs
+  - ed8923b 2026-02-16T12:30:37+01:00 Bump OCP API
+
+- oc image-amd64 8b0a043216f7ae608606afb5bdb0ce451561021e to 7f88fe2132f6969e1686808e5301aa3c808d4a45
+  - 1de915e0 2026-02-12T14:47:52-05:00 images/tools: Install subscription-manager
+  - 12d5804c 2026-02-11T13:45:48-05:00 OCPBUGS-76394: Install subscription-manager in cli image
+
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
@@ -5,7 +5,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component abfb6fa
 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component cee7acb6c820b707fbb1e1dc01cef6c1971f146d
 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component a6a751080c9b2bdd3a721851b206cf2f7c8bbc41
 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 14c5fdcfc2602292e19cab8713e42accf94b593d
-https://github.com/openshift/cluster-network-operator embedded-component 9d540eb7929f83879d3dafbcd1ae6cb1feca36b3
+https://github.com/openshift/cluster-network-operator embedded-component f28e91e89d1ec31bda057e8ade21d4cc68aaefe1
 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 7634c413830a510ff942bd6886ffe5f79db707b4
 https://github.com/openshift/cluster-policy-controller embedded-component 8b775487512fb543bff470ff1042bd3ac31b29be
 https://github.com/openshift/csi-external-snapshotter embedded-component d20b90a92cd7d77166319f5bc2feb80623747d28
@@ -17,7 +17,7 @@ https://github.com/openshift/openshift-controller-manager embedded-component 19a
 https://github.com/openshift/operator-framework-olm embedded-component 811919f88bc3b8da4f97c6e6ca031258cc4fa13b
 https://github.com/openshift/route-controller-manager embedded-component 624742d93f3a7885cf7f70985f1e23ff60da580d
 https://github.com/openshift/service-ca-operator embedded-component 503e4f5f4c74fd095a8dca385541125f3c9ee28b
-https://github.com/openshift/oc image-amd64 8b0a043216f7ae608606afb5bdb0ce451561021e
+https://github.com/openshift/oc image-amd64 7f88fe2132f6969e1686808e5301aa3c808d4a45
 https://github.com/openshift/coredns image-amd64 9798af8539c27ad02bd376006cd3a9a7b23e5966
 https://github.com/openshift/csi-external-snapshotter image-amd64 d20b90a92cd7d77166319f5bc2feb80623747d28
 https://github.com/openshift/router image-amd64 d8ed3559fd4808a4f10c927ba4a199d3fd5b84a2
diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh
@@ -1,2 +1,2 @@
 #!/bin/bash -x
-./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-02-17-112443" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-02-17-232712"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-02-18-151605" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-02-18-222813"
diff --git a/scripts/auto-rebase/rebase.sh b/scripts/auto-rebase/rebase.sh
@@ -1111,6 +1111,14 @@ EOF
 update_olm_images() {
     title "Rebasing operator-lifecycle-manager manifests"
 
+    # Temporary fix, remove once OCPBUGS-77006 is solved.
+    local olm_kustomization="${REPOROOT}/assets/optional/operator-lifecycle-manager/kustomization.yaml"
+    sed -i \
+        -e '/0000_50_olm_00-pprof-config\.yaml/d' \
+        -e '/0000_50_olm_00-pprof-rbac\.yaml/d' \
+        -e '/0000_50_olm_00-pprof-secret\.yaml/d' \
+        "${olm_kustomization}"
+
     # Replace hardcoded image refs with variables. Variables will be provided via kustomize's patches (added to `env`).
     # Expr with --util-image finds line with --util-image and edits the line after.
     sed -i \

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.22.0-0.nightly-arm64-2026-02-17-232712`
	`1`	`+OCP_VERSION := 4.22.0-0.nightly-arm64-2026-02-18-222813`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.22.0-0.nightly-2026-02-17-112443`
	`1`	`+OCP_VERSION := 4.22.0-0.nightly-2026-02-18-151605`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.22.0-0.nightly-arm64-2026-02-17-232712"`
	`3`	`+ "base": "4.22.0-0.nightly-arm64-2026-02-18-222813"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5059097d17fbc06dbe7a9e7f0d61116eeb2750fcc2debc54842916cc35181a06",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.22.0-0.nightly-2026-02-17-112443"`
	`3`	`+ "base": "4.22.0-0.nightly-2026-02-18-151605"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9b425020d10f9f7ab0ddf27b082dd69e7b5c97f498608f9761f88b533d593d8",`