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

Makefile.version.aarch64.var

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

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:feb65c6b6a7be45549c743a0d0a47b376c666dcccd66adaa90b46a3869c9b3a7
+    digest: sha256:655a9d04510059e5a465b9c38875eccd27dd26cfb9ef8bcecd3c4966fe071798
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:73a66ab66a8cf5312dfaa0042e605d0a629ee72633a09ba18acd97b49fd23f92
+    digest: sha256:dcc63a76c1b6e7dcd575e3caba9d3a640485c551b4fc21f291a9ba53e96b0bb6

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-05-15-030029"
+    "base": "4.22.0-0.nightly-arm64-2026-05-18-015115"
   },
   "images": {
-    "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"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:655a9d04510059e5a465b9c38875eccd27dd26cfb9ef8bcecd3c4966fe071798",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dcc63a76c1b6e7dcd575e3caba9d3a640485c551b4fc21f291a9ba53e96b0bb6"
   }
 }

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:ae5db57c38853fec2c560fa7c28a497fea5e5d3fc4763922a90b7855554b2a2a
+    digest: sha256:197e653ef871c5df107f7899a64b0575bd33537d053f77ed062679c208d53835
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:470b121b405027bd4a0db79915999cd3c8b755c8e77c29c10d7c350452b2254e
+    digest: sha256:40e33761feee5b7e735ad13e6f474b01f0550ee49b79369484cafa38b227ef29
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:bdf4013fd51061feba7a06f5781027ae610da6a31ba9941dc1fa7ed384c8d6c7
+    digest: sha256:86c4a72a60ae74d80c28edb895cfabd44117651c748acd374125d0e93b2c0be3
 
 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:470b121b405027bd4a0db79915999cd3c8b755c8e77c29c10d7c350452b2254e
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40e33761feee5b7e735ad13e6f474b01f0550ee49b79369484cafa38b227ef29
      - 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:ae5db57c38853fec2c560fa7c28a497fea5e5d3fc4763922a90b7855554b2a2a
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:197e653ef871c5df107f7899a64b0575bd33537d053f77ed062679c208d53835
     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-15-030029"
+    "base": "4.22.0-0.nightly-arm64-2026-05-18-015115"
   },
   "images": {
-    "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"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:197e653ef871c5df107f7899a64b0575bd33537d053f77ed062679c208d53835",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40e33761feee5b7e735ad13e6f474b01f0550ee49b79369484cafa38b227ef29",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:86c4a72a60ae74d80c28edb895cfabd44117651c748acd374125d0e93b2c0be3"
   }
 }

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-05-15-030029"
+    "base": "4.22.0-0.nightly-arm64-2026-05-18-015115"
   },
   "images": {
-    "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",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88b77851bd769ebeecc9eaa52168e8f995002dcac011e16dfb2c18a44c1c92bc",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad0db9fb2a14ce9610c6edf822d0f3439f578bc55916d5a2473c801cee9299b0",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:801571bf622c46e7f315058626ad1ed7153ce7831a15af1dfab82182632676c1",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:86c4a72a60ae74d80c28edb895cfabd44117651c748acd374125d0e93b2c0be3",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06af8f6b747e394abec436df73fd480c54a65693d059ed12bb03086bb0c84a58",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97fc9f85f802dd45328993be759c4cdd789501f6155148548fa59f82f96be546",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26433f4cfecf9326065b03d3380aa3d48b021f0a6ae7ec8ef415f33b149a191b",
     "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:eefb912d36e8cee39b1b4eb1205de9e5ae881f452e4acf22ac96e4246d6ad4a3"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4fd98cb615f652b39deac6dd8eac8b7afdcaf4028dd42aef9c7888cd937957a3"
   }
 }

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

scripts/auto-rebase/changelog.txt

@@ -1,18 +0,0 @@
-- 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/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-15-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-18-015115"