From 2d4141a9ee8652056d594a04886e4804d0f8ebac Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 14 May 2026 04:15:23 +0000 Subject: [PATCH 1/5] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 842de58d51..f9f62b97b1 100755 --- 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.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" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2026-05-13-153530" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2026-05-14-014356" From 83399fd8049a2c94af7acd5ef9dd0c94252ec099 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 14 May 2026 04:15:23 +0000 Subject: [PATCH 2/5] update changelog --- scripts/auto-rebase/changelog.txt | 13 ++++++++----- scripts/auto-rebase/commits.txt | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 6f91dcc401..80d7dbb50b 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,7 +1,10 @@ -- cluster-ingress-operator embedded-component 0aca1e80822b4d5690add409f354f991fe9c042e to d14c13be1685e74b898b93a3fa7e03e9b75aa174 - - 91b9a5c 2026-05-06T13:40:16-03:00 [NE-2203] Add PrometheusRule for Gateway API gathering +- ovn-kubernetes image-amd64 8e88264292d35914db642556959e3193bb3ff05f to dbebe515c05e673ed62083e019e55aaf9bcebeab + - 80518a91 2026-05-04T09:30:51+02:00 fix(kubevirt): Use pod network subnet gateway IP for DHCP router option + - 3928ae07 2026-04-08T16:39:36+08:00 egressip: Skip bridge configuration for secondary network IPs + - 20b802cc 2026-03-31T13:15:36+02:00 CUDN: cleanup NADs in terminating namespaces without pods -- 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 +- ovn-kubernetes image-arm64 8e88264292d35914db642556959e3193bb3ff05f to dbebe515c05e673ed62083e019e55aaf9bcebeab + - 80518a91 2026-05-04T09:30:51+02:00 fix(kubevirt): Use pod network subnet gateway IP for DHCP router option + - 3928ae07 2026-04-08T16:39:36+08:00 egressip: Skip bridge configuration for secondary network IPs + - 20b802cc 2026-03-31T13:15:36+02:00 CUDN: cleanup NADs in terminating namespaces without pods diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 34da33a82d..cc5bb4ce78 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -22,7 +22,7 @@ https://github.com/openshift/coredns image-amd64 6f39336e6da9dc77b2db140a96773c4 https://github.com/openshift/csi-external-snapshotter image-amd64 42604822c25eb2aa0ecb017c24e328221b238eb9 https://github.com/openshift/router image-amd64 3c365cad8c7037e4aa64a694994ea393abc4d9a2 https://github.com/openshift/kube-rbac-proxy image-amd64 b9134351be37c43408334047d8eb85d0ac01fe4e -https://github.com/openshift/ovn-kubernetes image-amd64 8e88264292d35914db642556959e3193bb3ff05f +https://github.com/openshift/ovn-kubernetes image-amd64 dbebe515c05e673ed62083e019e55aaf9bcebeab https://github.com/openshift/kubernetes image-amd64 ba5f1e63e12c85b7d61d5de4a3bbde39e54d33b2 https://github.com/openshift/service-ca-operator image-amd64 37e0c31790b6a954214817974a56c9a699d0cf78 https://github.com/openshift/oc image-arm64 92a3a166a7f710a344a11bda0ad221e54583fccd @@ -30,6 +30,6 @@ https://github.com/openshift/coredns image-arm64 6f39336e6da9dc77b2db140a96773c4 https://github.com/openshift/csi-external-snapshotter image-arm64 42604822c25eb2aa0ecb017c24e328221b238eb9 https://github.com/openshift/router image-arm64 3c365cad8c7037e4aa64a694994ea393abc4d9a2 https://github.com/openshift/kube-rbac-proxy image-arm64 b9134351be37c43408334047d8eb85d0ac01fe4e -https://github.com/openshift/ovn-kubernetes image-arm64 8e88264292d35914db642556959e3193bb3ff05f +https://github.com/openshift/ovn-kubernetes image-arm64 dbebe515c05e673ed62083e019e55aaf9bcebeab https://github.com/openshift/kubernetes image-arm64 ba5f1e63e12c85b7d61d5de4a3bbde39e54d33b2 https://github.com/openshift/service-ca-operator image-arm64 37e0c31790b6a954214817974a56c9a699d0cf78 From 4fe3c2cb5e9c72071964ebc3e13f7a2fd7c95b51 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 14 May 2026 04:17:15 +0000 Subject: [PATCH 3/5] update component images --- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index 550f407e0c..e4da47d350 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/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:6b57f770273bb6c58d19ac5f83b32c2e87c58ad8577737f034868e1e103d4ba1" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8cde39271db551d567ccc44929a2f43508d13cb9bb2521b303857d74c7e9b99" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 134ca0b2d70ed9675b25cba51142e5d8d241d901 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 14 May 2026 04:17:16 +0000 Subject: [PATCH 4/5] update manifests --- .../components/multus/kustomization.aarch64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 6 +++--- .../components/multus/release-multus-x86_64.json | 2 +- .../kustomization.aarch64.yaml | 10 +++++----- .../release-olm-aarch64.json | 8 ++++---- .../release-olm-x86_64.json | 2 +- assets/release/release-aarch64.json | 16 ++++++++-------- assets/release/release-x86_64.json | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 90e2cd8fba..d5b63ec729 100644 --- a/assets/components/multus/kustomization.aarch64.yaml +++ b/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:213e976e1fefb757a9573b0bfa34a276bea3150ab2cef170c111db84ac25bd3a + digest: sha256:6258f7fe6cf0be4f28a2117681a4535080645eb33c42a43066894e64deec05e8 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:4d8af49dbb3f2c2d6852e15cb4c4344e07fa36c479b2a3a82d2e16d20e9e2d18 + digest: sha256:7eb04b6ce14bc540de6e9fad3e0655d07659d8a09209921aa409c815246da351 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index cb8da04fc5..31e85a2bbf 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2026-05-10-224333" + "base": "4.20.0-0.nightly-arm64-2026-05-14-014356" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:213e976e1fefb757a9573b0bfa34a276bea3150ab2cef170c111db84ac25bd3a", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d8af49dbb3f2c2d6852e15cb4c4344e07fa36c479b2a3a82d2e16d20e9e2d18" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6258f7fe6cf0be4f28a2117681a4535080645eb33c42a43066894e64deec05e8", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7eb04b6ce14bc540de6e9fad3e0655d07659d8a09209921aa409c815246da351" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 01739834ef..8e1b1458b0 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.20.0-0.nightly-2026-05-10-193148" + "base": "4.20.0-0.nightly-2026-05-13-153530" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c8e557c2faef786f63a9f7aa60c6813af618b643305e74eb53d6e7a9f862500e", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 5f8ff05d83..ab12e465ef 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a7a1a951f644e11f340a22b7a24c1194bd87821af3a57acc7bbabf2c6902957f + digest: sha256:d29e7ca6fb99d3eb06ab98de3609440a63e7ee5f28a2d2a598db267617e8c156 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7178f83a9fb7588a735305271bfb65556a7cc08e73212a484c71e9cfe1dfecb6 + digest: sha256:369c31b4058a662843edffe0b5fd76a87fab6ebd421d9a9b516146efb86d86e7 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:568b630e5db283b174d48d1bb4f192c35b3fefa15a7cd9e4d0c1784598384c8c + digest: sha256:f77679548f0cf47e11adffb9a1fdaa4a0447fd386add2e5ac9be0da833134e18 patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7178f83a9fb7588a735305271bfb65556a7cc08e73212a484c71e9cfe1dfecb6 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:369c31b4058a662843edffe0b5fd76a87fab6ebd421d9a9b516146efb86d86e7 - 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:a7a1a951f644e11f340a22b7a24c1194bd87821af3a57acc7bbabf2c6902957f + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d29e7ca6fb99d3eb06ab98de3609440a63e7ee5f28a2d2a598db267617e8c156 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 index 1733a7fca4..bedf7c84e2 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2026-05-10-224333" + "base": "4.20.0-0.nightly-arm64-2026-05-14-014356" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7a1a951f644e11f340a22b7a24c1194bd87821af3a57acc7bbabf2c6902957f", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7178f83a9fb7588a735305271bfb65556a7cc08e73212a484c71e9cfe1dfecb6", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:568b630e5db283b174d48d1bb4f192c35b3fefa15a7cd9e4d0c1784598384c8c" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d29e7ca6fb99d3eb06ab98de3609440a63e7ee5f28a2d2a598db267617e8c156", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:369c31b4058a662843edffe0b5fd76a87fab6ebd421d9a9b516146efb86d86e7", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f77679548f0cf47e11adffb9a1fdaa4a0447fd386add2e5ac9be0da833134e18" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index 3aeaa07226..516c89ad4b 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.20.0-0.nightly-2026-05-10-193148" + "base": "4.20.0-0.nightly-2026-05-13-153530" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9dd1223d518319ee14a4c9797b7aff964f6282eb8cd69eb2fdbcb9fe708ca191", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 9e991b5d62..1987bdbbbf 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2026-05-10-224333" + "base": "4.20.0-0.nightly-arm64-2026-05-14-014356" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16392ca103f471ab7e65383b67d8be87ec15e1cde496f9e06ed1052d3f9ef268", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5caa446df473a1a3a3fd78ecf43e25e4aad92c5a26e57f5251e8d06f81d00160", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b012f16e6082594724eafbfe6591dcf04d42e6edc53c022ff9f9844a183f129b", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc2aef81872324803f75601170e6d279d5b85ba3d9ee3852e5c2e84d6c1bc172", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4150d6ed577723f808003995f93aade83a0ed48660c9c7b78a06b331035c99b6", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:568b630e5db283b174d48d1bb4f192c35b3fefa15a7cd9e4d0c1784598384c8c", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83f34805320beb5e453cb99f3e487efa7675d58e5bc919be892787d6126eded9", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b57f770273bb6c58d19ac5f83b32c2e87c58ad8577737f034868e1e103d4ba1", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72bedd2f86920df60702f4f00282d53d679165acdfa7f1891c7e09616a08c8b0", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f77679548f0cf47e11adffb9a1fdaa4a0447fd386add2e5ac9be0da833134e18", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4de6102ade4949239ae29d6185f93d88eae7405e557a616153f3f17b24fa843", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8cde39271db551d567ccc44929a2f43508d13cb9bb2521b303857d74c7e9b99", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98b1079376f6e63ac388d02cb1665590755eabb9cbca9afc0121bd632a64fe6e", "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:9b82203fe934e900348b9cbc572c2e63c8958c7eda12a172baafe4189ad36437" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:410e866c1d0f66dd2f61692c06d4ac339eaf643987af5259e3653374f059aed4" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 0dd6118258..4ef44e6d03 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,13 +1,13 @@ { "release": { - "base": "4.20.0-0.nightly-2026-05-10-193148" + "base": "4.20.0-0.nightly-2026-05-13-153530" }, "images": { "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:6a7846f0e205ab61f41260c0d77346640c61fb5766093e7fdece5c76f9eae5ab", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99ce2b8064dcfe47830ceda1c7a0c2b56068e5f30d7267e5cb4823825620f10a", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c654705b4385f15d669a5c8c946e2531e6a2aabd19f198c5f6238e53e61c2ba6", "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:1636cee2ae6526fbc2e0f368b2553b7a29a136fc272fd774e38ebbe6d8fbd10a", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee", From 21a60cb7cb49a760d4ac13873f643fbc168a4d6b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 14 May 2026 04:17:17 +0000 Subject: [PATCH 5/5] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 46abd1e05e..fbbc142772 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.20.0-0.nightly-arm64-2026-05-10-224333 +OCP_VERSION := 4.20.0-0.nightly-arm64-2026-05-14-014356 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 0337068efc..976f86e09f 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.20.0-0.nightly-2026-05-10-193148 +OCP_VERSION := 4.20.0-0.nightly-2026-05-13-153530