From 85c82be74396c92250aebc3967c5d16ed2bad0b8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 3 Jul 2025 04:26:06 +0000 Subject: [PATCH 1/4] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index f96e1b9758..574a65bdc8 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -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-06-28-192013" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-06-28-192014" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-06-30-210820" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-06-30-210820" From 7c5499d083d5bc7c8b293620fd6d7009ac90be81 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 3 Jul 2025 04:26:06 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 193 +----------------------------- scripts/auto-rebase/commits.txt | 2 +- 2 files changed, 3 insertions(+), 192 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e4ca21a13e..32e03db67c 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,192 +1,3 @@ -- machine-config-operator embedded-component 74df36f0fd48147136a4fe5ed77685f588f05930 to 42e953adc94db23f0d10d057ec6046e23ed900a6 - - f2cf80c4 2025-06-24T09:59:56-04:00 msbic: only update from a known boot image - - 8d97ff36 2025-06-23T06:18:21+00:00 add MachineConfiguration to related objects - -- ovn-kubernetes image-amd64 aeea3396792eb20e7caa8e7f67d19a1be7889512 to be9ebb4375b3796660017ac0431f5c9bfa8b4bdb - - def29099 2025-05-07T16:13:56+02:00 Revert "e2e: connect to host-networked pod from localnet" - - b3760a19 2025-05-07T16:13:23+02:00 Revert "Add flow for host -> localnet on same node" - - c24ff47c 2025-04-28T12:49:01+02:00 Add e2e test for udn advertised pod to kapi service - - 1da9f0b7 2025-04-28T12:49:01+02:00 Sync the gateway flows immediately for BGP and UDN - - 75dd73fb 2025-04-28T12:40:14+02:00 Isolate default network services from UDN pods - - 46be1414 2025-04-25T10:53:33+02:00 Refactor constructUDNVRFIPRules - - fbef8b1e 2025-04-25T10:53:33+02:00 Configure isolation and routes for during network addition - - ad9b1688 2025-04-25T09:56:25+02:00 cni: Do not expose the node's OVN bridge-mappings - - 3b4d4812 2025-04-25T09:56:25+02:00 ovnkube: Intilize OVS client when runMode=node & for OVS metrics - - c85774bd 2025-04-25T09:56:25+02:00 localnet: Make sure bridge mapping is valid - - ea10061d 2025-04-22T19:34:08+02:00 Block local processes from accessing the UDNs subnets - - 04f043d0 2025-04-21T20:38:13+00:00 docs: Use official logo - - 54f46626 2025-04-20T17:12:43+09:00 Make additional documentation changes - - e810f692 2025-04-16T18:11:55+00:00 .github/workflows/docs.yml: install mkdocs-awesome-pages-plugin - - eabf5c2b 2025-04-16T18:11:55+00:00 Partially revert "awesome-pages is not awesome-nav :/" - - f607624a 2025-04-16T18:11:55+00:00 update requirements.txt to use minify-html - - 314f483c 2025-04-16T19:09:54+03:00 test,e2e: Test pod connectivity over localnet using CUDN CR - - ef20f884 2025-04-16T19:09:51+03:00 test,e2e: CUDN CRD CEL validation tests - - a59d8f9e 2025-04-16T18:31:56+03:00 docs: Update CUDN CRD API reference - - 87e93352 2025-04-16T18:31:55+03:00 udn, nad template: Set explicit default MTU for locanet topology - - 8efb425d 2025-04-16T18:30:10+03:00 udn, nad template: Support localnet topology - - 9e65068d 2025-04-16T15:17:57+00:00 helm: Remove ovnkube-identity.replicas - - 3ee3201d 2025-04-16T15:17:49+00:00 upgrade-ovn.sh: ovnkube-identity is now a DaemonSet - - b1525c32 2025-04-16T15:40:55+02:00 e2e: connect to host-networked pod from localnet - - 0ee80bf9 2025-04-16T15:40:55+02:00 Add flow for host -> localnet on same node - - 2c7ba782 2025-04-16T00:01:36+02:00 Import BGP routes to UDN when EgressIP is advertised - - a091f10e 2025-04-15T22:55:06+02:00 kv, e2e: Test nftables is blocking RAs - - a1fdce28 2025-04-15T22:53:46+02:00 UDN: Filter RA according local GW Router LLA only to avoid multi path - - 8277698e 2025-04-15T09:35:17-07:00 symlink docs/governance/* to identical files in / - - 10ebf89c 2025-04-15T16:40:34+01:00 chore: update footer with trademark disclaimer - - 484f1c55 2025-04-15T16:28:57+02:00 e2e, kv: Use f39 for primary UDN - - 4818f220 2025-04-15T16:28:57+02:00 e2e, kv, udpn: Check ipv6 gateway is reconciled - - f8474e1b 2025-04-15T16:28:57+02:00 kubevirt, l2, ipv6: wire up lm gateway reconciler - - 554e5710 2025-04-15T16:28:57+02:00 kubevirt: Add ipv6 default gw reconciler - - 740772d2 2025-04-15T16:28:57+02:00 util, net: Add ipv6 RA's helpers - - ad2d2635 2025-04-14T21:55:50-07:00 Convert to DaemonSet and fix update strategy of ovnkube-identity pods - - 817186b6 2025-04-14T14:24:38-07:00 update requirements.txt to use minify-html - - dde4c477 2025-04-11T22:19:33+02:00 routeimport: account for CUDN network name prefix - - 752b7b20 2025-04-11T20:53:49+02:00 Check GetNADs length - - 059e3c6b 2025-04-11T20:53:49+02:00 Add BGP support for Layer2 primary UDN in SGW - - e9289b1e 2025-04-11T13:32:32+02:00 Add an unreachable default route for a UDN - - 1b1f7131 2025-04-11T13:32:32+02:00 Remove default route if UDN network is advertised on its own VRF - - 59656d82 2025-04-11T12:33:35+02:00 Adapt e2e tests to new universal network selector API - - 2af5f56b 2025-04-11T12:33:35+02:00 RouteAdvertisements: switch label selectors to standard convention - - 65188add 2025-04-11T12:33:35+02:00 RouteAdvertisements: update API to use universal NetworkSelector - - 58e5d3fb 2025-04-11T12:33:35+02:00 Add universal NetworkSelector API - - 2d647a2c 2025-04-10T18:32:10+02:00 Revert "Add universal NetworkSelector API" - - c177b355 2025-04-10T18:32:10+02:00 Revert "RouteAdvertisements: update API to use universal NetworkSelector" - - d5e38207 2025-04-10T18:32:10+02:00 Revert "RouteAdvertisements: switch label selectors to standard convention" - - 23a9876e 2025-04-10T18:27:56+02:00 RouteAdvertisements: switch label selectors to standard convention - - 396ad2c4 2025-04-10T18:27:56+02:00 RouteAdvertisements: update API to use universal NetworkSelector - - 3bb6054a 2025-04-10T18:27:56+02:00 Add universal NetworkSelector API - - dae3da16 2025-04-10T10:57:29+02:00 Add E2Es for testing isolation between BGP advertised networks - - e6a2e98b 2025-04-09T22:52:56+02:00 kind: check minimum version available - - a7d2ca18 2025-04-09T14:07:17+03:00 ut, pod annotations: Fix typo - - 96146722 2025-04-09T14:07:16+03:00 allocator, pod: Add ipv6 lla gateway for l2 udpn - - 082457cd 2025-04-09T10:49:29+03:00 udn, nad template: Move l2 validations closer to each other - - 1466f211 2025-04-09T10:49:29+03:00 crds,udn: Allow NetworkRole Secondary only for Localnet topology - - 53f0e16a 2025-04-09T10:49:29+03:00 crds,udn: Allow NetworkTopology Localnet for CUDN CRs only - - 6d68ba40 2025-04-09T10:49:24+03:00 crds,cudn: Support localnet topology - - 9d76591e 2025-04-08T19:51:39+00:00 helm: use version v3.17.2 - - f7db1c20 2025-04-08T19:51:31+00:00 kind: move KIND_IMAGE and K8S_VERSION to set_common_default_params - - c386b357 2025-04-08T19:47:36+00:00 github/workflows/test.yml: add network-segmentation to e2e matrix - - cdacd52d 2025-04-08T19:47:36+00:00 Network Segmentation: Sync up rbacs for helm - - 71481d14 2025-04-08T19:47:36+00:00 Network Segmentation: Add flag to enable the feature in helm - - 3ad7f01d 2025-04-08T08:49:14-07:00 add job to test github pages deployment - - 27033e32 2025-04-07T15:24:32+02:00 EIP no reroute: allow multiple entries for pod to pod and pod to join - - f76582f4 2025-04-03T20:00:36+02:00 ci: fix actions/setup-go@v5 warnings - - 837a638b 2025-04-03T20:00:36+02:00 ci: fix submit code coverage to Coveralls - - a3d569aa 2025-04-03T20:00:36+02:00 kind: rely on --force when removing containers and networks - - 5f86091e 2025-04-03T20:39:38+03:00 docs,okeps: Localnet API - - cca01b1a 2025-04-03T10:35:42+02:00 Explicitly probe for frr-k8s webhook readiness - - 59cd6c0c 2025-04-03T10:19:08+02:00 node, metrics: Replace depracated option with equivalent - - 6061601d 2025-04-02T13:12:44+02:00 ci: set /mnt/docker-data as docker storage - - 8025dac7 2025-04-02T13:12:44+02:00 ci: use go.mod for actions/setup-go - - f5f88eab 2025-04-02T13:12:44+02:00 Fix UDN gateway panic when DelNetwork fails - - 99a11763 2025-04-02T13:12:44+02:00 Bump test/e2e to k8s v1.32.2 - - 03745808 2025-04-02T13:12:44+02:00 Bump go-controller go v1.23, k8s v1.32.3 and linter - - 08663ad2 2025-03-31T09:23:11+02:00 Dockerfile: Bump OVS version to 3.5.0-0.9 - - 96ab6ace 2025-03-25T17:26:48+00:00 Updating ose-ovn-kubernetes-base-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/6d536f5ca5a55ea4d382766403635c15d18becf3/images/ovn-kubernetes-base.yml - - b12fcd94 2025-03-24T19:20:21+07:00 E2Es for net seg: remove KinD specific Node selector - - f92b3022 2025-03-23T18:00:33+02:00 util: Add ipv6 lla gateway pod annotation field - - 993ec0dc 2025-03-23T18:00:33+02:00 ut, pod annotations: Align test configuration - - 9c4499b0 2025-03-20T14:51:14+01:00 Update OVN to FDP25.A.1 24.09.2-41. - - 00c54f2b 2025-03-20T16:52:20+09:00 Fix the commands for image build in the docs and script. - - 764685a5 2025-03-19T18:09:35+08:00 unpin libreswan version - - 976a3c6a 2025-02-04T10:56:32-05:00 Bump OVN to 24.09.2-14 for FDP-1131 - - 3af5ebbc 2025-01-28T20:25:24-05:00 Check if cluster manager controller has retry pod framework - - d108b05b 2025-01-24T22:02:12+01:00 Revert "hard code disable-udn-host-isolation to "true"" - - 41eaacfa 2025-01-21T10:32:09+01:00 Bump OVN to ovn24.09-24.09.1-10.el9fdp - - 979d3dc2 2024-12-10T08:21:42+00:00 Updating ose-ovn-kubernetes-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/4b2f673ee2d572dfbfc158903fc5067e552d0f31/images/ose-ovn-kubernetes.yml - - 52116562 2024-12-06T01:15:32+00:00 Updating ovn-kubernetes-microshift-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ovn-kubernetes-microshift.yml - -- ovn-kubernetes image-arm64 aeea3396792eb20e7caa8e7f67d19a1be7889512 to be9ebb4375b3796660017ac0431f5c9bfa8b4bdb - - def29099 2025-05-07T16:13:56+02:00 Revert "e2e: connect to host-networked pod from localnet" - - b3760a19 2025-05-07T16:13:23+02:00 Revert "Add flow for host -> localnet on same node" - - c24ff47c 2025-04-28T12:49:01+02:00 Add e2e test for udn advertised pod to kapi service - - 1da9f0b7 2025-04-28T12:49:01+02:00 Sync the gateway flows immediately for BGP and UDN - - 75dd73fb 2025-04-28T12:40:14+02:00 Isolate default network services from UDN pods - - 46be1414 2025-04-25T10:53:33+02:00 Refactor constructUDNVRFIPRules - - fbef8b1e 2025-04-25T10:53:33+02:00 Configure isolation and routes for during network addition - - ad9b1688 2025-04-25T09:56:25+02:00 cni: Do not expose the node's OVN bridge-mappings - - 3b4d4812 2025-04-25T09:56:25+02:00 ovnkube: Intilize OVS client when runMode=node & for OVS metrics - - c85774bd 2025-04-25T09:56:25+02:00 localnet: Make sure bridge mapping is valid - - ea10061d 2025-04-22T19:34:08+02:00 Block local processes from accessing the UDNs subnets - - 04f043d0 2025-04-21T20:38:13+00:00 docs: Use official logo - - 54f46626 2025-04-20T17:12:43+09:00 Make additional documentation changes - - e810f692 2025-04-16T18:11:55+00:00 .github/workflows/docs.yml: install mkdocs-awesome-pages-plugin - - eabf5c2b 2025-04-16T18:11:55+00:00 Partially revert "awesome-pages is not awesome-nav :/" - - f607624a 2025-04-16T18:11:55+00:00 update requirements.txt to use minify-html - - 314f483c 2025-04-16T19:09:54+03:00 test,e2e: Test pod connectivity over localnet using CUDN CR - - ef20f884 2025-04-16T19:09:51+03:00 test,e2e: CUDN CRD CEL validation tests - - a59d8f9e 2025-04-16T18:31:56+03:00 docs: Update CUDN CRD API reference - - 87e93352 2025-04-16T18:31:55+03:00 udn, nad template: Set explicit default MTU for locanet topology - - 8efb425d 2025-04-16T18:30:10+03:00 udn, nad template: Support localnet topology - - 9e65068d 2025-04-16T15:17:57+00:00 helm: Remove ovnkube-identity.replicas - - 3ee3201d 2025-04-16T15:17:49+00:00 upgrade-ovn.sh: ovnkube-identity is now a DaemonSet - - b1525c32 2025-04-16T15:40:55+02:00 e2e: connect to host-networked pod from localnet - - 0ee80bf9 2025-04-16T15:40:55+02:00 Add flow for host -> localnet on same node - - 2c7ba782 2025-04-16T00:01:36+02:00 Import BGP routes to UDN when EgressIP is advertised - - a091f10e 2025-04-15T22:55:06+02:00 kv, e2e: Test nftables is blocking RAs - - a1fdce28 2025-04-15T22:53:46+02:00 UDN: Filter RA according local GW Router LLA only to avoid multi path - - 8277698e 2025-04-15T09:35:17-07:00 symlink docs/governance/* to identical files in / - - 10ebf89c 2025-04-15T16:40:34+01:00 chore: update footer with trademark disclaimer - - 484f1c55 2025-04-15T16:28:57+02:00 e2e, kv: Use f39 for primary UDN - - 4818f220 2025-04-15T16:28:57+02:00 e2e, kv, udpn: Check ipv6 gateway is reconciled - - f8474e1b 2025-04-15T16:28:57+02:00 kubevirt, l2, ipv6: wire up lm gateway reconciler - - 554e5710 2025-04-15T16:28:57+02:00 kubevirt: Add ipv6 default gw reconciler - - 740772d2 2025-04-15T16:28:57+02:00 util, net: Add ipv6 RA's helpers - - ad2d2635 2025-04-14T21:55:50-07:00 Convert to DaemonSet and fix update strategy of ovnkube-identity pods - - 817186b6 2025-04-14T14:24:38-07:00 update requirements.txt to use minify-html - - dde4c477 2025-04-11T22:19:33+02:00 routeimport: account for CUDN network name prefix - - 752b7b20 2025-04-11T20:53:49+02:00 Check GetNADs length - - 059e3c6b 2025-04-11T20:53:49+02:00 Add BGP support for Layer2 primary UDN in SGW - - e9289b1e 2025-04-11T13:32:32+02:00 Add an unreachable default route for a UDN - - 1b1f7131 2025-04-11T13:32:32+02:00 Remove default route if UDN network is advertised on its own VRF - - 59656d82 2025-04-11T12:33:35+02:00 Adapt e2e tests to new universal network selector API - - 2af5f56b 2025-04-11T12:33:35+02:00 RouteAdvertisements: switch label selectors to standard convention - - 65188add 2025-04-11T12:33:35+02:00 RouteAdvertisements: update API to use universal NetworkSelector - - 58e5d3fb 2025-04-11T12:33:35+02:00 Add universal NetworkSelector API - - 2d647a2c 2025-04-10T18:32:10+02:00 Revert "Add universal NetworkSelector API" - - c177b355 2025-04-10T18:32:10+02:00 Revert "RouteAdvertisements: update API to use universal NetworkSelector" - - d5e38207 2025-04-10T18:32:10+02:00 Revert "RouteAdvertisements: switch label selectors to standard convention" - - 23a9876e 2025-04-10T18:27:56+02:00 RouteAdvertisements: switch label selectors to standard convention - - 396ad2c4 2025-04-10T18:27:56+02:00 RouteAdvertisements: update API to use universal NetworkSelector - - 3bb6054a 2025-04-10T18:27:56+02:00 Add universal NetworkSelector API - - dae3da16 2025-04-10T10:57:29+02:00 Add E2Es for testing isolation between BGP advertised networks - - e6a2e98b 2025-04-09T22:52:56+02:00 kind: check minimum version available - - a7d2ca18 2025-04-09T14:07:17+03:00 ut, pod annotations: Fix typo - - 96146722 2025-04-09T14:07:16+03:00 allocator, pod: Add ipv6 lla gateway for l2 udpn - - 082457cd 2025-04-09T10:49:29+03:00 udn, nad template: Move l2 validations closer to each other - - 1466f211 2025-04-09T10:49:29+03:00 crds,udn: Allow NetworkRole Secondary only for Localnet topology - - 53f0e16a 2025-04-09T10:49:29+03:00 crds,udn: Allow NetworkTopology Localnet for CUDN CRs only - - 6d68ba40 2025-04-09T10:49:24+03:00 crds,cudn: Support localnet topology - - 9d76591e 2025-04-08T19:51:39+00:00 helm: use version v3.17.2 - - f7db1c20 2025-04-08T19:51:31+00:00 kind: move KIND_IMAGE and K8S_VERSION to set_common_default_params - - c386b357 2025-04-08T19:47:36+00:00 github/workflows/test.yml: add network-segmentation to e2e matrix - - cdacd52d 2025-04-08T19:47:36+00:00 Network Segmentation: Sync up rbacs for helm - - 71481d14 2025-04-08T19:47:36+00:00 Network Segmentation: Add flag to enable the feature in helm - - 3ad7f01d 2025-04-08T08:49:14-07:00 add job to test github pages deployment - - 27033e32 2025-04-07T15:24:32+02:00 EIP no reroute: allow multiple entries for pod to pod and pod to join - - f76582f4 2025-04-03T20:00:36+02:00 ci: fix actions/setup-go@v5 warnings - - 837a638b 2025-04-03T20:00:36+02:00 ci: fix submit code coverage to Coveralls - - a3d569aa 2025-04-03T20:00:36+02:00 kind: rely on --force when removing containers and networks - - 5f86091e 2025-04-03T20:39:38+03:00 docs,okeps: Localnet API - - cca01b1a 2025-04-03T10:35:42+02:00 Explicitly probe for frr-k8s webhook readiness - - 59cd6c0c 2025-04-03T10:19:08+02:00 node, metrics: Replace depracated option with equivalent - - 6061601d 2025-04-02T13:12:44+02:00 ci: set /mnt/docker-data as docker storage - - 8025dac7 2025-04-02T13:12:44+02:00 ci: use go.mod for actions/setup-go - - f5f88eab 2025-04-02T13:12:44+02:00 Fix UDN gateway panic when DelNetwork fails - - 99a11763 2025-04-02T13:12:44+02:00 Bump test/e2e to k8s v1.32.2 - - 03745808 2025-04-02T13:12:44+02:00 Bump go-controller go v1.23, k8s v1.32.3 and linter - - 08663ad2 2025-03-31T09:23:11+02:00 Dockerfile: Bump OVS version to 3.5.0-0.9 - - 96ab6ace 2025-03-25T17:26:48+00:00 Updating ose-ovn-kubernetes-base-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/6d536f5ca5a55ea4d382766403635c15d18becf3/images/ovn-kubernetes-base.yml - - b12fcd94 2025-03-24T19:20:21+07:00 E2Es for net seg: remove KinD specific Node selector - - f92b3022 2025-03-23T18:00:33+02:00 util: Add ipv6 lla gateway pod annotation field - - 993ec0dc 2025-03-23T18:00:33+02:00 ut, pod annotations: Align test configuration - - 9c4499b0 2025-03-20T14:51:14+01:00 Update OVN to FDP25.A.1 24.09.2-41. - - 00c54f2b 2025-03-20T16:52:20+09:00 Fix the commands for image build in the docs and script. - - 764685a5 2025-03-19T18:09:35+08:00 unpin libreswan version - - 976a3c6a 2025-02-04T10:56:32-05:00 Bump OVN to 24.09.2-14 for FDP-1131 - - 3af5ebbc 2025-01-28T20:25:24-05:00 Check if cluster manager controller has retry pod framework - - d108b05b 2025-01-24T22:02:12+01:00 Revert "hard code disable-udn-host-isolation to "true"" - - 41eaacfa 2025-01-21T10:32:09+01:00 Bump OVN to ovn24.09-24.09.1-10.el9fdp - - 979d3dc2 2024-12-10T08:21:42+00:00 Updating ose-ovn-kubernetes-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/4b2f673ee2d572dfbfc158903fc5067e552d0f31/images/ose-ovn-kubernetes.yml - - 52116562 2024-12-06T01:15:32+00:00 Updating ovn-kubernetes-microshift-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ovn-kubernetes-microshift.yml +- operator-framework-olm embedded-component 969a7e031a97a7e12424b5d292f345a168b73e38 to fc45750531908c70a18556439b5147d8cae6a93f + - 63168ab2 2025-06-12T21:03:24+00:00 reduce cache expiriry frequency (#3591) diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index aeda477288..37cf861b73 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -14,7 +14,7 @@ https://github.com/openshift/kubernetes embedded-component 84b31a33f3dd1a585589e https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 8dec42d36f9e26487112aeac870767a5fedb8021 https://github.com/openshift/machine-config-operator embedded-component 42e953adc94db23f0d10d057ec6046e23ed900a6 https://github.com/openshift/openshift-controller-manager embedded-component 1f76c23407c6cc95902a4b4d8f679181df538d9d -https://github.com/openshift/operator-framework-olm embedded-component 969a7e031a97a7e12424b5d292f345a168b73e38 +https://github.com/openshift/operator-framework-olm embedded-component fc45750531908c70a18556439b5147d8cae6a93f https://github.com/openshift/route-controller-manager embedded-component ce6ffa24dac3a5f49f70818e1159e40eaf27a6a3 https://github.com/openshift/service-ca-operator embedded-component 30efb529a5b7db5d6f352f6ac0470d8385268539 https://github.com/openshift/oc image-amd64 04e91ac526244524a03fbd516d36682462af7566 From 7d15bce069afc28dcda3e32bab8fe9a8c630fd62 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 3 Jul 2025 04:26:53 +0000 Subject: [PATCH 3/4] update manifests --- assets/optional/multus/release-multus-aarch64.json | 2 +- assets/optional/multus/release-multus-x86_64.json | 2 +- .../operator-lifecycle-manager/kustomization.aarch64.yaml | 8 ++++---- .../operator-lifecycle-manager/kustomization.x86_64.yaml | 8 ++++---- .../operator-lifecycle-manager/release-olm-aarch64.json | 6 +++--- .../operator-lifecycle-manager/release-olm-x86_64.json | 6 +++--- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 8f259e8b23..d44545df5c 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2025-06-28-192014" + "base": "4.18.0-0.nightly-arm64-2025-06-30-210820" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:82a7423a704ace49aae917d7e8f84e593070ab435ca9da3b81b7d0d3f2569838", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 24a64cb4ac..1ab20f1fb1 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-2025-06-28-192013" + "base": "4.18.0-0.nightly-2025-06-30-210820" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3292c5d36598b0e8211f4d14a1e962097b737134e764030661a26e2c69ba7950", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index a58df1b9a7..066e4a658c 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:f624b7b9d37b3cc43480ddc1acdfc2f6740f0d43f96622e7749639319addbeb9 + digest: sha256:f36bfdef2211f083e38b9ee6b8d0c903287304bf2b5e247e0fab498b0f1a07a2 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:9663b452a4a09fdb65bfb13cd58fadc678f844185ac96d67047fe376a4ef3471 + digest: sha256:c38d95a36eaab5739e861de48fdda348995ddf4ee5b685c6872caaec9cdba7e5 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:136c4dd85cd884a3c191a2ad85e9064597acb4f96c3902ca958a42b52742b481 @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9663b452a4a09fdb65bfb13cd58fadc678f844185ac96d67047fe376a4ef3471 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c38d95a36eaab5739e861de48fdda348995ddf4ee5b685c6872caaec9cdba7e5 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f624b7b9d37b3cc43480ddc1acdfc2f6740f0d43f96622e7749639319addbeb9 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f36bfdef2211f083e38b9ee6b8d0c903287304bf2b5e247e0fab498b0f1a07a2 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 2503e9e158..47cd9b7c8d 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6cba0d041d22c4b99c402da085c617d9103b89ce9471a876aa61a5a51314cd05 + digest: sha256:a659790a0c97d83e07303cb25849870cb229e8df5ca93f7b69d2c8af8bec8046 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:cb8edecf4c19f0d59372f2027853229bba7354ab9babaed28d51da285c40da16 + digest: sha256:fcdb940b14424e51f7ea0c4e5a899528fe722a55b630ffe7b6d697359f2c6ddb - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:a4606efa39f5046fe06fc0ccff329291620f439226f7e7b1530ef7978cc2d9ca @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb8edecf4c19f0d59372f2027853229bba7354ab9babaed28d51da285c40da16 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcdb940b14424e51f7ea0c4e5a899528fe722a55b630ffe7b6d697359f2c6ddb - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cba0d041d22c4b99c402da085c617d9103b89ce9471a876aa61a5a51314cd05 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a659790a0c97d83e07303cb25849870cb229e8df5ca93f7b69d2c8af8bec8046 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 12796310b8..856dc24354 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2025-06-28-192014" + "base": "4.18.0-0.nightly-arm64-2025-06-30-210820" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f624b7b9d37b3cc43480ddc1acdfc2f6740f0d43f96622e7749639319addbeb9", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9663b452a4a09fdb65bfb13cd58fadc678f844185ac96d67047fe376a4ef3471", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f36bfdef2211f083e38b9ee6b8d0c903287304bf2b5e247e0fab498b0f1a07a2", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c38d95a36eaab5739e861de48fdda348995ddf4ee5b685c6872caaec9cdba7e5", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:136c4dd85cd884a3c191a2ad85e9064597acb4f96c3902ca958a42b52742b481" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index af54324135..7db6922def 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.18.0-0.nightly-2025-06-28-192013" + "base": "4.18.0-0.nightly-2025-06-30-210820" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cba0d041d22c4b99c402da085c617d9103b89ce9471a876aa61a5a51314cd05", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb8edecf4c19f0d59372f2027853229bba7354ab9babaed28d51da285c40da16", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a659790a0c97d83e07303cb25849870cb229e8df5ca93f7b69d2c8af8bec8046", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcdb940b14424e51f7ea0c4e5a899528fe722a55b630ffe7b6d697359f2c6ddb", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4606efa39f5046fe06fc0ccff329291620f439226f7e7b1530ef7978cc2d9ca" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 7206ff0972..b00ca9105f 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2025-06-28-192014" + "base": "4.18.0-0.nightly-arm64-2025-06-30-210820" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0475d64ba6eb95caa3e5eb188cd13dba82548f4774dfaecc694ccb0ceb144898", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 7619d024f1..b6dd1bba53 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-2025-06-28-192013" + "base": "4.18.0-0.nightly-2025-06-30-210820" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9af44e96140328139d74de2166b57ebbefaf0872745be8c56364a6280206793", From bb2105319b78134f8dcd11b4527e425223c3d558 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 3 Jul 2025 04:27:12 +0000 Subject: [PATCH 4/4] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 82414d0aa7..99cd009a35 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2025-06-28-192014 +OCP_VERSION := 4.18.0-0.nightly-arm64-2025-06-30-210820 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 4a8320f6dd..c8e2b21ed9 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2025-06-28-192013 +OCP_VERSION := 4.18.0-0.nightly-2025-06-30-210820