Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-05-20-013817_amd64-2026-05-20_arm64-2026-05-21 #6709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
microshift-rebase-script wants to merge 5 commits into from
+61 −55
Closed

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-05-20-013817_amd64-2026-05-20_arm64-2026-05-21 #6709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84f1d67
update last_rebase.sh
May 21, 2026
b9e098d
update changelog
May 21, 2026
910430d
update component images
May 21, 2026
56b4649
update manifests
May 21, 2026
f188193
update buildfiles
May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.18.0-0.nightly-arm64-2026-05-17-225756
OCP_VERSION := 4.18.0-0.nightly-arm64-2026-05-21-004611
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.18.0-0.nightly-2026-05-13-164455
OCP_VERSION := 4.18.0-0.nightly-2026-05-20-013817
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4357c8b38a201794e0323a71f51388382de57dfb0f2b4ebfec38a5f07439f3a6
digest: sha256:e342c9d9acf841987b48461a69010612737177bde6ad22a3711bf7b9a52935a7
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:730cef562bfcb13ac64cba50a1efec6930899afde77892f9e2d3bdcfb247d7de
digest: sha256:d4f53aa744fae92415d49edb49b6cb584f2b322a848ac5d92d16dbfc2d092b8e
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6b894da705e0ba383443504701b4110ecdf5098581601f7393f60446c0fedf2b
digest: sha256:11d2178a13cc39b3a70fb7e6738cfdfc09d74f0f3c4d553bec50783aa52c7a77
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:7ebd22fb19b406a24444d4427575931fdbdd620c272adbe7fb074d61180424a9
digest: sha256:553705d56037e5eb1116aaef295742a96b5c9b9f07038b365fd0cb09a0358275
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2026-05-17-225756"
"base": "4.18.0-0.nightly-arm64-2026-05-21-004611"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4357c8b38a201794e0323a71f51388382de57dfb0f2b4ebfec38a5f07439f3a6",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:730cef562bfcb13ac64cba50a1efec6930899afde77892f9e2d3bdcfb247d7de"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e342c9d9acf841987b48461a69010612737177bde6ad22a3711bf7b9a52935a7",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4f53aa744fae92415d49edb49b6cb584f2b322a848ac5d92d16dbfc2d092b8e"
}
}
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.18.0-0.nightly-2026-05-13-164455"
"base": "4.18.0-0.nightly-2026-05-20-013817"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b894da705e0ba383443504701b4110ecdf5098581601f7393f60446c0fedf2b",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ebd22fb19b406a24444d4427575931fdbdd620c272adbe7fb074d61180424a9"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11d2178a13cc39b3a70fb7e6738cfdfc09d74f0f3c4d553bec50783aa52c7a77",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:553705d56037e5eb1116aaef295742a96b5c9b9f07038b365fd0cb09a0358275"
}
}
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:06db4a00a844be98658d15989203ca300e8ea2d7633d70c9c9e3e58e504702c4
digest: sha256:2488de7fefb46c84910dedf65532895d60f40635b29a7aabfb88f92fd8c53d02
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e64cb59c7e0bed255f669da28950112d3c395aa0fd3423052fd13528974c00d1
digest: sha256:10f84a4722f18e78a4157e457d79848ca2c0fd9a73e7a26d3bbfd5244f0a7913
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:20601366d0aca42fd8cc3fd5fa6584e633217fad38d7c3c46ecd844548af4569
digest: sha256:bb1b10ca1561f2b94d7133d4d727d44f8d08fa2e3bdba8070cb594705b0e0398

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:e64cb59c7e0bed255f669da28950112d3c395aa0fd3423052fd13528974c00d1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10f84a4722f18e78a4157e457d79848ca2c0fd9a73e7a26d3bbfd5244f0a7913
- 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:06db4a00a844be98658d15989203ca300e8ea2d7633d70c9c9e3e58e504702c4
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2488de7fefb46c84910dedf65532895d60f40635b29a7aabfb88f92fd8c53d02
target:
kind: Deployment
labelSelector: app=catalog-operator
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:66f6a9bbdd24e7f6d1653cfdbcad28cc243793002308e1113095fbd1dc9f33b3
digest: sha256:da53a373e535ed7185af47ce1067f50eff530b13019b60e75d4d983ab953f83a
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4c6bbba6992696aef1231e34a3652b244bca77d4d8d368d57cbc052ef16bfcaa
digest: sha256:cb754fbebcd44ca15005ee863eee5af6188256d83f79fd35f353899127828f2a
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:236b716621a88efd57cdf6f704340fb2faf4583651ecbda524261e0b5a9b39cf
digest: sha256:b7dbda7eb711b1d1824f91dc9b623e80134c42cf17bfecb7523ceeb96e9b4204

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:4c6bbba6992696aef1231e34a3652b244bca77d4d8d368d57cbc052ef16bfcaa
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb754fbebcd44ca15005ee863eee5af6188256d83f79fd35f353899127828f2a
- 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:66f6a9bbdd24e7f6d1653cfdbcad28cc243793002308e1113095fbd1dc9f33b3
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da53a373e535ed7185af47ce1067f50eff530b13019b60e75d4d983ab953f83a
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2026-05-17-225756"
"base": "4.18.0-0.nightly-arm64-2026-05-21-004611"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06db4a00a844be98658d15989203ca300e8ea2d7633d70c9c9e3e58e504702c4",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e64cb59c7e0bed255f669da28950112d3c395aa0fd3423052fd13528974c00d1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20601366d0aca42fd8cc3fd5fa6584e633217fad38d7c3c46ecd844548af4569"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2488de7fefb46c84910dedf65532895d60f40635b29a7aabfb88f92fd8c53d02",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10f84a4722f18e78a4157e457d79848ca2c0fd9a73e7a26d3bbfd5244f0a7913",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb1b10ca1561f2b94d7133d4d727d44f8d08fa2e3bdba8070cb594705b0e0398"
}
}
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.18.0-0.nightly-2026-05-13-164455"
"base": "4.18.0-0.nightly-2026-05-20-013817"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66f6a9bbdd24e7f6d1653cfdbcad28cc243793002308e1113095fbd1dc9f33b3",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c6bbba6992696aef1231e34a3652b244bca77d4d8d368d57cbc052ef16bfcaa",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:236b716621a88efd57cdf6f704340fb2faf4583651ecbda524261e0b5a9b39cf"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da53a373e535ed7185af47ce1067f50eff530b13019b60e75d4d983ab953f83a",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb754fbebcd44ca15005ee863eee5af6188256d83f79fd35f353899127828f2a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7dbda7eb711b1d1824f91dc9b623e80134c42cf17bfecb7523ceeb96e9b4204"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2026-05-17-225756"
"base": "4.18.0-0.nightly-arm64-2026-05-21-004611"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6992d78c7a8ede741caeafbe4b1ae8962ba878762f50855608e33809f42c213",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1590c08790675b62452f104f57ffa5880caac7ec562ad5f3b77fe2910faa0e70",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25777eed2540ac34d0b945a41c852511f65260653478e6a91cd67a89e4d976b2",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20601366d0aca42fd8cc3fd5fa6584e633217fad38d7c3c46ecd844548af4569",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61e9c065d72dd82e450b00ecce81c6f7a6ffd228d0351dab0509ea573dc893a8",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f6231e8ab6c5f3064bd2463fad528d26c85a7c4b7bc22f29ab97326cb5cd72b",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7d2a0b0769061df75adbdd2e719d9053fbd6db21fc042663935a45074b9a2dd",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af59c3d023f80a0d554bba0c5ff0dd8679722066a29f31f63a63270790aed878",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2bc4f4209b95a92d216020a359779b4f8b8a06a97e3fa6ad92d8ab10e020ba51",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:687452aa301ee8b66823986756207fcc817d804e74aafcb2901ca17563015364",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb1b10ca1561f2b94d7133d4d727d44f8d08fa2e3bdba8070cb594705b0e0398",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:283cbfd1c9321da88ec440ed6dd79253ada79c70902b2b62b21ca15db1f228bb",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bdbcbac5878b4e0c6e27d6fc2e6b349bcf08e7c2470b805dabad729e9a0eb4a",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ca9c66d79a6fe3521209c7158ecc79d74f6dfd8738dfe46233c4bc5107b85d7",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72f5255ffde22c9520f5312c29348a10ce2dc18da2d0915ad43b934b1f977a2a"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e179c5ffc420cab669aac832c58d65b336c84bc43c7d7cb946ae5b77cbb16586"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.18.0-0.nightly-2026-05-13-164455"
"base": "4.18.0-0.nightly-2026-05-20-013817"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fae8d6f288aa9b4dc6812d572c1d2acc6cd4d85b17bf9d73fb723b2104f8708f",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc59b3d720c2e8240087d7bae474b618ad810d163afd2072bb9c95cf83dd71cc",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2804591b8bc70f5d4c8f94d722de4fb9d01de1bcf329c05b4a31577b6741bd4d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:236b716621a88efd57cdf6f704340fb2faf4583651ecbda524261e0b5a9b39cf",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c4f9f69f15fb925664055c24a38b143eb4a7ad92864b4b2193a74d735c6f975",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ebcd6745e15ac3776016a78fc9882f5ca05f5f6afbb5edd97edd70377f667d1",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:187f9b0a3870f29230341708af35ab9befe217fb7d5c9c0aa663a365175b3f83",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eca0978d58d0df4b41f0bcdba043a9c2ad3ef1ee282e5b493928ed025693d82a",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15aafddd5d952d6e10d889ffbbc546f0e7ca3a7796b9a4e4c3cea0c1709b7b7c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5906521b71d07755670b6bf1725f1dac92c3ad27f011def8273bf42edc0b0fda",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7dbda7eb711b1d1824f91dc9b623e80134c42cf17bfecb7523ceeb96e9b4204",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8264513143d6c56686200b6a92131535a46ea2aaf7c86f2521f4900cd045a1ac",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04d8b44d37435e26a49aac6a76579c6cd6267014be710a7c19b8db4cace63ab6",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7ca19acab14ed72591fa0ff24ccc5f2cf17eebff94be5f66f418761e538bb91",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8657b9eca6df33d652c05c4ca594236aa42277ed5d83b7757748be262f2ffd1f"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c04c820c9c06c18af70cb41763614c4d8db594368057415833e6ceabbf5be1e"
}
}
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_amd64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ plugin_dirs = [
# 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:8ebcd6745e15ac3776016a78fc9882f5ca05f5f6afbb5edd97edd70377f667d1"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04d8b44d37435e26a49aac6a76579c6cd6267014be710a7c19b8db4cace63ab6"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ plugin_dirs = [
# 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:1f6231e8ab6c5f3064bd2463fad528d26c85a7c4b7bc22f29ab97326cb5cd72b"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bdbcbac5878b4e0c6e27d6fc2e6b349bcf08e7c2470b805dabad729e9a0eb4a"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
8 changes: 7 additions & 1 deletion scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
- ovn-kubernetes image-arm64 2609f4261a2310228b926965b11b7b616c0bb418 to 0276ba1ace90f6182fc13894fc17150262974be6
- cluster-network-operator embedded-component c836773db43651d272644c12d47a8d70a118c1d7 to bd2181ac81fe75f9ad611d99ec0a932624a63eaa
- d1612a3 2026-05-12T11:28:31+00:00 OCPBUGS-74401: Remove duplicated openssl parameter

- machine-config-operator embedded-component 7d117b24b0419a2297f4f087d52b12a72cc89c88 to 1dd69a37a6a840654e2558c9cc26b8fa762ab312
- a0fab6f4 2026-05-18T10:58:53+00:00 OCPBUGS-84218: Fix units rollback if update failure

- ovn-kubernetes image-amd64 2609f4261a2310228b926965b11b7b616c0bb418 to 0276ba1ace90f6182fc13894fc17150262974be6
- 80518a91 2026-05-04T09:30:51+02:00 fix(kubevirt): Use pod network subnet gateway IP for DHCP router option
- ef7ea17c 2026-04-23T15:54:57+01:00 virt: fix SyncVirtualMachines deleting UDN DHCP options during startup
- 8df3403f 2026-04-15T09:39:23+00:00 Backport: Fix NAD Controller syncAll for networkID upgrade from node->NAD
Expand Down
6 changes: 3 additions & 3 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 7ec6093
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component e9bc90906c726823f154c78d3e568c98ff77b6a5
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 6347fc8179b2a04d51c99432ae612bf4df595dc0
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 4e99db62cea1d2ca48765230c6f5663d1f2c2702
https://github.com/openshift/cluster-network-operator embedded-component c836773db43651d272644c12d47a8d70a118c1d7
https://github.com/openshift/cluster-network-operator embedded-component bd2181ac81fe75f9ad611d99ec0a932624a63eaa
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component f1711cf30f683ec0eaa187cd5168caae9e8c1254
https://github.com/openshift/cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9
https://github.com/openshift/csi-external-snapshotter embedded-component 8ddbcd381bf5317c1d1a93db3b5760681a33cb27
https://github.com/openshift/etcd embedded-component b5a4f8d079fbb04200251d5a6bc7c56f79d9d1e3
https://github.com/openshift/kubernetes embedded-component 91c24081f468e7636c824f4f5a2eb68660b81012
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 815b43b7f7288da76dd314553e113aefe2a5897d
https://github.com/openshift/machine-config-operator embedded-component 7d117b24b0419a2297f4f087d52b12a72cc89c88
https://github.com/openshift/machine-config-operator embedded-component 1dd69a37a6a840654e2558c9cc26b8fa762ab312
https://github.com/openshift/openshift-controller-manager embedded-component 8ee744063ed12b249f1a2b89e9af4f53b2f1daf7
https://github.com/openshift/operator-framework-olm embedded-component 4680ec1ee00e1af34e29ec598ac983bf74d2e523
https://github.com/openshift/route-controller-manager embedded-component ce6ffa24dac3a5f49f70818e1159e40eaf27a6a3
Expand All @@ -22,7 +22,7 @@ https://github.com/openshift/coredns image-amd64 8ca7f02b8becb40f7a9919243000e26
https://github.com/openshift/csi-external-snapshotter image-amd64 8ddbcd381bf5317c1d1a93db3b5760681a33cb27
https://github.com/openshift/router image-amd64 ccd9551702a89cac27e38ebb63801ddb6823d101
https://github.com/openshift/kube-rbac-proxy image-amd64 5a14ea9d338b2582c7c2a8f89f351a0c30f56371
https://github.com/openshift/ovn-kubernetes image-amd64 2609f4261a2310228b926965b11b7b616c0bb418
https://github.com/openshift/ovn-kubernetes image-amd64 0276ba1ace90f6182fc13894fc17150262974be6
https://github.com/openshift/kubernetes image-amd64 91c24081f468e7636c824f4f5a2eb68660b81012
https://github.com/openshift/service-ca-operator image-amd64 30efb529a5b7db5d6f352f6ac0470d8385268539
https://github.com/openshift/oc image-arm64 6febe61977471b066f08d513424b226b82ee518f
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-05-13-164455" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-05-17-225756"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-05-20-013817" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-05-21-004611"