Skip to content

Commit 6c10c2a

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-11-09-205422_amd64-2025-11-09_arm64-2025-11-10 (#5710)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent c4b9016 commit 6c10c2a

File tree

11 files changed

+15
-56
lines changed

11 files changed

+15
-56
lines changed

Makefile.version.aarch64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-11-06-020225
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-11-10-013203

Makefile.version.x86_64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.18.0-0.nightly-2025-11-05-142225
1+
OCP_VERSION := 4.18.0-0.nightly-2025-11-09-205422

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2025-11-06-020225"
3+
"base": "4.18.0-0.nightly-arm64-2025-11-10-013203"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ba3d01c2022693df433221b902460186b48aba7fa54ca4a8e059949328a7ab4",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-2025-11-05-142225"
3+
"base": "4.18.0-0.nightly-2025-11-09-205422"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:233ae3955f307cbf463e2d728006d5f9ca89af5dbcf97b1f8384e3178efcf5d0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2025-11-06-020225"
3+
"base": "4.18.0-0.nightly-arm64-2025-11-10-013203"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:917cbee0b3922e0dd5f6bfb9a9387e876dcbfb3212162bcce0bb1b9ae3f28955",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-2025-11-05-142225"
3+
"base": "4.18.0-0.nightly-2025-11-09-205422"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc72da7f7930eb09abf6f8dbe577bb537e3a2a59dc0e14a4319b42c0212218d1",

assets/release/release-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2025-11-06-020225"
3+
"base": "4.18.0-0.nightly-arm64-2025-11-10-013203"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba43bb5f750cd0ba12daaf6f21ad04f5717d9df4e70042a53da216a1c93223c9",

assets/release/release-x86_64.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-2025-11-05-142225"
3+
"base": "4.18.0-0.nightly-2025-11-09-205422"
44
},
55
"images": {
6-
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51a4c20765f54b6a6b5513f97cf54bb99631c2abe860949293456886a74f87fe",
6+
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2b4ebb753fd3066e92cc58c2504b4526d608d8be910bc2e6c9a28959b6a1b3f",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a3e2790bda8898df5e4e9cf1878103ac483ea1633819d76ea68976b0b2062b6",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ed4dc45b0e0d6229620e2ac6a53ecd180cad44a11daf9f0170d94b4acd35ded",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b03d2897e7cc0e8d0c306acb68ca3d9396d502882c14942faadfdb16bc40e17d",

scripts/auto-rebase/changelog.txt

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,7 @@
1-
- ovn-kubernetes image-amd64 7bb7a9e71737d4d2d7e00f693080df3fc4d735db to 2fe096327a6da6602c509d108ea0ed4a599a7eb3
2-
- ead50333 2025-10-30T17:45:33+00:00 Skip Pending pods in EgressIP status updates
3-
- 0e9f3c71 2025-10-09T14:57:44+00:00 Configure sec nic EIPv6 address with NODAD and maximum lifetime
4-
- a4776fb3 2025-10-08T12:49:44+01:00 [IC][EIP] OCPBUGS-42303: Fix race between SB DB and OVN-Controller
5-
- a7869b2c 2025-09-29T12:16:43+01:00 Node controller shutdown: do not ref gateway if not set
6-
- 50a94e1e 2025-09-29T12:16:01+01:00 ovn-controller: block GARP during startup
7-
- d65ec5c8 2025-09-29T12:15:22+01:00 Fix ovnkube-controller-with-node shutdown sequence
8-
- 5611e7be 2025-09-09T16:36:01+02:00 E2E localnet: send three pings instead of just one
9-
- 63bb48fd 2025-09-09T16:36:01+02:00 E2E localnet: localnet -> host network on VLAN with external router
10-
- 164d9f8f 2025-09-09T16:36:01+02:00 E2E localnet: host network -> localnet on VLAN with external router
11-
- 51f5fde0 2025-09-09T16:36:01+02:00 E2E localnet: default network->localnet on VLAN with external router
12-
- 2118ba6a 2025-09-09T16:36:01+02:00 E2E localnet: Fix requirement on number of schedulable nodes
13-
- 35faf853 2025-09-09T16:36:01+02:00 E2E localnet: make IP request for localnet pod extensible
14-
- 878d5409 2025-09-09T16:36:01+02:00 E2E localnet: specify that the localnet uses IPs from host subnet
15-
- c317be25 2025-09-09T16:36:01+02:00 E2E localnet: remove references to downstream bugs and stories
16-
- ca0c7135 2025-09-09T16:35:53+02:00 Configure existing multihoming CI lane as IC-enabled and shared gw
17-
- d50d5040 2025-09-09T16:32:51+02:00 E2E: add test host -> localnet with IP in host subnet
18-
- 1bf08b96 2025-09-09T16:32:51+02:00 E2E localnet: remove double import of ginkgo
19-
- a7476f22 2025-09-09T16:32:51+02:00 Openflow: lookup conntrack & table=1 when breth0 is next hop (IPv6)
20-
- 79ef2916 2025-09-09T16:32:51+02:00 Openflow: drop in_port from IPv6 dispatch OF rule at prio=50
21-
- d2127e40 2025-09-09T16:32:51+02:00 Openflow: lookup conntrack & table=1 only when breth0 is next hop
1+
- api embedded-component 98e18dae8c7a82a4075c65ca0d357c9bf31cfb7c to 28db677d74623ae691400619565d01b7a5818601
2+
- a0eb693 2025-11-03T12:56:45-05:00 Promote streaming list encoding to Default on Hypershift.
223

23-
- oc image-arm64 4fcb2d07875f05d881ac90af73723db0ae5b1d6e to 03e97ec079064c4f451b15510622caac316fb517
4+
- oc image-amd64 4fcb2d07875f05d881ac90af73723db0ae5b1d6e to 03e97ec079064c4f451b15510622caac316fb517
245
- 9d80b182 2025-11-03T17:56:30+00:00 Prefer ready and reachable control plane nodes
256
- bd8e87d3 2025-11-03T17:56:30+00:00 Filter out unreachable taints from tolerations
267

27-
- ovn-kubernetes image-arm64 7bb7a9e71737d4d2d7e00f693080df3fc4d735db to 2fe096327a6da6602c509d108ea0ed4a599a7eb3
28-
- ead50333 2025-10-30T17:45:33+00:00 Skip Pending pods in EgressIP status updates
29-
- 0e9f3c71 2025-10-09T14:57:44+00:00 Configure sec nic EIPv6 address with NODAD and maximum lifetime
30-
- a4776fb3 2025-10-08T12:49:44+01:00 [IC][EIP] OCPBUGS-42303: Fix race between SB DB and OVN-Controller
31-
- a7869b2c 2025-09-29T12:16:43+01:00 Node controller shutdown: do not ref gateway if not set
32-
- 50a94e1e 2025-09-29T12:16:01+01:00 ovn-controller: block GARP during startup
33-
- d65ec5c8 2025-09-29T12:15:22+01:00 Fix ovnkube-controller-with-node shutdown sequence
34-
- 5611e7be 2025-09-09T16:36:01+02:00 E2E localnet: send three pings instead of just one
35-
- 63bb48fd 2025-09-09T16:36:01+02:00 E2E localnet: localnet -> host network on VLAN with external router
36-
- 164d9f8f 2025-09-09T16:36:01+02:00 E2E localnet: host network -> localnet on VLAN with external router
37-
- 51f5fde0 2025-09-09T16:36:01+02:00 E2E localnet: default network->localnet on VLAN with external router
38-
- 2118ba6a 2025-09-09T16:36:01+02:00 E2E localnet: Fix requirement on number of schedulable nodes
39-
- 35faf853 2025-09-09T16:36:01+02:00 E2E localnet: make IP request for localnet pod extensible
40-
- 878d5409 2025-09-09T16:36:01+02:00 E2E localnet: specify that the localnet uses IPs from host subnet
41-
- c317be25 2025-09-09T16:36:01+02:00 E2E localnet: remove references to downstream bugs and stories
42-
- ca0c7135 2025-09-09T16:35:53+02:00 Configure existing multihoming CI lane as IC-enabled and shared gw
43-
- d50d5040 2025-09-09T16:32:51+02:00 E2E: add test host -> localnet with IP in host subnet
44-
- 1bf08b96 2025-09-09T16:32:51+02:00 E2E localnet: remove double import of ginkgo
45-
- a7476f22 2025-09-09T16:32:51+02:00 Openflow: lookup conntrack & table=1 when breth0 is next hop (IPv6)
46-
- 79ef2916 2025-09-09T16:32:51+02:00 Openflow: drop in_port from IPv6 dispatch OF rule at prio=50
47-
- d2127e40 2025-09-09T16:32:51+02:00 Openflow: lookup conntrack & table=1 only when breth0 is next hop
48-

scripts/auto-rebase/commits.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
https://github.com/openshift/api embedded-component 98e18dae8c7a82a4075c65ca0d357c9bf31cfb7c
1+
https://github.com/openshift/api embedded-component 28db677d74623ae691400619565d01b7a5818601
22
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 6fe700087e8be6513285edd18f461790fecc65c3
33
https://github.com/openshift/cluster-dns-operator embedded-component 7cafd0c7dca2edb154b8444602b600b5901afeba
44
https://github.com/openshift/cluster-ingress-operator embedded-component d967a73c5f7da76783ee1af093f21817e7681e1d
@@ -17,7 +17,7 @@ https://github.com/openshift/openshift-controller-manager embedded-component 8ee
1717
https://github.com/openshift/operator-framework-olm embedded-component f295d320d98493b70a105fa22ca79fab546a2e52
1818
https://github.com/openshift/route-controller-manager embedded-component ce6ffa24dac3a5f49f70818e1159e40eaf27a6a3
1919
https://github.com/openshift/service-ca-operator embedded-component 30efb529a5b7db5d6f352f6ac0470d8385268539
20-
https://github.com/openshift/oc image-amd64 4fcb2d07875f05d881ac90af73723db0ae5b1d6e
20+
https://github.com/openshift/oc image-amd64 03e97ec079064c4f451b15510622caac316fb517
2121
https://github.com/openshift/coredns image-amd64 8ca7f02b8becb40f7a9919243000e2620d7036d4
2222
https://github.com/openshift/csi-external-snapshotter image-amd64 8ddbcd381bf5317c1d1a93db3b5760681a33cb27
2323
https://github.com/openshift/router image-amd64 d8058949aaf91dcdea050c58e6a34ef5f6670c67

0 commit comments

Comments
 (0)