Skip to content

Commit 356dc9a

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-01-29-133231_amd64-2025-01-29_arm64-2025-01-29 (#4493)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 379490a commit 356dc9a

File tree

10 files changed

+9
-121
lines changed

10 files changed

+9
-121
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-01-28-222549
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-01-29-183712

‎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-01-28-165333
1+
OCP_VERSION := 4.18.0-0.nightly-2025-01-29-133231

‎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-01-28-222549"
3+
"base": "4.18.0-0.nightly-arm64-2025-01-29-183712"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cff936abaaf77fcae90d16563afaffa5fabed681ff6a84cd0d07cd753f23483e",

‎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-01-28-165333"
3+
"base": "4.18.0-0.nightly-2025-01-29-133231"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:098bab222712ecdbf85e748e0b676814b0e08debfdbc15127b057b63c136fcab",

‎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-01-28-222549"
3+
"base": "4.18.0-0.nightly-arm64-2025-01-29-183712"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77b44abd29994f5e934a1158c909eaa4a944e10c12c580fca1ff1e18b13f0427",

‎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-01-28-165333"
3+
"base": "4.18.0-0.nightly-2025-01-29-133231"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47b0670fa1051335fd2d2c9e8361e4ed77c7760c33a2180b136f7c7f59863ec2",

‎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-01-28-222549"
3+
"base": "4.18.0-0.nightly-arm64-2025-01-29-183712"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c66f20a4028a99307e49e0c84d0417a6b8e1ed0d46449333994c0b38fa309931",

‎assets/release/release-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-01-28-165333"
3+
"base": "4.18.0-0.nightly-2025-01-29-133231"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b353d327072af12fb862132f03a255774a331f8e7a8bfc17254df8849d91f36",

‎scripts/auto-rebase/changelog.txt

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +0,0 @@
1-
- cluster-network-operator embedded-component 3dcc293ae93174f099054b75a4d0cde5ca039f9b to 8d768a83424e930352ca565094c24208dadb4725
2-
- 8a2e192 2025-01-27T22:43:49+00:00 (C)UDN CRD: add IPAM section and IPAM.Mode field.
3-
4-
- machine-config-operator embedded-component c3c615e27f62881947ba84a2d42454df86cfad48 to 158c393d63629581981a7feea2b3dbf8b284ea27
5-
- 92c3c4d9 2025-01-24T01:52:47+00:00 controller: add extension validation to controller
6-
7-
- ovn-kubernetes image-amd64 f0ab7904387fc2588c5110f1ff9d7187d5ce3e11 to 1b2d4eb9e76916676bc10fdde5d683c7cd8bdff5
8-
- 34411135 2025-01-27T07:53:19-05:00 Revert "hard code disable-udn-host-isolation to "true""
9-
- e82f43db 2025-01-24T18:23:09+01:00 Cleanup networkpolicy when a namespace was already removed
10-
- 988cb71e 2025-01-24T18:23:05+01:00 Get active network from annotations on pod deletion
11-
- a1427dc8 2025-01-23T18:04:30+01:00 gateway_localnet_linux_test.go: Fix various test issues.
12-
- 29ec1066 2025-01-23T17:50:59+01:00 subnet_allocator: Take lock when reading subnetAllocatorRanges.
13-
- 3bf51092 2025-01-23T17:50:59+01:00 node_ip_handler_linux_test: Avoid DATA race due to concurrent config access.
14-
- 199d61d4 2025-01-23T17:50:59+01:00 gateway_localnet_linux_test: Serialize access to openflow manager flow table.
15-
- ad85acc8 2025-01-23T17:50:59+01:00 ovn_test: Properly shutdown the watch factory.
16-
- f952cee7 2025-01-23T17:50:31+01:00 factory: Reduce event queue size for unit tests.
17-
- 6dda0b51 2025-01-23T17:49:05+01:00 factory: Bump the event queue size to 1K.
18-
- fe17136c 2025-01-23T17:49:05+01:00 factory: Reduce contention on informer locks.
19-
- 2b8be272 2025-01-23T17:49:05+01:00 factory: Use 15 event queues per informer for pod, node and namespace.
20-
- 5530ab8a 2025-01-23T17:49:05+01:00 Always use queued informer
21-
- ab83afb4 2025-01-23T17:26:11+01:00 UDN isolation: trigger update on open-default-ports annotation change.
22-
- bbc56776 2025-01-23T09:54:25+01:00 Fix race between NAD and NetPol deletions
23-
- f21f8fb5 2025-01-22T15:22:52-05:00 Fixes SNAT removal with egress IP
24-
- f0723b30 2025-01-22T18:55:05+00:00 Set network ID on netInfo even when already annotated
25-
- e65cc4e7 2025-01-22T12:35:24-05:00 Unit tests: set klog level explicitly
26-
- c5b834d4 2025-01-22T16:59:15+01:00 EIP node: skip OVN managed interfaces that don't serve as secondary
27-
- 0306d4ce 2025-01-22T15:00:46+01:00 Do not rely on the active network while removing the EndpointSlice
28-
- 16ef5d8c 2025-01-21T16:59:47+01:00 Ignore removed namespaces in clustermanager
29-
- 0a06cfe1 2025-01-21T15:29:33+01:00 docs: update (C)UDN CRD reference.
30-
- 46c34a2c 2025-01-21T15:28:43+01:00 e2e, pudn: Use port to check overlapping isolation
31-
- 561af6ef 2025-01-21T14:09:28+01:00 Use annotations in mirrored EndpointSlices for potentially long values
32-
- 089009ce 2025-01-20T14:24:22-05:00 Skip session affinity conformance test
33-
- 344d4dca 2025-01-20T20:03:46+01:00 Remove per-pod-SNAT for UDNs
34-
- 9743feba 2025-01-20T19:01:15+01:00 Refactor and fix UDN/CUDN readiness checks
35-
- 73492d99 2025-01-20T14:48:27+01:00 Dockerfile.fedora: Bump OVN to ovn24.09-24.09.1-10.fc41
36-
- 0058b326 2025-01-20T14:48:27+01:00 e2e/external_gateways: Update test to avoid accidental matching of conntrack entries.
37-
- e8a0e68b 2025-01-18T15:01:47-05:00 Fix missing error wrap on IC remote node add
38-
- 87de9f82 2025-01-18T14:39:48-05:00 Suppress layer 2 missing pod anno errors
39-
- 4be55de6 2025-01-18T09:49:21+00:00 EIP: reduce log spam from errors that arent really errors due to race for data
40-
- a3c44c24 2025-01-17T13:00:18-08:00 Add missing host-cidrs annotation for DPU Host
41-
- 8bbeac79 2025-01-17T14:38:44+01:00 Fix pods cleanup in ClusterUserDefinedNetwork test
42-
- f31b70f1 2025-01-16T13:36:21+02:00 e2e,udn crd: Use the right IP family according to env
43-
- 299db52c 2025-01-16T10:14:58+01:00 (C)UDN CRD: add IPAM section and IPAM.Mode field.
44-
- da702b8b 2025-01-14T21:01:42-05:00 Fix multicast tests for ipv6 with UDN
45-
- 10a2af04 2025-01-14T16:50:31+01:00 Add GetInterfaceUDNs to convert interface name to (C)UDN ns+name.
46-
- b8c3d788 2025-01-13T16:23:07-05:00 Adds E2E to verify UDN label cannot be added/removed later
47-
- a084679e 2025-01-13T16:23:07-05:00 Adds e2e test to for wiring pod with missing UDN label
48-
- ef21acb5 2025-01-13T16:23:07-05:00 Remove per network load balancer groups on cleanup
49-
- a9b3e445 2025-01-13T16:23:06-05:00 Update kubevirt e2es
50-
- 0dd81cf4 2025-01-13T16:23:06-05:00 Fix egress IP delete path
51-
- 253025a4 2025-01-13T16:23:06-05:00 Fix egress IP tests
52-
- 41dfd98d 2025-01-13T16:23:06-05:00 Fix multicast net seg tests ip family
53-
- 0b71fe6c 2025-01-13T16:23:06-05:00 Update E2Es to for required UDN label
54-
- 7bb83ce1 2025-01-13T16:23:06-05:00 Disable adding/removing the UDN namespace label
55-
- d31b0475 2025-01-13T16:23:06-05:00 Require namespace label for primary UDN
56-
- 6c5f5d99 2025-01-12T14:19:19-08:00 Update OVS bridge flows for supporting gateway VLANs
57-
- d940cab5 2025-01-12T06:11:51+00:00 UDN EIP IP: change scope from link to global
58-
- 901989c9 2024-12-19T11:40:39+01:00 (C)UDN CRD: update CEL validations.
59-
60-
- ovn-kubernetes image-arm64 f0ab7904387fc2588c5110f1ff9d7187d5ce3e11 to 1b2d4eb9e76916676bc10fdde5d683c7cd8bdff5
61-
- 34411135 2025-01-27T07:53:19-05:00 Revert "hard code disable-udn-host-isolation to "true""
62-
- e82f43db 2025-01-24T18:23:09+01:00 Cleanup networkpolicy when a namespace was already removed
63-
- 988cb71e 2025-01-24T18:23:05+01:00 Get active network from annotations on pod deletion
64-
- a1427dc8 2025-01-23T18:04:30+01:00 gateway_localnet_linux_test.go: Fix various test issues.
65-
- 29ec1066 2025-01-23T17:50:59+01:00 subnet_allocator: Take lock when reading subnetAllocatorRanges.
66-
- 3bf51092 2025-01-23T17:50:59+01:00 node_ip_handler_linux_test: Avoid DATA race due to concurrent config access.
67-
- 199d61d4 2025-01-23T17:50:59+01:00 gateway_localnet_linux_test: Serialize access to openflow manager flow table.
68-
- ad85acc8 2025-01-23T17:50:59+01:00 ovn_test: Properly shutdown the watch factory.
69-
- f952cee7 2025-01-23T17:50:31+01:00 factory: Reduce event queue size for unit tests.
70-
- 6dda0b51 2025-01-23T17:49:05+01:00 factory: Bump the event queue size to 1K.
71-
- fe17136c 2025-01-23T17:49:05+01:00 factory: Reduce contention on informer locks.
72-
- 2b8be272 2025-01-23T17:49:05+01:00 factory: Use 15 event queues per informer for pod, node and namespace.
73-
- 5530ab8a 2025-01-23T17:49:05+01:00 Always use queued informer
74-
- ab83afb4 2025-01-23T17:26:11+01:00 UDN isolation: trigger update on open-default-ports annotation change.
75-
- bbc56776 2025-01-23T09:54:25+01:00 Fix race between NAD and NetPol deletions
76-
- f21f8fb5 2025-01-22T15:22:52-05:00 Fixes SNAT removal with egress IP
77-
- f0723b30 2025-01-22T18:55:05+00:00 Set network ID on netInfo even when already annotated
78-
- e65cc4e7 2025-01-22T12:35:24-05:00 Unit tests: set klog level explicitly
79-
- c5b834d4 2025-01-22T16:59:15+01:00 EIP node: skip OVN managed interfaces that don't serve as secondary
80-
- 0306d4ce 2025-01-22T15:00:46+01:00 Do not rely on the active network while removing the EndpointSlice
81-
- 16ef5d8c 2025-01-21T16:59:47+01:00 Ignore removed namespaces in clustermanager
82-
- 0a06cfe1 2025-01-21T15:29:33+01:00 docs: update (C)UDN CRD reference.
83-
- 46c34a2c 2025-01-21T15:28:43+01:00 e2e, pudn: Use port to check overlapping isolation
84-
- 561af6ef 2025-01-21T14:09:28+01:00 Use annotations in mirrored EndpointSlices for potentially long values
85-
- 089009ce 2025-01-20T14:24:22-05:00 Skip session affinity conformance test
86-
- 344d4dca 2025-01-20T20:03:46+01:00 Remove per-pod-SNAT for UDNs
87-
- 9743feba 2025-01-20T19:01:15+01:00 Refactor and fix UDN/CUDN readiness checks
88-
- 73492d99 2025-01-20T14:48:27+01:00 Dockerfile.fedora: Bump OVN to ovn24.09-24.09.1-10.fc41
89-
- 0058b326 2025-01-20T14:48:27+01:00 e2e/external_gateways: Update test to avoid accidental matching of conntrack entries.
90-
- e8a0e68b 2025-01-18T15:01:47-05:00 Fix missing error wrap on IC remote node add
91-
- 87de9f82 2025-01-18T14:39:48-05:00 Suppress layer 2 missing pod anno errors
92-
- 4be55de6 2025-01-18T09:49:21+00:00 EIP: reduce log spam from errors that arent really errors due to race for data
93-
- a3c44c24 2025-01-17T13:00:18-08:00 Add missing host-cidrs annotation for DPU Host
94-
- 8bbeac79 2025-01-17T14:38:44+01:00 Fix pods cleanup in ClusterUserDefinedNetwork test
95-
- f31b70f1 2025-01-16T13:36:21+02:00 e2e,udn crd: Use the right IP family according to env
96-
- 299db52c 2025-01-16T10:14:58+01:00 (C)UDN CRD: add IPAM section and IPAM.Mode field.
97-
- da702b8b 2025-01-14T21:01:42-05:00 Fix multicast tests for ipv6 with UDN
98-
- 10a2af04 2025-01-14T16:50:31+01:00 Add GetInterfaceUDNs to convert interface name to (C)UDN ns+name.
99-
- b8c3d788 2025-01-13T16:23:07-05:00 Adds E2E to verify UDN label cannot be added/removed later
100-
- a084679e 2025-01-13T16:23:07-05:00 Adds e2e test to for wiring pod with missing UDN label
101-
- ef21acb5 2025-01-13T16:23:07-05:00 Remove per network load balancer groups on cleanup
102-
- a9b3e445 2025-01-13T16:23:06-05:00 Update kubevirt e2es
103-
- 0dd81cf4 2025-01-13T16:23:06-05:00 Fix egress IP delete path
104-
- 253025a4 2025-01-13T16:23:06-05:00 Fix egress IP tests
105-
- 41dfd98d 2025-01-13T16:23:06-05:00 Fix multicast net seg tests ip family
106-
- 0b71fe6c 2025-01-13T16:23:06-05:00 Update E2Es to for required UDN label
107-
- 7bb83ce1 2025-01-13T16:23:06-05:00 Disable adding/removing the UDN namespace label
108-
- d31b0475 2025-01-13T16:23:06-05:00 Require namespace label for primary UDN
109-
- 6c5f5d99 2025-01-12T14:19:19-08:00 Update OVS bridge flows for supporting gateway VLANs
110-
- d940cab5 2025-01-12T06:11:51+00:00 UDN EIP IP: change scope from link to global
111-
- 901989c9 2024-12-19T11:40:39+01:00 (C)UDN CRD: update CEL validations.
112-

‎scripts/auto-rebase/last_rebase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash -x
2-
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-01-28-165333" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-01-28-222549"
2+
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-01-29-133231" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-01-29-183712"

0 commit comments

Comments
 (0)