Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.18.0-0.nightly-arm64-2026-04-30-032853
OCP_VERSION := 4.18.0-0.nightly-arm64-2026-05-11-021543
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.18.0-0.nightly-2026-04-29-141346
OCP_VERSION := 4.18.0-0.nightly-2026-05-10-201542
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2026-04-30-032853"
"base": "4.18.0-0.nightly-arm64-2026-05-11-021543"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5239f41c7575c285e1f64ed9effcdd1933978aa8b490d172d634490a5aed366f",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2026-04-29-141346"
"base": "4.18.0-0.nightly-2026-05-10-201542"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b894da705e0ba383443504701b4110ecdf5098581601f7393f60446c0fedf2b",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2026-04-30-032853"
"base": "4.18.0-0.nightly-arm64-2026-05-11-021543"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc143030e7105e1dbc7f2eba5106d6c8e0a54e40b1382a34b1983df48291109d",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2026-04-29-141346"
"base": "4.18.0-0.nightly-2026-05-10-201542"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66f6a9bbdd24e7f6d1653cfdbcad28cc243793002308e1113095fbd1dc9f33b3",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2026-04-30-032853"
"base": "4.18.0-0.nightly-arm64-2026-05-11-021543"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1836005d98266af037e2bc0eddb2a65628d8ecaa87b1d671b848b0c1a5bc40c",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"release": {
"base": "4.18.0-0.nightly-2026-04-29-141346"
"base": "4.18.0-0.nightly-2026-05-10-201542"
},
"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:01f8ce1cd744ddbdce9315ae967a6a3857a7d067aad1401f1623275066def6e4",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f86d9b4cb9cefb2668331ffac8d59465569e8f0962dad02ff011bb38155e8080",
"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",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
Expand Down
18 changes: 2 additions & 16 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
- cluster-network-operator embedded-component 99c785cb3e5577067ff785ebad6344dc9b9bbc18 to b40233991fa420432a44fba510d59fc24d3aafd7
- 46c5557 2026-04-27T21:32:00+02:00 fix(hypershift): use net.JoinHostPort for URL construction

- ovn-kubernetes image-amd64 6fe7a1f403388a7540aea240e8203c28b40728af to 2609f4261a2310228b926965b11b7b616c0bb418
- ab20d0a2 2026-03-31T16:41:42+08:00 node: fix serviceUpdateNotNeeded nil pointer comparison
- 225848ac 2026-03-25T18:26:11+05:30 EgressFirewall: Use exponential backoff to refresh IP addresses for DNS names
- 679442da 2026-02-27T14:28:44+05:30 Add a e2e test for NodePort service
- 46ce09a9 2026-02-27T14:28:22+05:30 Clear stale conntrack UDP entries for nodePorts
- 8336fa03 2026-02-23T09:49:28+01:00 Minimize ACLs by combining ipBlocks into single ACL

- ovn-kubernetes image-arm64 6fe7a1f403388a7540aea240e8203c28b40728af to 2609f4261a2310228b926965b11b7b616c0bb418
- ab20d0a2 2026-03-31T16:41:42+08:00 node: fix serviceUpdateNotNeeded nil pointer comparison
- 225848ac 2026-03-25T18:26:11+05:30 EgressFirewall: Use exponential backoff to refresh IP addresses for DNS names
- 679442da 2026-02-27T14:28:44+05:30 Add a e2e test for NodePort service
- 46ce09a9 2026-02-27T14:28:22+05:30 Clear stale conntrack UDP entries for nodePorts
- 8336fa03 2026-02-23T09:49:28+01:00 Minimize ACLs by combining ipBlocks into single ACL
- cluster-network-operator embedded-component b40233991fa420432a44fba510d59fc24d3aafd7 to c836773db43651d272644c12d47a8d70a118c1d7
- a1c7c77 2026-05-01T15:45:29+00:00 wait for patch port to apply drop garp flows

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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 b40233991fa420432a44fba510d59fc24d3aafd7
https://github.com/openshift/cluster-network-operator embedded-component c836773db43651d272644c12d47a8d70a118c1d7
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
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
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-04-29-141346" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-30-032853"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-05-10-201542" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-05-11-021543"