Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-01-27-102545_amd64-2025-01-27_arm64-2025-01-27 #4477

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
merged 4 commits into from
Jan 28, 2025
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-01-27-102545_amd64-2025-01-27_arm64-2025-01-27 #4477

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
84b9499
update last_rebase.sh
Jan 28, 2025
a9c0c36
update changelog
Jan 28, 2025
c309f7c
update manifests
Jan 28, 2025
34aeb8a
update buildfiles
Jan 28, 2025
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-01-26-025745
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-01-27-222549
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-2025-01-25-163410
OCP_VERSION := 4.18.0-0.nightly-2025-01-27-102545
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-01-26-025745"
"base": "4.18.0-0.nightly-arm64-2025-01-27-222549"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cff936abaaf77fcae90d16563afaffa5fabed681ff6a84cd0d07cd753f23483e",
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-2025-01-25-163410"
"base": "4.18.0-0.nightly-2025-01-27-102545"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:098bab222712ecdbf85e748e0b676814b0e08debfdbc15127b057b63c136fcab",
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-01-26-025745"
"base": "4.18.0-0.nightly-arm64-2025-01-27-222549"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77b44abd29994f5e934a1158c909eaa4a944e10c12c580fca1ff1e18b13f0427",
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-2025-01-25-163410"
"base": "4.18.0-0.nightly-2025-01-27-102545"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47b0670fa1051335fd2d2c9e8361e4ed77c7760c33a2180b136f7c7f59863ec2",
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-01-26-025745"
"base": "4.18.0-0.nightly-arm64-2025-01-27-222549"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c66f20a4028a99307e49e0c84d0417a6b8e1ed0d46449333994c0b38fa309931",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:419f8e79712482517a331012d338610011aee0d4f8fba5f14608b9e42e63b651",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d81e311b5eb2db9e5c6ee2ddc7c76f05f6623f36127df7484a8fa8606e1767c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:258c0b8d31226677694d37fa634ffd12ad62089d1fca00e55fca1d0d7f4dfb5c",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66751648a47e04e3add6eb80518966435bbf807b616514a37824889b0b130a74",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6f0fd6e9e2b2c83c1dea1dd1c827a3e2315381875f479f3d0d6cf52d6ca4f2c",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e65271f4ebec47d27d680602c9c854578c1e055851561cf27b8d64113ebddc9d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8a9f8d1e9eb9ce227bb761ca924c1723e7204ac1c96b4a4abcb7ba9e25ecdda",
"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-2025-01-25-163410"
"base": "4.18.0-0.nightly-2025-01-27-102545"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b353d327072af12fb862132f03a255774a331f8e7a8bfc17254df8849d91f36",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:487c0a8d5200bcdce484ab1169229d8fcb8e91a934be45afff7819c4f7612f57",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f141e6405f40db17d319d22fecc3162b27434fa837b3ce1f834db301b0b3615",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:242b3d66438c42745f4ef318bdeaf3d793426f12962a42ea83e18d06c08aaf09",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:564a149c9cc243a1de1d9220389ce775fdf5bc16975a7511056693d6d3b03ede",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56ceadae9a793b39b6e3c2a20ab150e018a2af6a35805e33bad85fcc06a5e7d0",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8caff6ef59cd4a97b12a222b2b4b591a4e8d4e641a75f5481c136dbe9960a41f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:898cae57123c5006d397b24af21b0f24a0c42c9b0be5ee8251e1824711f65820",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
Expand Down
106 changes: 84 additions & 22 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,86 @@
- cluster-network-operator embedded-component 911d8ef7e9e6d70bb68aeaae0849b206d9b487b5 to 3dcc293ae93174f099054b75a4d0cde5ca039f9b
- ff1666a 2025-01-23T18:43:38+01:00 Fix user-defined-networks-namespace-label binding
- 4619935 2025-01-23T18:41:35+01:00 Disable adding/removing the UDN namespace label
- 3820221 2025-01-16T06:08:34+00:00 Add host isolation mounts to ovnkube-node
- ovn-kubernetes image-amd64 34fa86e259b122aa98b35349f5080ec842fba50c to f0ab7904387fc2588c5110f1ff9d7187d5ce3e11
- a6f73bbb 2025-01-14T14:54:58+00:00 OVN DNC: ignore secondary network transit switches when cleaning up a CDN "node" switches
- e5d2c4cc 2025-01-14T11:26:38+02:00 e2e,net-seg,udn: Wait for condition to populate
- 61860a9f 2025-01-10T09:46:27-08:00 can not update gateway IP if nodePort is disabled
- 95d30a1d 2025-01-09T18:16:39-05:00 Ensure network manager is shutdown in tests
- b0386ac9 2025-01-09T14:57:05-08:00 Use kubernetes-traffic-flow-tests new repo
- 7f7b7a90 2025-01-09T14:04:28-08:00 helm: improve helm/basic-deploy.sh for new OVN Kubernetes org
- 042391dc 2025-01-09T17:18:37+01:00 Migrate EgressService rules from iptables to nftables
- faa798bc 2025-01-09T17:18:37+01:00 Improve egress service repair unit test
- 0c83337f 2025-01-09T10:18:49+01:00 Fix WatchNamespaces for UDNs
- 064f0d23 2025-01-08T15:43:35+01:00 Fix e2e test UDN CIDRs for IPv6 only cluster
- b35ff473 2025-01-08T15:43:14+01:00 Add ipv6 network-segmentation test lane
- 465b128b 2025-01-08T11:49:32+00:00 RouteImport: change re-subscription timer to ticker
- 26563378 2025-01-08T11:49:32+00:00 Import learnt BGP routes into OVN
- 29a420fb 2025-01-07T16:34:15+01:00 go-controller: fix typo in test script
- 97d9b67a 2025-01-07T15:00:06+02:00 UDN,CUDN conditions: Rename NetworkReady condition NetworkCreated
- 054efe76 2025-01-07T09:45:15+01:00 Services controller: Handle startup failures
- f3f438d9 2025-01-07T09:45:15+01:00 Fix a potential nil dereference
- 48a7d60a 2025-01-07T09:10:08+01:00 Fix subnet check for assigned pod IPs
- 97d0504f 2025-01-06T11:32:38-08:00 Fix issues in DPU host initialization
- 4e344ecd 2025-01-06T11:08:38-08:00 Add nftables binaries to ubuntu arm image
- b7a05314 2025-01-06T18:26:23+02:00 test, networksegmentation: Use random names for CUDN objects
- 30f1e6c1 2025-01-06T18:25:57+02:00 test,networksegmentation: Wait for CUDN object be gone
- f401ff55 2025-01-06T14:21:56+02:00 test,networksegmentation: Wait for CUDN status populate in primary network exist test
- e2b9f0a2 2024-12-26T13:44:14+00:00 do not assign an ID to network still used by a controller being stopped
- c3ab26dc 2024-12-26T13:44:13+00:00 Inform network aware controllers of network changes
- 81449ddd 2024-12-26T13:44:13+00:00 Fix egress IP tests
- a13297ee 2024-12-26T13:44:13+00:00 Fix network controllers constructors not using the same NetInfo for their subcontrollers
- 7c03f3f4 2024-12-26T13:44:13+00:00 Fix deadlock when comparing mutableNetInfo with self
- 4c0eb713 2024-12-26T13:44:13+00:00 Fix receiver names of nad controller
- 3d1ec7ad 2024-12-26T13:44:13+00:00 Reconcile RouteAdvertisements from cluster manager
- 90136b5f 2024-12-26T13:44:13+00:00 Add FRRConfiguration to factory
- 6c544704 2024-12-26T13:44:13+00:00 UDN gw: use network name as VRF name for cluster UDNs
- 6dcb602d 2024-12-26T13:44:13+00:00 VRF manager: manage VRFs with any name
- adb1fc8b 2024-12-26T13:44:13+00:00 Assign network ID from network manager
- 6c366bb4 2024-12-20T15:27:05-08:00 Do not update EncapIP if it is configured
- 33f957d4 2024-12-20T12:21:06+00:00 EIP E2Es: create const for httpd image name and add image tag
- 1aedb9ae 2024-12-20T12:21:06+00:00 EIP/ESVC: remove code to remove legacy no reroutes for nodes
- 6c4e0212 2024-12-20T12:21:06+00:00 Add UDN Layer2 support for an Egress IP assigned to the primary interface
- 06c26bc4 2024-12-19T17:55:18+00:00 Add missing enum validation for RouteAdvertisements
- 1290c908 2024-12-18T20:23:44+01:00 udn host isolation: fix initialSync.
- 8da4dc9a 2024-12-16T13:32:21+02:00 managedTap: Use the new bridge type name

- kubernetes embedded-component 11e2f11d1e0ce2fadc11906f2bcbba1ddbb2da2f to 7665f4b7049dc15c6559d91d8db45cef318e4c0f
- b8e6734ec 2025-01-22T14:11:53+01:00 UPSTREAM: <carry>: Disable VolumeGroupSnapshot tests
- 9198c4f76 2025-01-21T10:16:25+01:00 UPSTREAM: 128972: Add crd from external snapshotter
- 3986b3aa1 2025-01-21T10:16:25+01:00 UPSTREAM: 126326: Add end-to-end tests for Volume Group Snapshot

- machine-config-operator embedded-component da8e8b51fda20798d8690901f01b80eb010f34db to c3c615e27f62881947ba84a2d42454df86cfad48
- b38f5974 2025-01-23T04:05:24+00:00 Conditionally run openshift-gcp-routes.service.yaml
- 3f2dda7d 2025-01-23T04:05:24+00:00 Set /etc/NetworkManager/conf.d/dns-servers.conf for GCP

- kubernetes image-amd64 11e2f11d1e0ce2fadc11906f2bcbba1ddbb2da2f to 7665f4b7049dc15c6559d91d8db45cef318e4c0f
- b8e6734ec 2025-01-22T14:11:53+01:00 UPSTREAM: <carry>: Disable VolumeGroupSnapshot tests
- 9198c4f76 2025-01-21T10:16:25+01:00 UPSTREAM: 128972: Add crd from external snapshotter
- 3986b3aa1 2025-01-21T10:16:25+01:00 UPSTREAM: 126326: Add end-to-end tests for Volume Group Snapshot

- kubernetes image-arm64 11e2f11d1e0ce2fadc11906f2bcbba1ddbb2da2f to 7665f4b7049dc15c6559d91d8db45cef318e4c0f
- b8e6734ec 2025-01-22T14:11:53+01:00 UPSTREAM: <carry>: Disable VolumeGroupSnapshot tests
- 9198c4f76 2025-01-21T10:16:25+01:00 UPSTREAM: 128972: Add crd from external snapshotter
- 3986b3aa1 2025-01-21T10:16:25+01:00 UPSTREAM: 126326: Add end-to-end tests for Volume Group Snapshot
- ovn-kubernetes image-arm64 34fa86e259b122aa98b35349f5080ec842fba50c to f0ab7904387fc2588c5110f1ff9d7187d5ce3e11
- a6f73bbb 2025-01-14T14:54:58+00:00 OVN DNC: ignore secondary network transit switches when cleaning up a CDN "node" switches
- e5d2c4cc 2025-01-14T11:26:38+02:00 e2e,net-seg,udn: Wait for condition to populate
- 61860a9f 2025-01-10T09:46:27-08:00 can not update gateway IP if nodePort is disabled
- 95d30a1d 2025-01-09T18:16:39-05:00 Ensure network manager is shutdown in tests
- b0386ac9 2025-01-09T14:57:05-08:00 Use kubernetes-traffic-flow-tests new repo
- 7f7b7a90 2025-01-09T14:04:28-08:00 helm: improve helm/basic-deploy.sh for new OVN Kubernetes org
- 042391dc 2025-01-09T17:18:37+01:00 Migrate EgressService rules from iptables to nftables
- faa798bc 2025-01-09T17:18:37+01:00 Improve egress service repair unit test
- 0c83337f 2025-01-09T10:18:49+01:00 Fix WatchNamespaces for UDNs
- 064f0d23 2025-01-08T15:43:35+01:00 Fix e2e test UDN CIDRs for IPv6 only cluster
- b35ff473 2025-01-08T15:43:14+01:00 Add ipv6 network-segmentation test lane
- 465b128b 2025-01-08T11:49:32+00:00 RouteImport: change re-subscription timer to ticker
- 26563378 2025-01-08T11:49:32+00:00 Import learnt BGP routes into OVN
- 29a420fb 2025-01-07T16:34:15+01:00 go-controller: fix typo in test script
- 97d9b67a 2025-01-07T15:00:06+02:00 UDN,CUDN conditions: Rename NetworkReady condition NetworkCreated
- 054efe76 2025-01-07T09:45:15+01:00 Services controller: Handle startup failures
- f3f438d9 2025-01-07T09:45:15+01:00 Fix a potential nil dereference
- 48a7d60a 2025-01-07T09:10:08+01:00 Fix subnet check for assigned pod IPs
- 97d0504f 2025-01-06T11:32:38-08:00 Fix issues in DPU host initialization
- 4e344ecd 2025-01-06T11:08:38-08:00 Add nftables binaries to ubuntu arm image
- b7a05314 2025-01-06T18:26:23+02:00 test, networksegmentation: Use random names for CUDN objects
- 30f1e6c1 2025-01-06T18:25:57+02:00 test,networksegmentation: Wait for CUDN object be gone
- f401ff55 2025-01-06T14:21:56+02:00 test,networksegmentation: Wait for CUDN status populate in primary network exist test
- e2b9f0a2 2024-12-26T13:44:14+00:00 do not assign an ID to network still used by a controller being stopped
- c3ab26dc 2024-12-26T13:44:13+00:00 Inform network aware controllers of network changes
- 81449ddd 2024-12-26T13:44:13+00:00 Fix egress IP tests
- a13297ee 2024-12-26T13:44:13+00:00 Fix network controllers constructors not using the same NetInfo for their subcontrollers
- 7c03f3f4 2024-12-26T13:44:13+00:00 Fix deadlock when comparing mutableNetInfo with self
- 4c0eb713 2024-12-26T13:44:13+00:00 Fix receiver names of nad controller
- 3d1ec7ad 2024-12-26T13:44:13+00:00 Reconcile RouteAdvertisements from cluster manager
- 90136b5f 2024-12-26T13:44:13+00:00 Add FRRConfiguration to factory
- 6c544704 2024-12-26T13:44:13+00:00 UDN gw: use network name as VRF name for cluster UDNs
- 6dcb602d 2024-12-26T13:44:13+00:00 VRF manager: manage VRFs with any name
- adb1fc8b 2024-12-26T13:44:13+00:00 Assign network ID from network manager
- 6c366bb4 2024-12-20T15:27:05-08:00 Do not update EncapIP if it is configured
- 33f957d4 2024-12-20T12:21:06+00:00 EIP E2Es: create const for httpd image name and add image tag
- 1aedb9ae 2024-12-20T12:21:06+00:00 EIP/ESVC: remove code to remove legacy no reroutes for nodes
- 6c4e0212 2024-12-20T12:21:06+00:00 Add UDN Layer2 support for an Egress IP assigned to the primary interface
- 06c26bc4 2024-12-19T17:55:18+00:00 Add missing enum validation for RouteAdvertisements
- 1290c908 2024-12-18T20:23:44+01:00 udn host isolation: fix initialSync.
- 8da4dc9a 2024-12-16T13:32:21+02:00 managedTap: Use the new bridge type name

4 changes: 2 additions & 2 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ https://github.com/openshift/coredns image-amd64 cb1abfaeb7b0c5df4f0c56b0a009b43
https://github.com/openshift/csi-external-snapshotter image-amd64 838d2484157f076bbb81f1b584898aec6f051c2f
https://github.com/openshift/router image-amd64 be319d0bb83f75b52b707df46422f6892dfaaa56
https://github.com/openshift/kube-rbac-proxy image-amd64 526498ab32996a0f67a96530ad7173f955e3fbe2
https://github.com/openshift/ovn-kubernetes image-amd64 34fa86e259b122aa98b35349f5080ec842fba50c
https://github.com/openshift/ovn-kubernetes image-amd64 f0ab7904387fc2588c5110f1ff9d7187d5ce3e11
https://github.com/openshift/kubernetes image-amd64 7665f4b7049dc15c6559d91d8db45cef318e4c0f
https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
https://github.com/openshift/oc image-arm64 fd653741e664d1f498af2885f4f2f48cd401677e
https://github.com/openshift/coredns image-arm64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949
https://github.com/openshift/csi-external-snapshotter image-arm64 838d2484157f076bbb81f1b584898aec6f051c2f
https://github.com/openshift/router image-arm64 be319d0bb83f75b52b707df46422f6892dfaaa56
https://github.com/openshift/kube-rbac-proxy image-arm64 526498ab32996a0f67a96530ad7173f955e3fbe2
https://github.com/openshift/ovn-kubernetes image-arm64 34fa86e259b122aa98b35349f5080ec842fba50c
https://github.com/openshift/ovn-kubernetes image-arm64 f0ab7904387fc2588c5110f1ff9d7187d5ce3e11
https://github.com/openshift/kubernetes image-arm64 7665f4b7049dc15c6559d91d8db45cef318e4c0f
https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755
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-2025-01-25-163410" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-01-26-025745"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-01-27-102545" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-01-27-222549"