NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-05-13-154759_amd64-2026-05-13_arm64-2026-05-15

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-14-030029
+OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-15-030029

assets/components/multus/kustomization.aarch64.yaml

@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:add0b47ac06901b10d2043899d704899ca4efc5b85ffad1066bd5180bd9caaa7
+    digest: sha256:feb65c6b6a7be45549c743a0d0a47b376c666dcccd66adaa90b46a3869c9b3a7
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:9067a8a306c17d57fa2a361b269012d71ce3e115d23404011284640605ecdd42
+    digest: sha256:73a66ab66a8cf5312dfaa0042e605d0a629ee72633a09ba18acd97b49fd23f92

assets/components/multus/release-multus-aarch64.json

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-05-14-030029"
+    "base": "4.22.0-0.nightly-arm64-2026-05-15-030029"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:add0b47ac06901b10d2043899d704899ca4efc5b85ffad1066bd5180bd9caaa7",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9067a8a306c17d57fa2a361b269012d71ce3e115d23404011284640605ecdd42"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:feb65c6b6a7be45549c743a0d0a47b376c666dcccd66adaa90b46a3869c9b3a7",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73a66ab66a8cf5312dfaa0042e605d0a629ee72633a09ba18acd97b49fd23f92"
   }
 }

assets/optional/operator-lifecycle-manager/kustomization.aarch64.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:56428c56796128f8d25752ac354f2e90bcc8ef98c399aa0daa38ead545ae8022
+    digest: sha256:ae5db57c38853fec2c560fa7c28a497fea5e5d3fc4763922a90b7855554b2a2a
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:5f1e5aaa1904a82bdf100440f813740bddcbf8f2a80299069f9b3dad1617f14e
+    digest: sha256:470b121b405027bd4a0db79915999cd3c8b755c8e77c29c10d7c350452b2254e
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:e65f33024e81d616f45252bff717632351064b5ead26c8f6401ac729258809a4
+    digest: sha256:bdf4013fd51061feba7a06f5781027ae610da6a31ba9941dc1fa7ed384c8d6c7
 
 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:5f1e5aaa1904a82bdf100440f813740bddcbf8f2a80299069f9b3dad1617f14e
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:470b121b405027bd4a0db79915999cd3c8b755c8e77c29c10d7c350452b2254e
      - 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:56428c56796128f8d25752ac354f2e90bcc8ef98c399aa0daa38ead545ae8022
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae5db57c38853fec2c560fa7c28a497fea5e5d3fc4763922a90b7855554b2a2a
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-05-14-030029"
+    "base": "4.22.0-0.nightly-arm64-2026-05-15-030029"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56428c56796128f8d25752ac354f2e90bcc8ef98c399aa0daa38ead545ae8022",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f1e5aaa1904a82bdf100440f813740bddcbf8f2a80299069f9b3dad1617f14e",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e65f33024e81d616f45252bff717632351064b5ead26c8f6401ac729258809a4"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae5db57c38853fec2c560fa7c28a497fea5e5d3fc4763922a90b7855554b2a2a",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:470b121b405027bd4a0db79915999cd3c8b755c8e77c29c10d7c350452b2254e",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdf4013fd51061feba7a06f5781027ae610da6a31ba9941dc1fa7ed384c8d6c7"
   }
 }

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-05-14-030029"
+    "base": "4.22.0-0.nightly-arm64-2026-05-15-030029"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b31b66e9bf5ee04a434374cd5763729bd75347e3f631380acb976d92562fa869",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0cc8dfcd8170adbe32120bd9bf89ec85db240afc67ce7f23c31571fa33252f60",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70b6477460134e5c9578b4b5b28d40ae431ae01160afbaf3fae24ef0546f6aaa",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e65f33024e81d616f45252bff717632351064b5ead26c8f6401ac729258809a4",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0df2ba484d5bc7ec245a713a19f2130eb31103e2353795db4dafc24c6ee66ede",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e78f0dbb59944a39552e380ffd9cd6e3a5dc586ceffe8ea6750bfea3fe51205c",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c65ad20ae2572a1858e2cc438564108329daacc9db1a198950eccffbd59b670f",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfa1ba3e7d38780bbcd55b7b2c2cb1bb54ef04d39128efbc958cffbe0705ba9d",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b24ecb2314d56088849e8a6eaa7453d15fa565d02be62f400d26674c08db785",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f87a5b08338129812bbce3e0d92c226f6f0a1e2fd4250beb324ffaae8d1d4b56",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdf4013fd51061feba7a06f5781027ae610da6a31ba9941dc1fa7ed384c8d6c7",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b070190b70b89d692b58c26fe58dfb76b7b8176f52798351c825d80f8fb3f44",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5c1eb80fe40a44b31132951b16185a0b279b2cd7b6fe804eed0b37445645576",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:741b882bbe05c5af23d4efa9a21ad3f1bc801b16622357ab1dabe230066dd88c",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:772a112d3e35269f19feaf8295f119003a35724f190d2a1b747f70c03ad0f47e"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eefb912d36e8cee39b1b4eb1205de9e5ae881f452e4acf22ac96e4246d6ad4a3"
   }
 }

packaging/crio.conf.d/10-microshift_arm64.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:e78f0dbb59944a39552e380ffd9cd6e3a5dc586ceffe8ea6750bfea3fe51205c"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5c1eb80fe40a44b31132951b16185a0b279b2cd7b6fe804eed0b37445645576"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"

scripts/auto-rebase/changelog.txt

@@ -1,14 +1,18 @@
-- api embedded-component e9fad7d4cba1537b8af99b972370e76370de72e9 to 694421e64aeeae4374e7e7394014ad40ab5a1f30
-  - 5a03f8a5 2026-05-06T15:20:52+02:00 Add labelSelector to MachineSet status for scale subresource
-  - ab1df8ca 2026-04-29T12:52:48+02:00 Promote EVPN Feature Gate
-
-- kubernetes embedded-component 80f28ac33ac111532fb8ba59b2e569085ee871b0 to 6b9ddbe6e09aa225e949baecde4145208bf94c8e
-  - 93426635f 2026-05-11T15:35:17Z UPSTREAM: 138401: Improve WatchList test robustness
-
-- machine-config-operator embedded-component b7a8bf128b2775ea19c8191efa774f0660b2be70 to 864d1bc04264397caddb7ff1ffa43fc5502aa5e7
-  - c1d06d81 2026-05-12T10:26:44Z Add fix for ossImagestream status
-  - d7901102 2026-04-30T16:16:01Z OCBPUGS-84652: Include RootCA in the temporal CC
-
-- kubernetes image-amd64 80f28ac33ac111532fb8ba59b2e569085ee871b0 to 6b9ddbe6e09aa225e949baecde4145208bf94c8e
-  - 93426635f 2026-05-11T15:35:17Z UPSTREAM: 138401: Improve WatchList test robustness
+- kubernetes image-arm64 6b9ddbe6e09aa225e949baecde4145208bf94c8e to c5ea727d19837f8a22cda5c0ba8899960b7777ff
+  - c3b2ba200 2026-05-12T17:01:37-04:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
+  - 6636cbce3 2026-05-12T09:50:49Z Release commit for Kubernetes v1.35.5
+  - b9ffe7c06 2026-05-11T11:25:41+02:00 kubeadm: use dedicated ClusterRole for apiserver kubelet client
+  - 7909267f8 2026-05-06T11:08:39+02:00 kubeadm: skip LocalAPIEndpoint defaulting on worker join
+  - f79279632 2026-04-29T17:39:56+02:00 kubeadm: use the localAPIEndpoint for all API calls in 'init'
+  - faa811285 2026-04-28T07:49:50Z kube-proxy: don't do full periodic syncs on large cluster mode
+  - 943d94194 2026-04-26T09:54:46Z Delete remote endpoint if it has same ip as local endpoint in the system.
+  - d550d458d 2026-04-26T09:54:46Z Delete remote endpoint if it has same ip as local endpoint in the system.
+  - 6d314b2fd 2026-04-23T09:15:12+01:00 Add a (*Client) addEndpoint method
+  - feb7fa111 2026-04-23T09:15:11+01:00 Evaluate etcd cluster health using quorum
+  - 1a7f0b3de 2026-04-21T10:55:12+02:00 Escape path inside the container
+  - 6953afbad 2026-04-17T06:40:11Z scheduler: address recreated pod review feedback
+  - bf14155eb 2026-04-17T06:39:06Z scheduler: skip requeueing recreated pods on scheduling failure
+  - 55f12e847 2026-04-17T06:36:28Z scheduler: fix inFlightPods leak when pod is recreated during scheduling failure
+  - 31d47ca37 2026-04-15T18:12:54Z Update CHANGELOG/CHANGELOG-1.35.md for v1.35.4
+  - 69dd59d5b 2026-04-01T11:11:34-07:00 podStartSLOduration excludes init container runtime and image pulling time, includes only stateless and immediately schedulable pods
 

scripts/auto-rebase/commits.txt

@@ -31,5 +31,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 d1bc3ffaa9759c
 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 72db5e8d8ec23d4108183a8c67b45cdfdb8057ba
-https://github.com/openshift/kubernetes image-arm64 6b9ddbe6e09aa225e949baecde4145208bf94c8e
+https://github.com/openshift/kubernetes image-arm64 c5ea727d19837f8a22cda5c0ba8899960b7777ff
 https://github.com/openshift/service-ca-operator image-arm64 9fff46a576033685f66fbb1121eb0a2f134a29be

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-05-13-154759" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-14-030029"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-05-13-154759" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-15-030029"