NO-ISSUE: rebase-release-4.21-4.21.0-0.nightly-2026-04-15-070853_amd64-2026-04-15_arm64-2026-04-16

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.21.0-0.nightly-arm64-2026-04-13-003017
+OCP_VERSION := 4.21.0-0.nightly-arm64-2026-04-16-010853

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.21.0-0.nightly-2026-04-09-054358
+OCP_VERSION := 4.21.0-0.nightly-2026-04-15-070853

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:e8daa4bd61c96768c266aa748b5b30fd2af3281371afb7277d74a5b6d20c18fa
+    digest: sha256:87d031a57582ff15a85c98dd0f11e15776d70266197f5b50e6e53a2da86f2783
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:97bc41e1bc4918d73f08f3dd80b23a0c3d399fd450df852bdfa250b679d2b476
+    digest: sha256:cf2413d37c37234c9a3c8c6f38c591caae64ca093acafa5a9dda6718e525cfcf

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:d48e7da76868a6c9dae5ecb6ea7e7c58ce3ea71c202995fb7125b6aec5dc7e9e
+    digest: sha256:cf4adb55454e5152c3eac932eee93271618c739493fd1b0075c7fc3463350647
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:33ab0262eae4278196667059950c32cebfcf68fad929b9393789bbefb4e7021b
+    digest: sha256:d93700c87c144958fb6cd80c6264764397c8eeb2cefe3884a5b79f741e394063

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-arm64-2026-04-13-003017"
+    "base": "4.21.0-0.nightly-arm64-2026-04-16-010853"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8daa4bd61c96768c266aa748b5b30fd2af3281371afb7277d74a5b6d20c18fa",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97bc41e1bc4918d73f08f3dd80b23a0c3d399fd450df852bdfa250b679d2b476"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87d031a57582ff15a85c98dd0f11e15776d70266197f5b50e6e53a2da86f2783",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf2413d37c37234c9a3c8c6f38c591caae64ca093acafa5a9dda6718e525cfcf"
   }
 }

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-2026-04-09-054358"
+    "base": "4.21.0-0.nightly-2026-04-15-070853"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d48e7da76868a6c9dae5ecb6ea7e7c58ce3ea71c202995fb7125b6aec5dc7e9e",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33ab0262eae4278196667059950c32cebfcf68fad929b9393789bbefb4e7021b"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf4adb55454e5152c3eac932eee93271618c739493fd1b0075c7fc3463350647",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d93700c87c144958fb6cd80c6264764397c8eeb2cefe3884a5b79f741e394063"
   }
 }

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:efe8c8ada5cca322b4acc721a86711d662946d789df34bc52163f49554751abe
+    digest: sha256:caa8e45a9b3cbe0540fc33e6dd521b36893c98a1c9d436280a5ee5a1fcef368a
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:2919a03d1712f168c321f1d9f94f6c24b479abcc0c17384a51a9d72b6b0f0ae2
+    digest: sha256:feb979326efdb69914daf2c683a339f17a048c728b97da1e3c7e42aab5cef5fa
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:8dc94f798798f68f6f67de5d7eee78baac10ca070e146244ca6b0db0f2000cee
+    digest: sha256:a5f3823b6edc4bb9e59bd082c14c33aec5cab28e176323a9f09bb441918ae5ff
 
 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:2919a03d1712f168c321f1d9f94f6c24b479abcc0c17384a51a9d72b6b0f0ae2
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:feb979326efdb69914daf2c683a339f17a048c728b97da1e3c7e42aab5cef5fa
      - 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:efe8c8ada5cca322b4acc721a86711d662946d789df34bc52163f49554751abe
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:caa8e45a9b3cbe0540fc33e6dd521b36893c98a1c9d436280a5ee5a1fcef368a
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

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:bba0c14ebbfb5f5e71204ee957fbfe8a2be15761e345569b6d0e3c8df8081999
+    digest: sha256:39b3bb03fca170e0bc2850a56fd52a58595e7d853499d549935de1787edfcbeb
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:7d896ace54972538caa1d44eb014f88a71b678baedbf97154ea023955f04f107
+    digest: sha256:8d34efba6316ff015a5cbd96618687ec013d9d7bbc6acbdc6b7755212ac2c5e9
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:d2d1c422773fc76478595cdbc8a255f94345c1187251dc5885c12f1c9462991b
+    digest: sha256:8ed83b8250364f976ff1e3615e5319db83151410018c789e76eed958e77e57c0
 
 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:7d896ace54972538caa1d44eb014f88a71b678baedbf97154ea023955f04f107
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d34efba6316ff015a5cbd96618687ec013d9d7bbc6acbdc6b7755212ac2c5e9
      - 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:bba0c14ebbfb5f5e71204ee957fbfe8a2be15761e345569b6d0e3c8df8081999
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39b3bb03fca170e0bc2850a56fd52a58595e7d853499d549935de1787edfcbeb
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-arm64-2026-04-13-003017"
+    "base": "4.21.0-0.nightly-arm64-2026-04-16-010853"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efe8c8ada5cca322b4acc721a86711d662946d789df34bc52163f49554751abe",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2919a03d1712f168c321f1d9f94f6c24b479abcc0c17384a51a9d72b6b0f0ae2",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dc94f798798f68f6f67de5d7eee78baac10ca070e146244ca6b0db0f2000cee"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:caa8e45a9b3cbe0540fc33e6dd521b36893c98a1c9d436280a5ee5a1fcef368a",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:feb979326efdb69914daf2c683a339f17a048c728b97da1e3c7e42aab5cef5fa",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5f3823b6edc4bb9e59bd082c14c33aec5cab28e176323a9f09bb441918ae5ff"
   }
 }

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-2026-04-09-054358"
+    "base": "4.21.0-0.nightly-2026-04-15-070853"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bba0c14ebbfb5f5e71204ee957fbfe8a2be15761e345569b6d0e3c8df8081999",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d896ace54972538caa1d44eb014f88a71b678baedbf97154ea023955f04f107",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2d1c422773fc76478595cdbc8a255f94345c1187251dc5885c12f1c9462991b"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39b3bb03fca170e0bc2850a56fd52a58595e7d853499d549935de1787edfcbeb",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d34efba6316ff015a5cbd96618687ec013d9d7bbc6acbdc6b7755212ac2c5e9",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ed83b8250364f976ff1e3615e5319db83151410018c789e76eed958e77e57c0"
   }
 }

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-arm64-2026-04-13-003017"
+    "base": "4.21.0-0.nightly-arm64-2026-04-16-010853"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5bf2aaa1ab8fb2d7d8b39c98ea580f13e21d4183e445d8934ddb672541b51ab",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65642520202fb9c13befc72cdd151e2fe524c0e99b666e202f07fc760ebb8dca",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ead66f9d5562e06159897a446a3c14fbf253a6f4780490c5c039fd3d647aac3",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dc94f798798f68f6f67de5d7eee78baac10ca070e146244ca6b0db0f2000cee",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6c31ba6dbfc830bd14832a4225d58c4606675b97dfff42e69e960da59c9e23c",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e25326d05ee05768632c19d2a3d2c93b353d0ad31b33f6a4c65debc6e0902bd",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c0504f1a2a655059d36d57c9ef2ae36c6bc732b93178e711a33d038402a80ff",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13ca84793073f8fb4daa03fe1f1939b81e1ec8e19d014febc699f5d09c6e3c3b",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8172f2b5106c5de4086300554123d7a391ceedfd941e499d4a52346094965ce1",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:858fcdb7d47b5055418fdf4df2be8ed2a28ba21033655b11d0ef566fdb519bc1",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5f3823b6edc4bb9e59bd082c14c33aec5cab28e176323a9f09bb441918ae5ff",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f49783c19df6f1d50e606dfc93712ba7650548a96a2b49a3218dd0956950a045",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51b2af82566153af1398888523cc726015af6c712f66bc65f8d9368fd37b7a39",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58988e21d13fa997f8d6cd8d8d0a44deb287b29ae0d21540c584ccc11199d147",
     "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:6f5a8e01daa0bac9d929e63dd6b8c10fca0e09b77fc2efd44e037c40475aada5"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af23e48cbed6b6bae6e0d98c1094202a8815b9b2be533a6b5fa89b2908d7496a"
   }
 }

assets/release/release-x86_64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-2026-04-09-054358"
+    "base": "4.21.0-0.nightly-2026-04-15-070853"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e02a4fd455db4c38b0e2c12de6733a992357b0601396c3b8ce7cdfbf29130cf7",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4f9d13a4ac7afd24212adb3cfbcf3e59ec9339cb74c68dd654e9867a48a9701",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6693f912b644992fe2e0d0c4178f0986ac5e0e9d3358930d82d0ce760d196d3a",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2d1c422773fc76478595cdbc8a255f94345c1187251dc5885c12f1c9462991b",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5097865ee182a239f39f81dd3c1d633916499303649144747d53c07f9d981461",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e106a2d184b3cd63e111363e302da700bb7786d709f7e41064af627f07b9dce",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d3f24bf2f6b768000c59e423a71435b90c2ee1392313d064ba4828c039f87d7",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e343d823d1bae702f0e7156e75a0fdcd551da2752731df144fec7b606543e1e",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0380726046c5c0aa952e870fddd0b10606027ef938f58677d07d5bdaf5a25b45",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c48a20fa7b03553b53b9f3f109b7818cfbcfd1d8d459f8989f64c2e5f7403bc2",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ed83b8250364f976ff1e3615e5319db83151410018c789e76eed958e77e57c0",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bec8399ce9758df1f6dea4174da47cb7a2b5f800f5987a9d516832c6b32a2aa",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f54cb834e5ff02577b2ddc622ea8045542fb7cbebad1f5593870dce98bca0b7",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b47c064c64cf878d311ec2d9753b314a355d43775f9f03f0bb3b1951236a44ca",
     "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:ce9ecc4a1478fcb8a1bfa541bc4ae5c7044d6889947681619b0440fc47aec79b"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:838c51fa548ee3a76270281cece4b9454fe71bbb10d1c0f40b810b11f3f3e34e"
   }
 }

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

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

scripts/auto-rebase/changelog.txt

@@ -0,0 +1,18 @@
+- api embedded-component b0658d22beea435e3a576165207416842cb2753b to e010a985205d75f9ff375051c6886afe0e4db220
+  - d2da55fd 2026-04-11T19:04:53Z make update
+  - 26fd6324 2026-04-11T19:04:53Z postpone the removal of the DeploymentConfig API
+
+- machine-config-operator embedded-component 5b0cdfd2162dcd354e4ff9f31286c5b5bff3f1dc to 042006de3967c7b187614eaaf88d197be4d4052f
+  - f43b49df 2026-04-07T12:27:13Z OCPBUGS-78154: Add GetDefaultLeaderElectionConfig for MCC
+  - aaa1b45d 2026-04-07T12:27:13Z OCPBUGS-78154: Log when using HA default leader election timings
+  - e6841a59 2026-04-07T12:27:13Z OCPBUGS-78154: Add useDefaultTimings flag to GetLeaderElectionConfig
+  - 79a9f6fe 2026-04-07T12:27:13Z Trim comment in GetLeaderElectionConfig.
+  - ff9c7f3d 2026-04-07T12:27:12Z OCPBUGS-78154: Use HA leader election defaults for MCO on SNO.
+  - 47cc7a3e 2026-04-03T22:28:34Z Move state logging to updateConfigAndState after SetDone
+
+- ovn-kubernetes image-amd64 0fd9d309727f67d7648d0fbfa29bdbbdfdf14ae3 to 020d072048b272c3ac77470b9a302cfd8ca0559e
+  - 581bfdef 2026-03-31T15:22:33+08:00 node: fix serviceUpdateNotNeeded nil pointer comparison
+
+- ovn-kubernetes image-arm64 0fd9d309727f67d7648d0fbfa29bdbbdfdf14ae3 to 020d072048b272c3ac77470b9a302cfd8ca0559e
+  - 581bfdef 2026-03-31T15:22:33+08:00 node: fix serviceUpdateNotNeeded nil pointer comparison
+

scripts/auto-rebase/commits.txt

@@ -1,4 +1,4 @@
-https://github.com/openshift/api embedded-component b0658d22beea435e3a576165207416842cb2753b
+https://github.com/openshift/api embedded-component e010a985205d75f9ff375051c6886afe0e4db220
 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 43ad01e88038be54792f16f0d692b96da1244404
 https://github.com/openshift/cluster-dns-operator embedded-component 41a53fed36e6e99c7c9ceb3a699c3547ee5d9bb9
 https://github.com/openshift/cluster-ingress-operator embedded-component c2ed7331f378e499b2092f04ca7aaf8b3a075274
@@ -12,7 +12,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 9098db0
 https://github.com/openshift/etcd embedded-component 806f690e1f140e0aea2eb05ef5f288b756b62895
 https://github.com/openshift/kubernetes embedded-component dfffacdf0ad6e9aa75664c7b3167dd2ddbfc17ba
 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component ce5ff17e9a81ce754567e6dd5053d13409c251e9
-https://github.com/openshift/machine-config-operator embedded-component 5b0cdfd2162dcd354e4ff9f31286c5b5bff3f1dc
+https://github.com/openshift/machine-config-operator embedded-component 042006de3967c7b187614eaaf88d197be4d4052f
 https://github.com/openshift/openshift-controller-manager embedded-component 438d52e79d691e016d66eabfe9a53c84229db40c
 https://github.com/openshift/operator-framework-olm embedded-component d7462e05f60c0ad13a2dce6ea516cbc624cae203
 https://github.com/openshift/route-controller-manager embedded-component 559b7122d1a0cad4ff475b496c2896b39eed8c08
@@ -22,14 +22,14 @@ https://github.com/openshift/coredns image-amd64 7486e9e4330c1e41d9a91e4673b7f27
 https://github.com/openshift/csi-external-snapshotter image-amd64 9098db0e434e0d986eeadd2ebe69119540a550d1
 https://github.com/openshift/router image-amd64 5949f713517b3cc158cd78b34d71d5a9084d2e1c
 https://github.com/openshift/kube-rbac-proxy image-amd64 cd636680e06a55395c26570dff0cb37277014388
-https://github.com/openshift/ovn-kubernetes image-amd64 0fd9d309727f67d7648d0fbfa29bdbbdfdf14ae3
+https://github.com/openshift/ovn-kubernetes image-amd64 020d072048b272c3ac77470b9a302cfd8ca0559e
 https://github.com/openshift/kubernetes image-amd64 dfffacdf0ad6e9aa75664c7b3167dd2ddbfc17ba
 https://github.com/openshift/service-ca-operator image-amd64 e9622ba18c86bf24aceab0c19fdcb87339c14f44
 https://github.com/openshift/oc image-arm64 9d9df34c46c9deba8c291a2a084de5724c0bd820
 https://github.com/openshift/coredns image-arm64 7486e9e4330c1e41d9a91e4673b7f2782efc112c
 https://github.com/openshift/csi-external-snapshotter image-arm64 9098db0e434e0d986eeadd2ebe69119540a550d1
 https://github.com/openshift/router image-arm64 5949f713517b3cc158cd78b34d71d5a9084d2e1c
 https://github.com/openshift/kube-rbac-proxy image-arm64 cd636680e06a55395c26570dff0cb37277014388
-https://github.com/openshift/ovn-kubernetes image-arm64 0fd9d309727f67d7648d0fbfa29bdbbdfdf14ae3
+https://github.com/openshift/ovn-kubernetes image-arm64 020d072048b272c3ac77470b9a302cfd8ca0559e
 https://github.com/openshift/kubernetes image-arm64 dfffacdf0ad6e9aa75664c7b3167dd2ddbfc17ba
 https://github.com/openshift/service-ca-operator image-arm64 e9622ba18c86bf24aceab0c19fdcb87339c14f44

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.21.0-0.nightly-2026-04-09-054358" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-04-13-003017"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2026-04-15-070853" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-04-16-010853"