Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-01-07-214105_amd64-2026-01-07_arm64-2026-01-07 #6034

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

Merged
openshift-merge-bot merged 4 commits into from
Jan 8, 2026
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-01-07-214105_amd64-2026-01-07_arm64-2026-01-07 #6034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a846717
update last_rebase.sh
Jan 8, 2026
03b1211
update changelog
Jan 8, 2026
2500fc5
update manifests
Jan 8, 2026
03542cd
update buildfiles
Jan 8, 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-2025-12-24-214245
OCP_VERSION := 4.18.0-0.nightly-arm64-2026-01-07-231558
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-01-02-192446
OCP_VERSION := 4.18.0-0.nightly-2026-01-07-214105
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2025-12-24-214245"
"base": "4.18.0-0.nightly-arm64-2026-01-07-231558"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf4c75f710db1a26be77cd4b8919764bb6997f6243fede69fe8310ff7fa568d9",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2026-01-02-192446"
"base": "4.18.0-0.nightly-2026-01-07-214105"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e0420d92c6151f4f9b64ba218105b3477ee30deb04234ff7f34717831c34403d",
Expand Down
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2025-12-24-214245"
"base": "4.18.0-0.nightly-arm64-2026-01-07-231558"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34b399d922ac9f156bc55948b7460af6ecd53cd57e31f35273104ac687e813d4",
Expand Down
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2026-01-02-192446"
"base": "4.18.0-0.nightly-2026-01-07-214105"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3acbfb9709b51a708893a5b08b5dd64464d6c9c1f7950e30caadc6301c71f1dc",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2025-12-24-214245"
"base": "4.18.0-0.nightly-arm64-2026-01-07-231558"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6364a6411ca336aa5a2877d0d8fb9c1b747028902d2b90a235662ecf1300595",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:058b16a7b35c6832fabbf5211a1e93cebe857858e6c1edd301052d7a0c46717c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13e67d9352b1a1b8e0f9eebca0db1722209eb72d07ccc9241d0abbdb3bb89c76",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6653237e916b6d1e79d45b0c550d374a4e1f4ecb60ef09eb3d52fa607c36c732",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff991f018d0b6c319fb93497ed6299c40ca41e3c389eb49edfa3d4e4a7e03992",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e370221a5e4a18f60aa3c9438bc66627b0735ca17b5c1119ff9accc0d26af36",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:92b31786ac4169fbcc2359470639469f185f8296993ee8fb4483ba0c39b06469",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:baf2a0021b89c9b7409dcfc85d5ee0a6db6b783f99486bc88490d925a5f4ebe8",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"release": {
"base": "4.18.0-0.nightly-2026-01-02-192446"
"base": "4.18.0-0.nightly-2026-01-07-214105"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:82bf6c7cace9d746b49f970d7024f5a332ff20d18d35b2acac6d131ced023181",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7432171ce2b51b92ccf73c1e411e439b2b615f05a9c4eca4c289c3f91bb757fe",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72b04a33634dffc69245d23ceee3f816c6dbe7f14fe62487e826ff9fb03fa32b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41640b950f7b4576d1af406eddaa83ecc8968284b59041b065ab57aa82ebca46",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9e37542a26a16fe120e1b62fcd9c3fdb410feef232998f287e9177e22daa7fa",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:681b7e341940c08c2ca18dd15e500dce77881e9eb28af5e7c59b3c0a2fc3fa46",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be92cd19b4bcde0e5e912e4081ef25913528488273ca9ece533e0b4839e3e17f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9ea7bac01352c83212f0d153f321cba07727b3688a26a2bcf88ae207be8d4b9",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
Expand Down
48 changes: 48 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
- api embedded-component ed475190f7c93836318deb53086eb5b66bbe5dbc to 319dc2e492034aab82d4820dd8d8e9a84e31b459
- 897f807 2026-01-05T15:41:59+01:00 Fix make verify issues
- 8ff6251 2026-01-05T15:41:59+01:00 OCPBUGS-61858: Add HTTPKeepAliveTimeout to IngressController API

- cluster-ingress-operator embedded-component 80d446496b742284fb2fcfeb1fccde797cde6978 to 7ec6093b5e31b50a57eab3653dca09b1bd174fee
- c126df7 2026-01-05T17:11:13+01:00 OCPBUGS-61858: Implement e2e test for HTTPKeepAliveTimeout
- 28d54d9 2026-01-05T17:11:13+01:00 OCPBUGS-61858: Implement HTTPKeepAliveTimeout tuning option
- c7b2b77 2026-01-05T17:11:13+01:00 OCPBUGS-61858: Bump openshift/api to get HTTPKeepAliveTimeout tuning option

- machine-config-operator embedded-component a51e963bdc11e1b49404d111c94e6257a637059f to 9e588a1318823dac89a6bc1790ca584d1100dd57
- 081cb346 2026-01-05T22:32:03+00:00 Remove log exposing kubeconfig

- ovn-kubernetes image-amd64 803675917e89283aa7c07a46f300b1177a75690a to 45c973d9aeb907885878f92e3e16a142427e8477
- 49b03c0a 2025-11-25T13:03:44+01:00 Status manager: add startup cleanup for ANP/BANP
- c8eb63c1 2025-11-25T13:03:44+01:00 Status manager: add startup cleanup for stale managedFields
- 9c71d2fd 2025-11-25T13:03:44+01:00 Status manager: fix cleanup for EgressQoS and NetworkQoS
- 89ee2dd3 2025-11-25T13:03:44+01:00 Status manager: remove managedFields upon node deletion
- 46b708be 2025-11-13T13:49:08+02:00 utils,multinet: GetPodNADToNetworkMappingWithActiveNetwork CUDN support
- 7db91fc6 2025-11-13T13:39:35+02:00 e2e,kubevirt: Test MAC conflict detection
- 2d2a34ad 2025-11-13T13:39:35+02:00 e2e,net-seg default-net annot: Test MAC conflict detection
- a737f871 2025-11-13T13:39:35+02:00 clustermanager,allocator: Init MAC manager with pod MACs
- deb4d173 2025-11-13T13:39:35+02:00 clustermanager,allocator: Init MAC manager with infra MACs
- 720cacd7 2025-11-13T13:39:35+02:00 clustermanager,allocator: Release reserved MAC on pod deletion
- b4328b9e 2025-11-13T13:39:35+02:00 clustermanager,allocator: Emit pod event reflecting MAC conflicts
- 545d2773 2025-11-13T13:39:35+02:00 clustermanager,allocator: Detect MAC conflict on pod allocation
- f5255b23 2025-11-13T13:39:35+02:00 pod-allocator: Introduce MAC addresses manager
- 4b476e3c 2025-11-13T13:39:35+02:00 test/e2e/preconfigured_layer2: Add duplicate IP Validation pod tests
- a1686d33 2025-11-13T13:39:35+02:00 test/e2e/kubevirt: Add duplicate IP Validation test
- 58406f22 2025-11-13T13:39:35+02:00 pod_annotations: Block duplicate IP on new pods

- ovn-kubernetes image-arm64 803675917e89283aa7c07a46f300b1177a75690a to 45c973d9aeb907885878f92e3e16a142427e8477
- 49b03c0a 2025-11-25T13:03:44+01:00 Status manager: add startup cleanup for ANP/BANP
- c8eb63c1 2025-11-25T13:03:44+01:00 Status manager: add startup cleanup for stale managedFields
- 9c71d2fd 2025-11-25T13:03:44+01:00 Status manager: fix cleanup for EgressQoS and NetworkQoS
- 89ee2dd3 2025-11-25T13:03:44+01:00 Status manager: remove managedFields upon node deletion
- 46b708be 2025-11-13T13:49:08+02:00 utils,multinet: GetPodNADToNetworkMappingWithActiveNetwork CUDN support
- 7db91fc6 2025-11-13T13:39:35+02:00 e2e,kubevirt: Test MAC conflict detection
- 2d2a34ad 2025-11-13T13:39:35+02:00 e2e,net-seg default-net annot: Test MAC conflict detection
- a737f871 2025-11-13T13:39:35+02:00 clustermanager,allocator: Init MAC manager with pod MACs
- deb4d173 2025-11-13T13:39:35+02:00 clustermanager,allocator: Init MAC manager with infra MACs
- 720cacd7 2025-11-13T13:39:35+02:00 clustermanager,allocator: Release reserved MAC on pod deletion
- b4328b9e 2025-11-13T13:39:35+02:00 clustermanager,allocator: Emit pod event reflecting MAC conflicts
- 545d2773 2025-11-13T13:39:35+02:00 clustermanager,allocator: Detect MAC conflict on pod allocation
- f5255b23 2025-11-13T13:39:35+02:00 pod-allocator: Introduce MAC addresses manager
- 4b476e3c 2025-11-13T13:39:35+02:00 test/e2e/preconfigured_layer2: Add duplicate IP Validation pod tests
- a1686d33 2025-11-13T13:39:35+02:00 test/e2e/kubevirt: Add duplicate IP Validation test
- 58406f22 2025-11-13T13:39:35+02:00 pod_annotations: Block duplicate IP on new pods

10 changes: 5 additions & 5 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
https://github.com/openshift/api embedded-component ed475190f7c93836318deb53086eb5b66bbe5dbc
https://github.com/openshift/api embedded-component 319dc2e492034aab82d4820dd8d8e9a84e31b459
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 6fe700087e8be6513285edd18f461790fecc65c3
https://github.com/openshift/cluster-dns-operator embedded-component 7cafd0c7dca2edb154b8444602b600b5901afeba
https://github.com/openshift/cluster-ingress-operator embedded-component 80d446496b742284fb2fcfeb1fccde797cde6978
https://github.com/openshift/cluster-ingress-operator embedded-component 7ec6093b5e31b50a57eab3653dca09b1bd174fee
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 416eeae4e60970f5ab52a833774c7bb60644e6af
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 9a9a437f2342dc9bba7844298b955d5f9bbc76bb
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 971ffbb8239a8c49f1254e5fdaab854eed224f31
Expand All @@ -12,7 +12,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 8ddbcd3
https://github.com/openshift/etcd embedded-component b5a4f8d079fbb04200251d5a6bc7c56f79d9d1e3
https://github.com/openshift/kubernetes embedded-component 436b373e7dec669750c65a1ef832665e56b733b7
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component c0f1886ab08d8c2ed84c9ea648b3f65cd82dc5f5
https://github.com/openshift/machine-config-operator embedded-component a51e963bdc11e1b49404d111c94e6257a637059f
https://github.com/openshift/machine-config-operator embedded-component 9e588a1318823dac89a6bc1790ca584d1100dd57
https://github.com/openshift/openshift-controller-manager embedded-component 8ee744063ed12b249f1a2b89e9af4f53b2f1daf7
https://github.com/openshift/operator-framework-olm embedded-component 357bb130e6149ef87afbaadd6677ab1f71876d53
https://github.com/openshift/route-controller-manager embedded-component ce6ffa24dac3a5f49f70818e1159e40eaf27a6a3
Expand All @@ -22,14 +22,14 @@ 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 803675917e89283aa7c07a46f300b1177a75690a
https://github.com/openshift/ovn-kubernetes image-amd64 45c973d9aeb907885878f92e3e16a142427e8477
https://github.com/openshift/kubernetes image-amd64 436b373e7dec669750c65a1ef832665e56b733b7
https://github.com/openshift/service-ca-operator image-amd64 30efb529a5b7db5d6f352f6ac0470d8385268539
https://github.com/openshift/oc image-arm64 3a48fc2998a051a77a97cc3393b5d189c22635e0
https://github.com/openshift/coredns image-arm64 8ca7f02b8becb40f7a9919243000e2620d7036d4
https://github.com/openshift/csi-external-snapshotter image-arm64 8ddbcd381bf5317c1d1a93db3b5760681a33cb27
https://github.com/openshift/router image-arm64 ccd9551702a89cac27e38ebb63801ddb6823d101
https://github.com/openshift/kube-rbac-proxy image-arm64 5a14ea9d338b2582c7c2a8f89f351a0c30f56371
https://github.com/openshift/ovn-kubernetes image-arm64 803675917e89283aa7c07a46f300b1177a75690a
https://github.com/openshift/ovn-kubernetes image-arm64 45c973d9aeb907885878f92e3e16a142427e8477
https://github.com/openshift/kubernetes image-arm64 436b373e7dec669750c65a1ef832665e56b733b7
https://github.com/openshift/service-ca-operator image-arm64 30efb529a5b7db5d6f352f6ac0470d8385268539
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-01-02-192446" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-12-24-214245"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-01-07-214105" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-01-07-231558"