NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2026-05-10-193148_amd64-2026-05-10_arm64-2026-05-10

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.20.0-0.nightly-arm64-2026-05-09-164333
+OCP_VERSION := 4.20.0-0.nightly-arm64-2026-05-10-224333

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.20.0-0.nightly-2026-05-04-230007
+OCP_VERSION := 4.20.0-0.nightly-2026-05-10-193148

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:86ff61069252216629a896befefc597a4782796ee60206d03f493128f4256fac
+    digest: sha256:c8e557c2faef786f63a9f7aa60c6813af618b643305e74eb53d6e7a9f862500e
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:d085d5bac139e0ec720776a22bf51ff836c54ce6f9b947ee51218ea17ea9f5f8
+    digest: sha256:1e10432104c6d4fcfb1bf0a8da81d5543c8116cc84eb361d80e03191cde4642c

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

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2026-05-09-164333"
+    "base": "4.20.0-0.nightly-arm64-2026-05-10-224333"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:213e976e1fefb757a9573b0bfa34a276bea3150ab2cef170c111db84ac25bd3a",

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-2026-05-04-230007"
+    "base": "4.20.0-0.nightly-2026-05-10-193148"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:86ff61069252216629a896befefc597a4782796ee60206d03f493128f4256fac",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d085d5bac139e0ec720776a22bf51ff836c54ce6f9b947ee51218ea17ea9f5f8"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c8e557c2faef786f63a9f7aa60c6813af618b643305e74eb53d6e7a9f862500e",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e10432104c6d4fcfb1bf0a8da81d5543c8116cc84eb361d80e03191cde4642c"
   }
 }

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:39bc8ea8c67bec49de42eeec8ea71f9cb12a95e5e130a13c970fc96037872c29
+    digest: sha256:9dd1223d518319ee14a4c9797b7aff964f6282eb8cd69eb2fdbcb9fe708ca191
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:1d1a73431bfc30a10653b758eb456f5f8d4b4659d7d0fc26a39ad21c265f0494
+    digest: sha256:7ebe9bee0fa1f00e2bc7321ce7c3074efc8b91ee405daa020f4677fb0b2562b8
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:54d33b9efe0867328de774ed049be40275c0bf8fea65d4ac5b319e99e2374b0f
+    digest: sha256:6a7846f0e205ab61f41260c0d77346640c61fb5766093e7fdece5c76f9eae5ab
 
 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:1d1a73431bfc30a10653b758eb456f5f8d4b4659d7d0fc26a39ad21c265f0494
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ebe9bee0fa1f00e2bc7321ce7c3074efc8b91ee405daa020f4677fb0b2562b8
      - 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:39bc8ea8c67bec49de42eeec8ea71f9cb12a95e5e130a13c970fc96037872c29
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9dd1223d518319ee14a4c9797b7aff964f6282eb8cd69eb2fdbcb9fe708ca191
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

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

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2026-05-09-164333"
+    "base": "4.20.0-0.nightly-arm64-2026-05-10-224333"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7a1a951f644e11f340a22b7a24c1194bd87821af3a57acc7bbabf2c6902957f",

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-2026-05-04-230007"
+    "base": "4.20.0-0.nightly-2026-05-10-193148"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39bc8ea8c67bec49de42eeec8ea71f9cb12a95e5e130a13c970fc96037872c29",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d1a73431bfc30a10653b758eb456f5f8d4b4659d7d0fc26a39ad21c265f0494",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54d33b9efe0867328de774ed049be40275c0bf8fea65d4ac5b319e99e2374b0f"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9dd1223d518319ee14a4c9797b7aff964f6282eb8cd69eb2fdbcb9fe708ca191",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ebe9bee0fa1f00e2bc7321ce7c3074efc8b91ee405daa020f4677fb0b2562b8",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a7846f0e205ab61f41260c0d77346640c61fb5766093e7fdece5c76f9eae5ab"
   }
 }

assets/release/release-aarch64.json

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2026-05-09-164333"
+    "base": "4.20.0-0.nightly-arm64-2026-05-10-224333"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16392ca103f471ab7e65383b67d8be87ec15e1cde496f9e06ed1052d3f9ef268",

assets/release/release-x86_64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-2026-05-04-230007"
+    "base": "4.20.0-0.nightly-2026-05-10-193148"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:212961da81a346bfd96e95d8b11d481b068c214a0c20285a223403c622d1269f",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b711efb591eddc8d55bd32eadec299b63287b8041093b227d2d31cccc6d8a5a2",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11e39b66734f91492a86f211c291effcdfc2d40af71f1210c7d313030e327433",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc5bd255ff684119b651b112a23bfc48e610947061c63071091ad47550d7dadb",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70127236b7114c252014706f3647ca605fe6a6a0918afd8cbbb84672ef91ec7a",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54d33b9efe0867328de774ed049be40275c0bf8fea65d4ac5b319e99e2374b0f",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d97eab6973cbbcd603215f721e0f4111474fe33a3bcd5d420e2212979e1886ab",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a7846f0e205ab61f41260c0d77346640c61fb5766093e7fdece5c76f9eae5ab",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99ce2b8064dcfe47830ceda1c7a0c2b56068e5f30d7267e5cb4823825620f10a",
     "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bec1464677067fa247923c22627dd1b78a61d4b52b7184b755f749f6671ac747",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c40cec7ea0593d6caf267f2ab5549dc6070110fd8663a897b55ca87d5dfadd8",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1636cee2ae6526fbc2e0f368b2553b7a29a136fc272fd774e38ebbe6d8fbd10a",
     "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:9d0d44230fd7348facab7daf601dae69cff078ee340d760c9b62ba1718540fec"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e99a10e94f071092a18e3528af5eb3ab05a81fa1a3310c0e3a0ad5b9b5109d8d"
   }
 }

scripts/auto-rebase/changelog.txt

@@ -1,51 +1,7 @@
-- cluster-kube-apiserver-operator embedded-component b85497d2202b30ead006502767b96419c3a1c87e to 43b3cbe3654586ebbff06b942658c6f14aa01796
-  - df58a09 2026-04-21T14:03:25+02:00 configobservation/auth: allow setting the oauthMetadata when auth type is None
+- cluster-ingress-operator embedded-component 0aca1e80822b4d5690add409f354f991fe9c042e to d14c13be1685e74b898b93a3fa7e03e9b75aa174
+  - 91b9a5c 2026-05-06T13:40:16-03:00 [NE-2203] Add PrometheusRule for Gateway API gathering
 
-- kubernetes embedded-component 2d92ab7b3cb444e41ec6d5edf64dfe3b22d93142 to ba5f1e63e12c85b7d61d5de4a3bbde39e54d33b2
-  - 7c767e956 2026-04-20T17:02:56-07:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
-  - fd1020170 2026-04-20T15:53:37-07:00 UPSTREAM: <drop>: manually resolve conflicts
-  - 9efa99e5a 2026-04-15T18:09:55Z Release commit for Kubernetes v1.33.11
-  - 28b2a45d0 2026-04-13T14:30:03-04:00 Update github.com/moby/spdystream from v0.5.0 to v0.5.1
-  - 412848339 2026-04-13T15:04:41Z update go.opentelemetry.io/otel to v1.41.0
-  - ea46dad4d 2026-04-09T22:00:49+02:00 Bump images and versions to go 1.25.9 and distroless iptables
-  - a4cc2ce4c 2026-04-01T17:20:17-04:00 Bump to go 1.25
-  - 8489a1d82 2026-04-01T16:56:59-04:00 bump golang.org/x/vuln/cmd/govulncheck to v1.1.4
-  - a4f94edc3 2026-03-24T02:47:04-07:00 Fix flaking RunTestDelayedWatchDelivery
-  - ce78d2290 2026-03-18T18:40:20Z Update CHANGELOG/CHANGELOG-1.33.md for v1.33.10
-  - b5f44064e 2026-03-17T08:15:03-04:00 pkg/proxy/nftables: fix kube-proxy crash with newer nftables versions
-  - cdf6c7548 2026-03-17T08:15:03-04:00 Update knftables to v0.0.21
-  - 604645806 2026-03-12T13:10:38-07:00 Fix RepairIPAddress controller startup failure when namespace informer is not yet synced
-
-- machine-config-operator embedded-component c19e5dc0e5e2835f89befc42e4f8b89d869fc90c to 1421b8d8b061eccd0fe9248e5a854f163759c09d
-  - 8f6cf05a 2026-05-01T15:25:13-04:00 improve JSON unmarshalling for secret decoding
-
-- kubernetes image-amd64 2d92ab7b3cb444e41ec6d5edf64dfe3b22d93142 to ba5f1e63e12c85b7d61d5de4a3bbde39e54d33b2
-  - 7c767e956 2026-04-20T17:02:56-07:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
-  - fd1020170 2026-04-20T15:53:37-07:00 UPSTREAM: <drop>: manually resolve conflicts
-  - 9efa99e5a 2026-04-15T18:09:55Z Release commit for Kubernetes v1.33.11
-  - 28b2a45d0 2026-04-13T14:30:03-04:00 Update github.com/moby/spdystream from v0.5.0 to v0.5.1
-  - 412848339 2026-04-13T15:04:41Z update go.opentelemetry.io/otel to v1.41.0
-  - ea46dad4d 2026-04-09T22:00:49+02:00 Bump images and versions to go 1.25.9 and distroless iptables
-  - a4cc2ce4c 2026-04-01T17:20:17-04:00 Bump to go 1.25
-  - 8489a1d82 2026-04-01T16:56:59-04:00 bump golang.org/x/vuln/cmd/govulncheck to v1.1.4
-  - a4f94edc3 2026-03-24T02:47:04-07:00 Fix flaking RunTestDelayedWatchDelivery
-  - ce78d2290 2026-03-18T18:40:20Z Update CHANGELOG/CHANGELOG-1.33.md for v1.33.10
-  - b5f44064e 2026-03-17T08:15:03-04:00 pkg/proxy/nftables: fix kube-proxy crash with newer nftables versions
-  - cdf6c7548 2026-03-17T08:15:03-04:00 Update knftables to v0.0.21
-  - 604645806 2026-03-12T13:10:38-07:00 Fix RepairIPAddress controller startup failure when namespace informer is not yet synced
-
-- kubernetes image-arm64 2d92ab7b3cb444e41ec6d5edf64dfe3b22d93142 to ba5f1e63e12c85b7d61d5de4a3bbde39e54d33b2
-  - 7c767e956 2026-04-20T17:02:56-07:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
-  - fd1020170 2026-04-20T15:53:37-07:00 UPSTREAM: <drop>: manually resolve conflicts
-  - 9efa99e5a 2026-04-15T18:09:55Z Release commit for Kubernetes v1.33.11
-  - 28b2a45d0 2026-04-13T14:30:03-04:00 Update github.com/moby/spdystream from v0.5.0 to v0.5.1
-  - 412848339 2026-04-13T15:04:41Z update go.opentelemetry.io/otel to v1.41.0
-  - ea46dad4d 2026-04-09T22:00:49+02:00 Bump images and versions to go 1.25.9 and distroless iptables
-  - a4cc2ce4c 2026-04-01T17:20:17-04:00 Bump to go 1.25
-  - 8489a1d82 2026-04-01T16:56:59-04:00 bump golang.org/x/vuln/cmd/govulncheck to v1.1.4
-  - a4f94edc3 2026-03-24T02:47:04-07:00 Fix flaking RunTestDelayedWatchDelivery
-  - ce78d2290 2026-03-18T18:40:20Z Update CHANGELOG/CHANGELOG-1.33.md for v1.33.10
-  - b5f44064e 2026-03-17T08:15:03-04:00 pkg/proxy/nftables: fix kube-proxy crash with newer nftables versions
-  - cdf6c7548 2026-03-17T08:15:03-04:00 Update knftables to v0.0.21
-  - 604645806 2026-03-12T13:10:38-07:00 Fix RepairIPAddress controller startup failure when namespace informer is not yet synced
+- machine-config-operator embedded-component 1421b8d8b061eccd0fe9248e5a854f163759c09d to 2d25c90c0dc60344479c5bcae395a5baa6ef9c77
+  - 13f907d7 2026-05-06T03:30:58Z OCPBUGS-83859: Fix encapsulated IGN version
+  - c675aef1 2026-05-04T17:57:07Z chore: update AMIs
 

scripts/auto-rebase/commits.txt

@@ -1,7 +1,7 @@
 https://github.com/openshift/api embedded-component 50517c6f4bfdbf9fc2cb291fd97cce150a3237ca
 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component a99bd8ffb9aa596fa8d6932d5d93e0613c5d367f
 https://github.com/openshift/cluster-dns-operator embedded-component 82578923164636746e0d74d594ab32d83a660c0b
-https://github.com/openshift/cluster-ingress-operator embedded-component 0aca1e80822b4d5690add409f354f991fe9c042e
+https://github.com/openshift/cluster-ingress-operator embedded-component d14c13be1685e74b898b93a3fa7e03e9b75aa174
 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 43b3cbe3654586ebbff06b942658c6f14aa01796
 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 438c9dba80ddadeabe9efe4a654297a7b550b2b8
 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 84eb8c5a73a730d6d08794e51da9c20013ca4304
@@ -12,7 +12,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 4260482
 https://github.com/openshift/etcd embedded-component 05bca97760b1cfa1bcef11c0b1f1a5c4dab19709
 https://github.com/openshift/kubernetes embedded-component ba5f1e63e12c85b7d61d5de4a3bbde39e54d33b2
 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 0f8a4eb84ace9b746cf25d51d80dacf34ca5f953
-https://github.com/openshift/machine-config-operator embedded-component 1421b8d8b061eccd0fe9248e5a854f163759c09d
+https://github.com/openshift/machine-config-operator embedded-component 2d25c90c0dc60344479c5bcae395a5baa6ef9c77
 https://github.com/openshift/openshift-controller-manager embedded-component d9e543dd31e981f279c447e4f92f0dac3f665f9e
 https://github.com/openshift/operator-framework-olm embedded-component 72a01f66530d38330e9442d2238ab30aa90dcb39
 https://github.com/openshift/route-controller-manager embedded-component ec18e9be0ebcbd7cb262d31f50148f81d0edd48f

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.20.0-0.nightly-2026-05-04-230007" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2026-05-09-164333"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2026-05-10-193148" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2026-05-10-224333"