NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-04-16-071953_amd64-2026-04-16_arm64-2026-04-16 (#6517)

microshift-rebase-script[bot] · ci-robot · web-flow · commit 625f41bf683c · 2026-04-17T14:31:08.000Z
* update last_rebase.sh

* update changelog

* update component images

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot &lt;ci-robot@openshift.io&gt;
diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var
@@ -1 +1 @@
-OCP_VERSION := 4.22.0-0.nightly-arm64-2026-04-15-223903
+OCP_VERSION := 4.22.0-0.nightly-arm64-2026-04-16-224605
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.22.0-0.nightly-2026-04-15-103903
+OCP_VERSION := 4.22.0-0.nightly-2026-04-16-071953
diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml
@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:4b762730e99c7d83a0273c44c6118ef94e67f4c89d5f70d1576b90efcedb99d5
+    digest: sha256:620e86eea28e099908f35345f5e8293abc223c4eb3a84d108eeb9e41e8f5b897
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:5dd21ef2e0393f87b3104c55c362594a983050054ec2c1b720e1687241bdcd8e
+    digest: sha256:1550eb3b786dbbf351ac68ba8deea15880c8e3dad2b507866fa09b7d87bbded7
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-04-15-223903"
+    "base": "4.22.0-0.nightly-arm64-2026-04-16-224605"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b5dea1a4af066d607b01598dfd50e061d9c2e3d65f8c30c1bd3abb056b33152",
diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json
@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-2026-04-15-103903"
+    "base": "4.22.0-0.nightly-2026-04-16-071953"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b762730e99c7d83a0273c44c6118ef94e67f4c89d5f70d1576b90efcedb99d5",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5dd21ef2e0393f87b3104c55c362594a983050054ec2c1b720e1687241bdcd8e"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:620e86eea28e099908f35345f5e8293abc223c4eb3a84d108eeb9e41e8f5b897",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1550eb3b786dbbf351ac68ba8deea15880c8e3dad2b507866fa09b7d87bbded7"
   }
 }
diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
@@ -2,26 +2,26 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:3f4c190537315422300c119422f9207f9b1cb1ef03e8ebd0a3560cf976b2ae4e
+    digest: sha256:0e12533297ded98f646a858e554b51d82df668db5f174b5dbaf8535357a55a45
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:861932c526e81499a8be1eabf6d26d9fe713585a8abb3ef7916dfe3c346d431c
+    digest: sha256:5cac9a1ff033be185aa3e12be1c332825daa78953de478aa133b7b8462d1ad3d
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:b6612c92cb172a3e929daab852ff8820e0d69b8bf41db9f2e5fc0b6f79b062c1
+    digest: sha256:dee202ae1d67cdcf9771d0dbdf552d2306d8964fca12316966966a5e3da5f76d
 
 patches:
   - patch: |-
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:861932c526e81499a8be1eabf6d26d9fe713585a8abb3ef7916dfe3c346d431c
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5cac9a1ff033be185aa3e12be1c332825daa78953de478aa133b7b8462d1ad3d
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f4c190537315422300c119422f9207f9b1cb1ef03e8ebd0a3560cf976b2ae4e
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e12533297ded98f646a858e554b51d82df668db5f174b5dbaf8535357a55a45
     target:
       kind: Deployment
       labelSelector: app=catalog-operator
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-04-15-223903"
+    "base": "4.22.0-0.nightly-arm64-2026-04-16-224605"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ffe14ab720dcf34fdb9bdcfab9e0c7819ed10de29235aa2a3d42de4ed83ba0f",
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,10 +1,10 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-2026-04-15-103903"
+    "base": "4.22.0-0.nightly-2026-04-16-071953"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f4c190537315422300c119422f9207f9b1cb1ef03e8ebd0a3560cf976b2ae4e",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:861932c526e81499a8be1eabf6d26d9fe713585a8abb3ef7916dfe3c346d431c",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6612c92cb172a3e929daab852ff8820e0d69b8bf41db9f2e5fc0b6f79b062c1"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e12533297ded98f646a858e554b51d82df668db5f174b5dbaf8535357a55a45",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5cac9a1ff033be185aa3e12be1c332825daa78953de478aa133b7b8462d1ad3d",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dee202ae1d67cdcf9771d0dbdf552d2306d8964fca12316966966a5e3da5f76d"
   }
 }
diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
@@ -1,13 +1,13 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-04-15-223903"
+    "base": "4.22.0-0.nightly-arm64-2026-04-16-224605"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90d269b98f386ab375588f2335f02bcaaccb20c097dcc08252591539a53fc07b",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96c2ca56b7adee081586d205524adfed461168f1e0a40fd3b8038083fd77d43d",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c91239cf00f8f823d77384fd65c8a1118fbfd3ce76ff919fdd6ac5eec6b2b14f",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37e5d15a185322a5961620cd6f5e66a3ef885e1452dbafba848ad441496d5b5d",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1212a6316a0a1fd59123abbc120817a05c8686b7d5caf7db9d0f48ba1530a0fe",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0757a4b1f7806c4cde767c9c7ac9da41c65109a104b1c1c450347c058820593c",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19a860a1239cac2288a26bbe11dedbdb2b625fc07800b4ffc0157609acfad3b6",
     "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99b7c7acfd8f94be5b810f7f4c835667c6c8d09303fd0a24b4648ffbeeaeaabe",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6566096295545cf503b928bececa1d290ae30d9ebb99fcbafec113cb9acc02e",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-2026-04-15-103903"
+    "base": "4.22.0-0.nightly-2026-04-16-071953"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48030f3a916d765b49a8986f8251fc5fc40f501b2bd05843279bd61358304e33",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4cecbb11edf8544021a51c5cc30ac15400cacce74be644ded1e5f615569e3f8c",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba63800d7599664c73936321042e2787aafecddbe607843ae8c91f7f5faf7497",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88946b2dcc48392eeaf306b49ff9a6f320e7c2fd80c8c2e5a25d4392de05a7c5",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6612c92cb172a3e929daab852ff8820e0d69b8bf41db9f2e5fc0b6f79b062c1",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dee202ae1d67cdcf9771d0dbdf552d2306d8964fca12316966966a5e3da5f76d",
     "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb264c1f152e490c78ffa59f8e7c2b2d5184da2acdc1b3e4759bec959bf9c537",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db61ff4ea4fdab016925de8463740e21da9d14ac42e48be485738a63eb173cf6",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8094b22e650cb1c9660e324beab0e19039889abbc626627d0f443ca3bc58df34",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c244a9c834031b2eabb0986540fc97dc7ec5ec1a19d0e655b99c9cafca146ad8",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40124633cb9fc4f1b98a9ac920cfaaae146bf638291b03a55cb6f522c7e325bf",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8403b2ac6485d295d75dbd754e4ea5aea79be8fa01433e297db3123564e3d198"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f55030cd4d9367e0c0e41d6dc25c30dc8f637d054e91ddb31be4b465402af075"
   }
 }
diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf
@@ -2,6 +2,6 @@
 # for community builds on top of OKD, this setting has no effect
 [crio.image]
 global_auth_file="/etc/crio/openshift-pull-secret"
-pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db61ff4ea4fdab016925de8463740e21da9d14ac42e48be485738a63eb173cf6"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c244a9c834031b2eabb0986540fc97dc7ec5ec1a19d0e655b99c9cafca146ad8"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"
diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -1,6 +1,7 @@
-- cluster-csi-snapshot-controller-operator embedded-component 98d8223ebe55a0ddc10bb485e7603deb2c0acbb9 to 108f37f0e378accc322cbeb68136ec500ec35b94
-  - f3e4439 2026-04-10T14:38:09+02:00 Fix PDB unhealthyPodEvictionPolicy field name
+- api embedded-component 464776f9520793f0f20645fbcb82d945abb0a05b to b37d107c490a35659457ed38f9f5b109f85448da
+  - c90338d3 2026-04-14T14:35:24-04:00 features: disable psa
 
-- cluster-kube-apiserver-operator embedded-component 6df1155aa6e1d29f77b7b2aa1973ae2721975dae to ebd723168d8bac16ce678a01c3ea7a7467030169
-  - c9f0ab3 2026-01-27T10:00:51-05:00 OCPBUGS-68365: revert dev cert rotation
+- ovn-kubernetes image-arm64 e327d43ff04f410b1d9f301a6484af5359a98d3d to 14b5022bad5b21334e3ad9d500763474016b2a9c
+  - 68ccf1f1 2026-04-15T08:59:44Z openshift tests: disable
+  - f6098fc2 2026-04-15T08:58:44Z openshift tests: demote to informing
 
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
@@ -1,4 +1,4 @@
-https://github.com/openshift/api embedded-component 464776f9520793f0f20645fbcb82d945abb0a05b
+https://github.com/openshift/api embedded-component b37d107c490a35659457ed38f9f5b109f85448da
 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 108f37f0e378accc322cbeb68136ec500ec35b94
 https://github.com/openshift/cluster-dns-operator embedded-component 3d2141182243cde1ec6417bd005c76d29aa88a01
 https://github.com/openshift/cluster-ingress-operator embedded-component 2c5b4ef0021db96ba6fecf630c53a15c12134578
@@ -30,6 +30,6 @@ https://github.com/openshift/coredns image-arm64 0dded2d232dab43c107b1dab9d0d9fd
 https://github.com/openshift/csi-external-snapshotter image-arm64 d1bc3ffaa9759c13a06c2ec61c541342e71bd109
 https://github.com/openshift/router image-arm64 896390778ebe15f57f87e6ca78f11c96e64c2652
 https://github.com/openshift/kube-rbac-proxy image-arm64 d12e274605248f6c59373240a7eae7a7a357dcb3
-https://github.com/openshift/ovn-kubernetes image-arm64 e327d43ff04f410b1d9f301a6484af5359a98d3d
+https://github.com/openshift/ovn-kubernetes image-arm64 14b5022bad5b21334e3ad9d500763474016b2a9c
 https://github.com/openshift/kubernetes image-arm64 9193b12ab88e006723c8605bea1659bfcbe7d638
 https://github.com/openshift/service-ca-operator image-arm64 7b3033bba87d7b40684b66f8f44a3525433d1ac7
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-04-15-103903" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-04-15-223903"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-04-16-071953" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-04-16-224605"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.22.0-0.nightly-arm64-2026-04-15-223903`
	`1`	`+OCP_VERSION := 4.22.0-0.nightly-arm64-2026-04-16-224605`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.22.0-0.nightly-2026-04-15-103903`
	`1`	`+OCP_VERSION := 4.22.0-0.nightly-2026-04-16-071953`
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-04-15-223903"`
	`3`	`+ "base": "4.22.0-0.nightly-arm64-2026-04-16-224605"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b5dea1a4af066d607b01598dfd50e061d9c2e3d65f8c30c1bd3abb056b33152",`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.22.0-0.nightly-2026-04-15-103903"`
	`3`	`+ "base": "4.22.0-0.nightly-2026-04-16-071953"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`		`- "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b762730e99c7d83a0273c44c6118ef94e67f4c89d5f70d1576b90efcedb99d5",`
`7`		`- "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5dd21ef2e0393f87b3104c55c362594a983050054ec2c1b720e1687241bdcd8e"`
	`6`	`+ "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:620e86eea28e099908f35345f5e8293abc223c4eb3a84d108eeb9e41e8f5b897",`
	`7`	`+ "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1550eb3b786dbbf351ac68ba8deea15880c8e3dad2b507866fa09b7d87bbded7"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.22.0-0.nightly-2026-04-15-103903"`
	`3`	`+ "base": "4.22.0-0.nightly-2026-04-16-071953"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`		`- "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f4c190537315422300c119422f9207f9b1cb1ef03e8ebd0a3560cf976b2ae4e",`
`7`		`- "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:861932c526e81499a8be1eabf6d26d9fe713585a8abb3ef7916dfe3c346d431c",`
`8`		`- "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6612c92cb172a3e929daab852ff8820e0d69b8bf41db9f2e5fc0b6f79b062c1"`
	`6`	`+ "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e12533297ded98f646a858e554b51d82df668db5f174b5dbaf8535357a55a45",`
	`7`	`+ "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5cac9a1ff033be185aa3e12be1c332825daa78953de478aa133b7b8462d1ad3d",`
	`8`	`+ "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dee202ae1d67cdcf9771d0dbdf552d2306d8964fca12316966966a5e3da5f76d"`
`9`	`9`	`}`
`10`	`10`	`}`