Skip to content

Commit

Permalink
NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-01-09-012852_amd6…
Browse files Browse the repository at this point in the history
…4-2025-01-09_arm64-2025-01-09 (#4398)

* update last_rebase.sh

* update changelog

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot <ci-robot@openshift.io>
  • Loading branch information
microshift-rebase-script[bot] and ci-robot authored Jan 10, 2025
1 parent 733c652 commit 207dbb3
Show file tree
Hide file tree
Showing 11 changed files with 139 additions and 26 deletions.
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-2025-01-08-210825
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-01-09-210825
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-2025-01-08-044301
OCP_VERSION := 4.18.0-0.nightly-2025-01-09-012852
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-2025-01-08-210825"
"base": "4.18.0-0.nightly-arm64-2025-01-09-210825"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05394287fd690e589778264f7272c968e4cf87137005272af48082729d35c5af",
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-2025-01-08-044301"
"base": "4.18.0-0.nightly-2025-01-09-012852"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9561a8aebe6978367bb21b607369a9c23c7651ddb3002f7b3cdd01b18c89adf",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2025-01-08-210825"
"base": "4.18.0-0.nightly-arm64-2025-01-09-210825"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb8a571aaacdbc3653d4a6b93e3e854c7f4bb8ccc4b50d47eca0df178dd935e3",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2025-01-08-044301"
"base": "4.18.0-0.nightly-2025-01-09-012852"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9a495a5377a92c64bf23b5d770d6e08d7ce6f1f17716bf53bcbb9c2ac412561",
Expand Down
6 changes: 3 additions & 3 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2025-01-08-210825"
"base": "4.18.0-0.nightly-arm64-2025-01-09-210825"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bed62d5eeb1cb2e68a44d0c94f24ca04953ee67392975ca06f0c05d8f8e1670e",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e97a1610f2cca76626c497f02401518309e3c323d113d4c5eed2aced9a8f895",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f8ab04d2eae86d44d8061bf14662b42e3dfe3718fb08ae1259f94900d5c4bc5",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ebf06deb7ce22e50a5c66be3c52674eb53337e967fe7397f7e8327c784ca49b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03f1644f600af057ccf8ae3fd544d6a0dc72f079f97f9db98e00ed8c9779c26d",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57009661803a18f4eee105f4a4861c582476f9ed54e49d632cff3e249b7eda52",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc34ba5a77e872e2a7b9918166f522ea22154f87738e34f65acc0fdc4c2e5a30",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2175ea09614a38845e1bfaf139655c0cc7110739b5acebd6d89242bb3cf7dfed",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49f294bfc07141d8d238566373651845cc5137dcf93f9de2029b448d79b26235",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2025-01-08-044301"
"base": "4.18.0-0.nightly-2025-01-09-012852"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cbe2e31891da06668664175a9b84997953749335f511a19e01ebfd32ac0b19a9",
Expand Down
139 changes: 126 additions & 13 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,128 @@
- cluster-openshift-controller-manager-operator embedded-component 20af082dea1e932a5be3cc8f1f2c166959302e18 to f1711cf30f683ec0eaa187cd5168caae9e8c1254
- 451e012 2025-01-02T10:42:42+00:00 NO-JIRA: Add team members to the OWNERS file
- oc image-arm64 5e62301694fdb1723bac4b293948b1bbb11cab21 to fd653741e664d1f498af2885f4f2f48cd401677e
- bb91cb38 2024-12-12T15:44:23+00:00 OCPBUGS-45991: Mark --report and --pxe flags as experimental

- machine-config-operator embedded-component c9bd3ae71c5c31dba32911f963f3da51c566362f to a964f19a214946f0e5f1197c545d3805393d0705
- c9dbd970 2024-12-10T20:30:03+00:00 daemon: add nil check for annotation fetching

- openshift-controller-manager embedded-component 3ebe2f4f3900d6a3748ef0faf3535f635dbf7d11 to 5bfc8081a65ea3e0d23306c0398143a9987d659e
- 1e74e8c 2025-01-02T10:38:28+00:00 NO-JIRA: Add team members to the OWNERS file

- oc image-amd64 c64c430e48013ced1705344bb95ba1bdfb2a1a0b to 5e62301694fdb1723bac4b293948b1bbb11cab21
- 7be50bc0 2024-12-16T11:37:59+00:00 fix oc adm node-image create --pxe command to copy the correct artifacts

- oc image-arm64 c64c430e48013ced1705344bb95ba1bdfb2a1a0b to 5e62301694fdb1723bac4b293948b1bbb11cab21
- 7be50bc0 2024-12-16T11:37:59+00:00 fix oc adm node-image create --pxe command to copy the correct artifacts
- ovn-kubernetes image-arm64 24e9946a28826e1c4f4a135674261c62bc89a3b8 to 930d8645c00fd2273c4cbb6e1d3c057e0967f0a1
- 1243011a 2024-12-13T09:48:47-08:00 hard code disable-udn-host-isolation to "true"
- 0bc2c516 2024-12-13T13:32:49+01:00 UDN Gateway: Ignore EndpointSlices without a service label
- e0f77fcf 2024-12-12T18:02:25-08:00 unit tests: speed up by small sleep before cache sync wait
- 4214d116 2024-12-12T15:23:59-05:00 Fix ovnkube-trace to not rely on MAC annotation
- d3b7ceae 2024-12-12T15:23:59-05:00 Scopes egress firewall test for correct ACLs
- ada96ddb 2024-12-12T15:23:59-05:00 Calculates mgmt port MAC rather than storing
- 7d86e41f 2024-12-11T17:04:24-08:00 unit tests: unify NoRoot checking
- bdf4f4e5 2024-12-11T16:16:28-08:00 primary_network: Properly log NAD name on error.
- 00f1533b 2024-12-11T15:17:07-05:00 Fixes checking for IPAM claim in pod deletion
- 8b0caabc 2024-12-11T15:17:05-05:00 Improves pod deletion with user defined networks
- a210e76c 2024-12-11T12:43:02+00:00 Deploy FFR-k8s in kind
- 2aabd76b 2024-12-11T12:43:02+00:00 Add RouteAdvertisements to watch factory
- 0ae82c2f 2024-12-11T12:43:02+00:00 Add route advertisements CLI flag
- 9703f4b8 2024-12-11T12:43:02+00:00 Generate RouteAdvertisements CRD
- 17f0e736 2024-12-11T11:03:56+00:00 EIP controller: sync Nodes OVN zone state once
- 2e184829 2024-12-10T15:07:12-08:00 e2e: Improve IGMP validation test with retries
- cd1f5d1d 2024-12-10T15:38:23+01:00 podNetworkController: Switch back source pod LSP after failed migration
- 8af42d7c 2024-12-10T15:38:23+01:00 podNetworkController: Switch enabled LSP flags for VM migration
- 52d8203b 2024-12-10T15:38:23+01:00 tests, multi-homing: Move controller reconcile test setup to helpers
- d6d951e2 2024-12-10T15:38:23+01:00 tests, multi-homing: Expand test infra for multiple pod creation
- 12aed370 2024-12-10T15:38:23+01:00 kubevirt/pod: Add function to discover pod migration status
- 6334c74f 2024-12-10T15:38:23+01:00 libovsdb, lsp: Dynamically add updatable fields by name
- e8b3af59 2024-12-10T08:57:45+00:00 EIP e2e: check EIP when pods from different ns connect to same net
- a7811ff9 2024-12-10T08:57:45+00:00 OVN EIP gateway: improve lookup speed of IP addresses
- 1ec4ee3b 2024-12-10T08:57:45+00:00 EIP OVN controller: add NAD controller DoWithLock and improve network lookup
- 35d3732e 2024-12-10T08:57:45+00:00 OVN EIP controller: cleanup stale config if pod if removed and ns changed network
- de802f90 2024-12-10T08:57:45+00:00 Remove unsure error return from ID allocator
- 0bdc6530 2024-12-10T08:57:45+00:00 Update docs for Layer 3 UDN EIP support
- f26811fa 2024-12-10T08:57:45+00:00 EIP OVN: enhance logging and ensure its network aware
- 9d0e46ab 2024-12-10T08:57:45+00:00 Patch vm migration code to ignore lrps without a zone
- 5c2e6d23 2024-12-10T08:57:45+00:00 Temp: skip esvc test
- 86e8acaf 2024-12-10T08:57:45+00:00 Go mod tidy & go mod vendor
- 064e01a3 2024-12-10T08:57:45+00:00 EIP E2Es: skip a set of tests if net seg flag isn't present
- 3cbe6119 2024-12-10T08:57:45+00:00 EIP e2es: test EIP selecting multiple ns with multiple primary networks
- 431342f6 2024-12-10T08:57:45+00:00 Add e2es for UDN
- 1c0a5a0f 2024-12-10T08:57:45+00:00 EIP Multi NIC: do not config role primary secondary network namespaces
- c22cce22 2024-12-10T08:57:45+00:00 Fake OVN: respect fake address set choice for secondary controller
- 728a1ec5 2024-12-10T08:57:45+00:00 Libovsdb LRPs cache dupe ops check: add Ext IDs field
- ed112c00 2024-12-10T08:57:13+00:00 Default bridge: add EIP SNAT
- 1c1f8937 2024-12-10T06:55:22+00:00 EIP OVN: make controller multi net aware & consider pkt mark
- 1bc93172 2024-12-10T13:50:43+08:00 Bump OVS version to 3.4.0-18
- 1642012b 2024-12-09T16:59:03+00:00 EIP OVN: prepare OVN contructs for multi network
- b098bc61 2024-12-09T16:59:03+00:00 Expose UDN enabled svcs as address set
- 7a36fc2d 2024-12-09T16:59:03+00:00 EIP OVN Controller: store assigned pod IPs instead of lookup
- 4cc86015 2024-12-09T16:59:03+00:00 EIP CM: add pkt mark to annotations
- 1fcecc55 2024-12-09T16:59:03+00:00 EIP CM: rename "allocator" EIP node cache
- 527030ea 2024-12-09T16:59:01+00:00 Extract EIP controller logical from DNC
- dfa9d878 2024-12-09T15:33:52+01:00 fixes overzealous deletion of SNAT in egressIP
- 84575787 2024-12-06T17:14:18-05:00 Fix a bug in FakeIPTables and a resulting bug in egressservice.Controller
- fff8f39a 2024-12-06T09:40:29-05:00 use libovsdb for OVN metrics
- d181a7c3 2024-12-06T09:40:29-05:00 Use libovsdb package for collecting ovs metrics
- a5292b12 2024-12-06T11:53:51+01:00 Fix the port value used for marking externally exposed services
- 40053ba7 2024-12-05T15:58:13+01:00 crd, udn: Improve minimum MTU validations
- d87f4800 2024-12-05T10:23:22+01:00 Add option to disable udn-host-isolation.
- a822445f 2024-12-05T10:23:22+01:00 host isolation, open ports: add e2e
- bbfc4718 2024-12-05T10:23:17+01:00 node UDN isolation: handle open ports annotation on UDN pods.
- ef426f15 2024-12-05T10:23:17+01:00 node UDN isolation: make nft container more generic.
- 5b62be5d 2024-12-05T10:23:13+01:00 Add host isolation for UDN pods.
- f0a1e66e 2024-12-04T15:10:18+01:00 gateway: Access default net config under bridge lock.
- e52182e1 2024-12-04T12:40:45+01:00 gateway_udn: Don't bail out early when waiting for UDN patch ports.
- 7fa33601 2024-12-03T17:41:11+08:00 pin libreswan to 4.6-3.el9_0.3
- 6857a508 2024-12-02T15:19:26-08:00 Update ubuntu version to 24.10
- a13b5972 2024-12-02T10:04:23-08:00 make dnf get through repo troubles faster
- 166aec0d 2024-12-02T12:16:51+01:00 Update multi-homed unit tests for Network Policy
- 7b6de101 2024-12-02T08:09:08+01:00 Add unit test for multinet policy disabled scenario
- c4b054a9 2024-12-02T08:09:08+01:00 Ensure UDN namespace is configured when MutiNetPolicy is disabled
- e8d7435e 2024-11-29T15:18:58+01:00 udn controller, tests: Fix flake where pods not exist yet
- 45438213 2024-11-29T14:55:00+01:00 Mark packets destined for externally exposed services
- 9b490b50 2024-11-29T11:15:27+01:00 Fix UDN enabled services flow removal
- ab274435 2024-11-29T11:15:27+01:00 Add static MAC bidnings for host masquerade IPs in UDN
- 931facbe 2024-11-29T11:15:24+01:00 Generate a packet mark for every UDN gateway
- e32e546a 2024-11-29T10:46:40+01:00 UDN: Add routes for cluster subnet and masquerade IP in ETP=Local
- 9fadda45 2024-11-29T10:46:40+01:00 Handle mirrored endpointslices in gateway.go
- 6d091b97 2024-11-28T15:47:34+01:00 Mount systemd/private to the ovnkube containers.
- 070f3110 2024-11-28T15:47:34+01:00 vendor in systemd listener
- d8d6de22 2024-11-28T15:47:34+01:00 kind.sh fix: delete kind cluster with given name instead of "ovn".
- 145edb9b 2024-11-28T15:47:05+01:00 Call PrepareTestConfig for healthcheck and DPU tests.
- 74b10463 2024-11-27T19:18:16+00:00 Fix issues with ovnkube-identity pod deletion in kind clusters
- afdd7bd3 2024-11-26T20:39:14+01:00 multicast, udn: Adapt existing default network unit tests for UDN too.
- 321d6fc0 2024-11-26T20:39:14+01:00 multicast, udn: Add ports to namespace port group
- c022ff7f 2024-11-26T20:39:14+01:00 multicast, udn: Add default cluster ACLs l2/l3
- d01b05d9 2024-11-26T20:39:13+01:00 multicast: Move default multicast policies to base controller
- a5b67d48 2024-11-26T20:39:13+01:00 multicast, udn: Allow for primary UDN l2/l3
- de8a2309 2024-11-26T20:39:13+01:00 ci, udn: Enable multicast for network segmentation CI jobs.
- d1e1eb6c 2024-11-26T20:39:13+01:00 multicast, udn, e2e: Add IGMP test
- 30397815 2024-11-26T20:39:13+01:00 multicast, udn, e2e: Add UDP test
- 199fcbed 2024-11-26T20:39:13+01:00 multicast, e2e: Move tests to helper functions
- d503c83d 2024-11-26T20:39:13+01:00 netpol, udn: Add ACL for LB hairpin traffic for UDN.
- 8fb3afa3 2024-11-26T20:39:13+01:00 bnc, udn: Add primary user defined network management port to cluster port group.
- 3a513c84 2024-11-26T20:39:13+01:00 bnc, udn: Create cluster port groups l2/l3
- 6d8fd3e1 2024-11-26T20:39:13+01:00 udn: Create UDN L2 management port only for primary networks.
- 31be584c 2024-11-26T20:39:13+01:00 udn, test: Allow secondary network tests to check for cluster port groups.
- 2955fe57 2024-11-26T20:39:13+01:00 bnc: Move cluster port group create to base controller
- 1b132bde 2024-11-26T20:39:13+01:00 test, multicast: Run tcpdump on all interfaces in IGMP query test.
- c95491e4 2024-11-26T15:06:56+01:00 Return error for unexpected ObjectName
- 7a848598 2024-11-26T15:06:56+01:00 Use explicit decoded.String() on sample logging
- b5f907bf 2024-11-26T15:06:56+01:00 Namespaced netpol: split name by ":"
- cace29d0 2024-11-26T15:06:56+01:00 Parameterize NetpolNodeOwnerType
- 2803f9e6 2024-11-26T15:06:56+01:00 Remove dependency to libovsdbutil
- cbeb73ab 2024-11-26T15:06:56+01:00 Add String() to intf model.NetworkEvent
- a0c04e42 2024-11-26T15:06:56+01:00 Observability: change decode funcs to provide structured data
- 094e36cd 2024-11-25T14:41:42+01:00 Do not configure ports for host-networked pods in secondary networks
- 96cb1442 2024-11-22T12:55:52+01:00 net-attach-def-controller, tests: ignore topology not managed errors
- 1606de09 2024-11-22T12:55:52+01:00 cluster manager, tests: ignore topology not managed errors
- e3264086 2024-11-20T17:59:48+01:00 Add license scan report and status
- bcdb9909 2024-11-19T10:40:06+01:00 Fix predicate for cluster subnet route to gateway router
- e27e6a3e 2024-11-15T12:36:29+01:00 ip allocator: rename AllocateIPs method
- 4f5b176e 2024-11-13T10:48:56-05:00 Port management-port-related iptables rules to nftables.
- 0258a3e2 2024-11-13T10:39:09-05:00 Import knftables package, add pkg/node/nftables/
- 01eaae15 2024-11-13T10:39:09-05:00 Make sure nftables binaries are available everywhere
- 5c674d93 2024-11-13T16:50:15+02:00 UDN: Adapt tests to use managedTap instead passt
- debbd1f3 2024-11-13T16:50:15+02:00 UDN: Patch Kubevirt CR to support managedTap binding
- bc6bb3ed 2024-11-13T14:12:48+02:00 ipam: Fix init flow in case there are sticky ips in the system
- 40d30f6a 2024-11-13T11:18:25+02:00 node network controller: Add CUDN check to GetActiveNetworkForNamespace
- a028583b 2024-11-12T18:12:57-05:00 Do not use LB templates with UDNs
- 05525943 2024-11-12T18:10:47-05:00 Use joinIP as lb_force_snat_ip in L2 UDNs
- d604d597 2024-11-12T10:20:50-05:00 Fixes unexpected mp0 route removal during start up
- bfb16728 2024-11-11T14:52:54+02:00 NAD validations: Fix typo in error message
- 9cfeb1ff 2024-11-11T09:52:53+02:00 kind,ic: Improve redeploy speed
- 37527d38 2024-11-07T20:09:06+02:00 docs, api-reference: Update UDN content
- f4941d48 2024-11-06T11:42:20+01:00 Revert "HACK: Update podSubnet for lexocographical correctness"
- a6247a2a 2024-11-06T11:41:37+01:00 nit: Remove unnecessary checks
- 2c2f868d 2024-10-29T12:40:39+01:00 nit fixes in docs

4 changes: 2 additions & 2 deletions scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 526498ab32996a0f67a9653
https://github.com/openshift/ovn-kubernetes image-amd64 24e9946a28826e1c4f4a135674261c62bc89a3b8
https://github.com/openshift/kubernetes image-amd64 205ac00c56dd2340b90dc0e328be84e77219197c
https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
https://github.com/openshift/oc image-arm64 5e62301694fdb1723bac4b293948b1bbb11cab21
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 f52ce8b8b0799a341caf1fb864bba5d9d040a856
https://github.com/openshift/csi-external-snapshotter image-arm64 f52ce8b8b0799a341caf1fb864bba5d9d040a856
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 24e9946a28826e1c4f4a135674261c62bc89a3b8
https://github.com/openshift/ovn-kubernetes image-arm64 930d8645c00fd2273c4cbb6e1d3c057e0967f0a1
https://github.com/openshift/kubernetes image-arm64 205ac00c56dd2340b90dc0e328be84e77219197c
https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755
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-2025-01-08-044301" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-01-08-210825"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-01-09-012852" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-01-09-210825"

0 comments on commit 207dbb3

Please sign in to comment.