From 8baf3ade4e839229a2761e111eb53fcb1235f9a5 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Aug 2026 04:27:40 +0000 Subject: [PATCH 01/10] 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 d9c16a53fe..3d2c9e09e0 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.21.0-0.nightly-2026-07-29-083019" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-07-30-012031" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2026-08-18-080928" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-08-19-232254" From 59007f058cf45fe0985b23eb1a87816528c3d528 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Aug 2026 04:27:40 +0000 Subject: [PATCH 02/10] update changelog --- scripts/auto-rebase/changelog.txt | 436 +++++++++++++++++++++++++++++- scripts/auto-rebase/commits.txt | 26 +- 2 files changed, 447 insertions(+), 15 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 5a8e7d6a8a..fff737fd68 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,435 @@ -- cluster-ingress-operator embedded-component a61dd582e6d93dd45dc75476dacb22907d5294a3 to 172349116c92d6b0d9cf56610be99de2115ae726 - - 98f5ae0 2026-07-27T15:58:00Z E2E test for internal LB creation +- cluster-ingress-operator embedded-component 172349116c92d6b0d9cf56610be99de2115ae726 to 3da316787326c64b8e844f7cb7da3a05b78a1337 + - a59b6c2 2026-07-22T14:43:01Z OCPBUGS-77457: Respect proxy configuration on gwapi provisioning + +- cluster-network-operator embedded-component 72b5cba20082e859643ae3c4fc4e83ef2ae6fe20 to 2013b3f580678672cc08f41d00f64ba1547acbeb + - ca1e834 2026-08-11T12:56:51Z OCPBUGS-83863: Copy only files in cnibincopy.sh, skip subdirectories + - 2c3be33 2026-08-11T12:56:51Z OCPBUGS-83863: Remove version-specific CNI binary copy logic + - 8a46393 2026-07-24T16:53:27Z Bump frr-k8s MAX_FDS from 1024 to 65536 + +- etcd embedded-component 806f690e1f140e0aea2eb05ef5f288b756b62895 to b6dda5413ec33fc88fc9751d98d3b4bd96ea877d + - 0ff063b9 2026-07-30T23:13:10Z UPSTREAM: 21443: Revert "Reuse events between sync loops" + +- kubernetes embedded-component ba6535cbb8719c3ba6c3923f2725ba050c87faab to 7ffd39de9bbb8e3edca8ee7530cf1dab522fbce2 + - 69b0654c3 2026-08-13T00:18:08Z UPSTREAM: : Update openshift-hack/rebase.sh, REBASE.openshift.md + +- machine-config-operator embedded-component 0ba66a27bc734f20b2982d2d874b8bada58b78fd to db84d8368ef78e50f3bc0961dcf2b27a7975e053 + - e11ffee5 2026-08-13T16:16:51-04:00 vsphere: check secret before mutating template + - b2287b35 2026-08-13T16:15:57-04:00 vsphere: scope template lookup to folder + - 341b015d 2026-08-06T11:17:26-04:00 bootimage: degrade when vsphere fd not found + - 1eee70fd 2026-08-06T11:14:22-04:00 bootimage: fix vSphere new fd reconciliation + - c62c9111 2026-08-06T04:41:56Z chore: update AMIs + +- oc image-amd64 0276efa6de22b45e3c2915423fd203555382ff1c to 0aac049d01cfc3af876c5338576144773cbfa969 + - d85baabd 2026-08-05T09:51:04+02:00 Revert "Merge pull request #2310 from ricardomaraschini/OCPBUGS-98550" + +- router image-amd64 dc4c01d494f572773a05e82bffd19c2cdaf8dce9 to 22531cf0bb2435e73437be73c244913de4844812 + - 04e595f 2026-07-22T16:50:51+05:30 OCPBUGS-86729: Run go mod tidy and vendor for dependency update + - 389b9ac 2026-07-22T16:34:19+05:30 OCPBUGS-86729: Prevent SSRF via FQDN-typed EndpointSlices + +- ovn-kubernetes image-amd64 9f20d9cb39b32feb1dc2d4b1b33e686c9a3d8d9b to cf0788990aa2a2303189cc68edf785dfef5dd18f + - efcadbf9 2026-08-10T23:21:10+05:30 Revert "OCPBUGS-83863: Remove RHEL 8 build stage and version-specific CNI directories" + - d0fcfebb 2026-08-10T22:17:56+05:30 Update replace block in openshift/go.mod + - 6f6575a2 2026-08-10T14:45:16+02:00 Reserve platform port tunnel IDs 1-9 to avoid northd full recomputes + - 76b53a94 2026-08-10T14:38:14+02:00 Fix race in cm setTopologyType for fresh clusters + - c0740b76 2026-08-10T14:28:32+02:00 Add static kernel neighbor entries for UDN masquerade IPs + - d4cb48ec 2026-08-10T14:28:32+02:00 e2e: verify NO_FLOOD, priority-12, and priority-11 ARP/NDP flows for CUDNs + - 32634217 2026-08-10T14:28:32+02:00 test: reset config in TestOpenFlowManagerSyncsUplinkBridgeFlows + - bae8c0fa 2026-08-10T14:28:31+02:00 Fix ARP/NDP storm and FDB learning for CUDN GRs on breth0 + - ffd4c142 2026-08-10T11:05:30+02:00 e2e: fail control-plane runs that select zero specs + - ccf69490 2026-08-10T11:05:30+02:00 e2e: cover split DPU UplinkState condition ownership and recovery + - a16889f1 2026-08-10T11:05:30+02:00 util: unify MAC validity checks on IsUsableEthernetMAC + - 10d1023f 2026-08-10T11:05:30+02:00 Uplink: reject host interfaces without a usable MAC address + - f84a810e 2026-08-10T11:05:30+02:00 Uplink: retry discovery with backoff while unresolved + - f804f573 2026-08-10T11:05:30+02:00 Uplink: one writer per UplinkState condition in split DPU mode + - 13bc66a8 2026-08-07T18:53:35+02:00 [crd] Fix APBR comment + - 7c524476 2026-08-07T16:12:15+02:00 node: tolerate ExternalIP delete OpenFlow resync + - a4482ed6 2026-08-07T16:12:15+02:00 ovn: mark no-overlay cluster SNATs with DB IDs, clean up stale ones + - 1215fc2e 2026-08-07T16:12:15+02:00 ovn: fail SNAT creation when exemption address set is missing + - 26a9862e 2026-08-07T16:12:15+02:00 ovn: sync no-overlay SNAT exemptions before gateway NATs + - 559ee8b2 2026-08-07T16:12:15+02:00 libovsdb: ignore exempted_ext_ips when matching NATs + - 223c8c13 2026-08-07T14:59:35+05:30 docs: add mike-based multi-version docs publishing + - f7c5a957 2026-08-06T07:06:32-07:00 clustermanager: test inactive L2 transit router nodes + - bb92207b 2026-08-05T14:09:42+02:00 RA controller: make config error messages deterministic + - 00434fca 2026-08-05T14:09:42+02:00 RA controller: refresh status when failure reason or message changes + - 64f55117 2026-08-04T17:57:33+02:00 coderabbit: update definition of geenrated files. + - 19c90720 2026-08-04T17:57:33+02:00 UT: add EF SSA test for the NewClientset + - 211606a8 2026-08-04T17:57:27+02:00 update-codegen: check openapi-gen errors + - e8cbfc1e 2026-08-04T17:57:27+02:00 run update-codegen + - 35ffeca0 2026-08-04T17:57:20+02:00 Update update-codegen to generate SSA-compatible fake clients + - 3862ea30 2026-08-04T10:03:58-04:00 OCPBUGS-83863: Remove RHEL 8 build stage and version-specific CNI directories + - b1ab6276 2026-08-04T10:10:45+02:00 Revert "Get pod from apiserver on retryable annotation patch failure" + - 1f721cd8 2026-08-03T14:00:54-07:00 clustermanager: advertise dynamic L2 with transit router + - e1a2a9be 2026-08-03T10:25:06-04:00 clustermanager: re-evaluate egress IPs when cloud egress-ipconfig annotation changes + - d632294a 2026-08-03T10:25:06-04:00 util: add CloudEgressIPConfigAnnotationChanged helper + - 0a2e4e82 2026-08-03T11:55:20+02:00 node/uplink: ignore host representors when deriving the bridge uplink + - 540db4d4 2026-08-03T11:55:20+02:00 util: treat all-zero devlink function hw_addr as unset + - 4656af94 2026-08-03T11:55:20+02:00 bridgeconfig: select DPU gateway representor by host peer MAC + - 5a6bdc29 2026-08-03T11:55:20+02:00 node/uplink: resolve DPU bridges for VF and SF host interfaces + - 17c7662f 2026-07-31T19:03:32+05:30 ci: Use lint target of Makefile in lint lane + - cf911518 2026-07-31T14:09:18+05:30 Updating ovn-kubernetes-microshift-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/ovn-kubernetes-microshift.yml + - 3a8f25c9 2026-07-31T14:09:18+05:30 Updating ose-ovn-kubernetes-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/ose-ovn-kubernetes.yml + - 2e16b2ab 2026-07-31T14:08:48+05:30 Updating ose-ovn-kubernetes-base-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/7e3068230c1b2ba349579903983c811993b92820/images/ovn-kubernetes-base.yml + - f0321d17 2026-07-31T14:08:21+05:30 sync test annotations with upstream changes and version bump + - 6bcaede5 2026-07-30T14:27:48+02:00 docs: add Uplink feature flag to the docs + - 5994d6cc 2026-07-30T13:42:03+02:00 Uplink: report an error on CUDN that uses Uplink when flag is disabled + - 242c552a 2026-07-30T13:42:03+02:00 Enable Uplink in UT + - 8870fa49 2026-07-30T13:42:03+02:00 Wire uplink enabling through the helm and CI + - e776c689 2026-07-30T13:41:59+02:00 Add an uplink feature flag + - 1b9fb6df 2026-07-30T11:54:14+02:00 Update isEgressIPForUDNSupported to use IsNetworkSegmentationSupportEnabled + - 44c16294 2026-07-30T10:48:40+02:00 CI: add verify-codegen job to ensure generated code is not stale. + - 9c4e9095 2026-07-30T10:48:32+02:00 crd/uplink: update-codegen + - 8f64a3c4 2026-07-30T10:48:25+02:00 update-codegen: only list directories under crd/ + - 34e95eea 2026-07-30T11:19:02+03:00 docs: fix LocalnetConfig excludeSubnet GODOC and API reference doc + - 5d9782c7 2026-07-29T10:03:36+02:00 docs: document interface-defined BGP neighbors for route advertisements + - 8f84451c 2026-07-29T10:03:36+02:00 RA controller: advertise both families to unnumbered BGP neighbors + - b32e1110 2026-07-29T10:01:52+02:00 RA controller: fix raw FRR config for unnumbered BGP neighbors + - 11feeba5 2026-07-28T12:20:22-07:00 nooverlay: emit events on the configured default NAD + - ddbfebb2 2026-07-28T12:20:22-07:00 udn: Honor MAC requests on primary layer3 networks + - c7aa9825 2026-07-28T12:20:22-07:00 config: make default network NAD configurable + - ce712a9c 2026-07-28T13:41:34-04:00 Bump golang.org/x/crypto to v0.52.0 + - 62298e9d 2026-07-28T17:43:59+02:00 e2e: fix cross-UDN same-node nodeport test expectations per gateway mode + - 6568c450 2026-07-28T17:27:13+02:00 Fix Layer2 UDN same-node nodeport: use correct transit router port prefix + - f23d1d79 2026-07-28T17:27:13+02:00 Fix UDN masquerade ARP storm on external network + - cf7b1551 2026-07-27T07:52:40+02:00 ovspinning: remove pmd-cpu-mask from affinity + - 6bf19da7 2026-07-27T07:52:39+02:00 ovspinning: Only skip PMD threads if DPDK is enabled + - 41f27e4f 2026-07-27T07:52:39+02:00 ovspinning: skip OVS PMD threads if any + - 5ba4f536 2026-07-26T17:57:00+02:00 kind: use v1.36.1 node image until v1.36.2 is published + - 86421ba8 2026-07-24T14:46:46-07:00 ovn: complete egress node setup during reconciliation + - 314cbc04 2026-07-24T10:52:40-07:00 Restore DPU route import VRFs without Uplinks + - ab615f50 2026-07-24T12:18:59-04:00 egressip: migrate iptables manager to nftables + - 1b512fe1 2026-07-24T15:56:26Z Consolidate syncUDNIsolation into a single predicate scan + - 399f3ef8 2026-07-24T15:56:26Z Refactor deleteStaleMasqueradeRouteAndMACBinding to use router-scoped ops + - fd611011 2026-07-24T15:56:26Z Add upgrade migration for switch-based drop ACL to port group + - 80e969ef 2026-07-24T15:56:25Z Move advertised network drop ACL from switches to port group + - 4f32c7a2 2026-07-24T15:56:25Z Centralize router-to-switch and switch-to-router port naming into NetInfo + - e3f56978 2026-07-24T13:42:21Z Add PortGroupAdvertisedNetwork type and create PG in ConfigureAdvertisedNetworkIsolation + - d56fb7ff 2026-07-24T13:42:20Z Add EnsureAddressSetOps to AddressSetFactory interface + - 763ce2d4 2026-07-24T13:42:20Z Refactor: extract advertised network isolation init and cleanup helpers + - abe1ae2a 2026-07-23T18:16:46-04:00 Make DPU the sole Uplink gateway status writer + - 1d40e849 2026-07-23T15:28:03+02:00 ovn: fix flaky timing in NBDB-outage node retry unit tests + - 1d8befc7 2026-07-23T18:55:00+05:30 makefile: Fix lint to run when Makefile is invoked from another directory + - ed591bf5 2026-07-23T13:00:53+05:30 lint: use documented golangci-lint installer URL + - df6b3213 2026-07-23T13:00:53+05:30 lint: satisfy govet inline analyzer + - c0b63511 2026-07-23T13:00:53+05:30 test: move VTEP mocks out of generated CRD tree + - e9c15e8c 2026-07-23T13:00:53+05:30 codegen: fix generated manifests for Kubernetes 1.36 + - 7d693c53 2026-07-23T13:00:53+05:30 kind: use kubeadm v1beta4 patches for Kubernetes 1.36 + - 3b2d1a6d 2026-07-23T13:00:53+05:30 metallb: upgrade for Kubernetes 1.36 CRD validation + - 2324d2a1 2026-07-23T13:00:53+05:30 networkqos: use int64 schema for bandwidth fields + - 88d46dd8 2026-07-23T13:00:53+05:30 kind: upgrade to v0.32.0 for Kubernetes 1.36.2 + - cdc5c211 2026-07-23T13:00:53+05:30 deps: bump Kubernetes dependencies to 1.36.2 + - 15f16271 2026-07-23T12:44:47+05:30 Removing the duplicate word from the Error message + - 19b3ab36 2026-07-22T10:42:23+02:00 Remove redundant JSON unmarshal in SecondaryNetworkPodIPs + - f1434be2 2026-07-22T10:42:21+02:00 Optimize cleanupStalePodSNATs for scale + - 6556a867 2026-07-22T09:20:32+02:00 Filter namespaces not served by network controller + - 8a0fb2a9 2026-07-22T09:20:32+02:00 Use set-based lookup in hasOnlyAddresses + - d41e4256 2026-07-21T15:31:28-07:00 udn: add VRF routes for all UDN cluster subnets + - 69b3b1e6 2026-07-21T18:17:25-04:00 ci: Add image name to the e2e job name + - baa9c191 2026-07-21T18:23:32+02:00 unidling: fail controller creation when SB client cache is nil + - 959990e0 2026-07-21T10:50:40+02:00 Fix map-order flake in DPU host representor test + - d419656e 2026-07-21T09:55:40+02:00 Stabilize CUDN count metric deletion test + - f1285a42 2026-07-20T10:01:45+05:30 Fix typos in error messages + - 9b25d569 2026-07-18T10:36:35-04:00 Stabilize RouteAdvertisements preservation test + - cfdefcbb 2026-07-17T15:33:40-04:00 Stabilize transit switch IP reallocation test + - 468e83d3 2026-07-17T14:41:11-04:00 Restore simulated DPU devices when Pod state is gone + - 6ddcae93 2026-07-17T14:41:11-04:00 Aggregate Uplink gateway readiness for active CUDNs + - 53f9829f 2026-07-17T14:41:11-04:00 Update UplinkState identity and readiness semantics + - e834d672 2026-07-17T14:41:11-04:00 Fix focused Network Segmentation E2E selection + - 40d46e86 2026-07-17T14:41:11-04:00 Allow disjoint Dynamic CUDNs to share an Uplink + - 2e9c69ff 2026-07-17T14:35:32-04:00 Reject default gateway bridge as an Uplink + - d48fd1ab 2026-07-17T14:35:32-04:00 Add Uplink feature documentation + - 74477f60 2026-07-17T14:35:32-04:00 Fix RouteAdvertisements optional feature handling + - af6ec975 2026-07-17T14:35:32-04:00 Disable bridge netfilter for KIND BGP tests + - a8aa27cf 2026-07-17T14:35:32-04:00 Add Uplink e2e coverage + - cf20ae1b 2026-07-17T14:35:32-04:00 Reject Uplink outside shared gateway mode + - 38934225 2026-07-17T14:35:32-04:00 Resolve DPU Uplink bridges from host state + - 93aa53d5 2026-07-17T14:35:32-04:00 Enslave Uplink gateway interfaces to UDN VRFs + - 79cbe159 2026-07-17T14:35:32-04:00 Use Uplink bridges for UDN gateway plumbing + - b85da74d 2026-07-17T14:35:32-04:00 Teach OpenFlow manager about Uplink bridges + - 09a9359b 2026-07-17T14:35:32-04:00 Add unmanaged Uplink bridge configuration + - e3fbeb17 2026-07-17T14:35:32-04:00 Use UplinkState for CUDN gateways + - 848f9cc7 2026-07-17T14:35:32-04:00 Add node UplinkState discovery + - 9e195884 2026-07-17T14:35:32-04:00 Add Uplink cluster-manager controller + - 3c841452 2026-07-17T14:35:32-04:00 Wire Uplink API plumbing + - 82fc4de5 2026-07-17T14:30:25-04:00 Add Uplink API types + - 51047fae 2026-07-17T20:27:56+05:30 sync test annotations with upstream changes + - b05c351c 2026-07-17T20:27:53+05:30 Adapt OTE for E2E L3 CUDN multisubnet backward compatibility fixes + - 87839345 2026-07-17T16:07:27+02:00 util: wait for the bridge to inherit the NIC MAC address in NicToBridge + - cc5d2484 2026-07-17T15:23:34+02:00 Stop allocating L2 node tunnel IDs when transit router is used + - 11a9197e 2026-07-17T15:06:24+05:30 managedbgp: refactor to use GenerateName and unified labeling + - c5353747 2026-07-17T15:06:24+05:30 no-overlay: add CUDN support for no-overlay managed routing + - 70a2009b 2026-07-17T10:23:14+02:00 e2e(kubevirt): deflake "with pre-copy fails" migration test + - 47a35e07 2026-07-16T17:30:29-04:00 docs: update VRF-Lite uplink status OKEP + - 85348ff8 2026-07-16T13:37:17-04:00 ci: run a control-plane lane with ubuntu images + - fa8e140a 2026-07-16T15:33:44+02:00 Fix traffic leak in egress IP on secondary interface + - 8bce7389 2026-07-16T10:32:40+02:00 node: use libovsdb instead of ovs-vsctl exec in checkPorts + - 7b2e6eb5 2026-07-16T00:32:34+02:00 ci: cover dynamic UDN allocation on a no-overlay shared-gateway lane + - 1b7e0ec0 2026-07-16T00:32:34+02:00 e2e: adapt advertised network isolation tests to dynamic UDN allocation + - 156b75f9 2026-07-16T00:32:34+02:00 e2e: adapt CUDN advertisement tests to dynamic UDN allocation + - 501cc079 2026-07-16T00:32:34+02:00 e2e: cover RouteAdvertisements over a dynamically allocated CUDN + - 8df86599 2026-07-16T00:32:34+02:00 routeadvertisements: advertise dynamic UDNs only from active nodes + - 6a73851e 2026-07-15T14:34:58-04:00 build(deps): bump the go_modules group across 3 directories with 1 update + - 677d6113 2026-07-15T10:03:52-07:00 clustermanager: rename node allocation controller + - 5c9606a8 2026-07-15T19:10:30+05:30 openshift: fix lint issues + - 1fcfb18f 2026-07-14T16:09:34-04:00 no-overlay: host -> pods on other nodes via mp0 + - f49764be 2026-07-14T20:50:36+02:00 docs: add AGENTS.md for go-controller/pkg and CRDs + - 4620cb6d 2026-07-14T10:29:15-07:00 licenses: refresh generated third-party licenses + - 8b0dd877 2026-07-14T10:29:15-07:00 cni: fold libovsdb and shell-out ConfigureOVS paths into one + - 0b276e27 2026-07-14T10:29:15-07:00 libovsdb/ops: consolidate ovs helper operations + - 49393a41 2026-07-14T16:52:06+01:00 docs: rename portSecurity to macSecurity in OKEP-3926 + - 7229c04d 2026-07-14T20:27:41+05:30 node: skip configureGlobalForwarding tests in CI without root access + - 40bd24a5 2026-07-13T17:27:35+02:00 zone_interconnect: add unit test for stale IC route cleanup + - 3f34530b 2026-07-12T10:36:43+03:00 Update OWNERS file + - 60fcdaf5 2026-07-10T18:56:40+02:00 Use new IPv6 force_forwarding sysctl if available. + - 0e3a4e06 2026-07-10T18:56:40+02:00 Don't change FORWARD table default policy for IPv4 + - 7795aba2 2026-07-10T18:56:40+02:00 Don't override FORWARD default policy when `disable-forwarding` is not set + - 92fc5160 2026-07-10T18:56:40+02:00 Update disable-gateway unit tests + - a90d60b6 2026-07-10T18:56:40+02:00 Clarify/simplify/fix "Disable Forwarding Config" docs + - bdfd82fb 2026-07-10T17:48:35+02:00 Redo the AllocateLoadBalancerNodePorts=false test cases + - dcaf6dba 2026-07-10T12:46:42+02:00 [perf] fix netpol selection for cudn-l2 job + - d447e853 2026-07-10T11:17:19+02:00 Support update of chassis-id without re-creating the node. + - 0c9edf05 2026-07-08T12:59:20-07:00 ovnkube.sh: unify gateway option loading from OVS external_ids + - 945f64d7 2026-07-08T10:33:19-07:00 test: Use proper TLS certificate validation in metrics server tests + - 98e204fe 2026-07-08T13:36:28+02:00 coderabbit: add pre-merge checks and custom validation rules + - e36fbadc 2026-07-07T20:23:30+02:00 Get pod from apiserver on retryable annotation patch failure + - 06f453b7 2026-07-07T08:13:37+02:00 e2e(kubevirt): replace echoserver with iperf3 + - 853a72fa 2026-07-06T15:06:48-07:00 libovsdb/ops: document ovs-vsctl equivalents on read wrappers + - e3e40f10 2026-07-06T15:06:48-07:00 util, libovsdb/ops: migrate NicToBridge to libovsdb + - 497f470f 2026-07-06T15:06:48-07:00 test/e2e: pin docker while importing libovsdb + - c1c5603e 2026-07-06T15:06:48-07:00 util, node: migrate nicstobridge read paths to libovsdb + - 258eb623 2026-07-06T15:06:48-07:00 node/test: migrate DPU and gateway tests to libovsdb harness + - 1a64e7db 2026-07-06T15:06:48-07:00 cni, node: migrate ConfigureOVS and delRepPort to libovsdb + - 3785f7bd 2026-07-06T15:06:48-07:00 node: move ovsClient to BaseNodeNetworkController + - a58ead15 2026-07-06T15:06:47-07:00 libovsdb/ops: add GetOVSInterface and CreateOrUpdatePodPort + - ff6d3a79 2026-07-06T15:06:47-07:00 node, controllermanager: migrate stale-port cleanup to libovsdb + - 65e3926d 2026-07-06T15:06:47-07:00 node, libovsdb/ops: migrate port-to-br shell-outs to libovsdb + - f1a554fd 2026-07-06T15:06:47-07:00 node: migrate br-exists and del-port br-int to libovsdb + - 1e4c92c6 2026-07-06T15:06:47-07:00 util, ovn-kube-util: migrate BridgeToNic to libovsdb + - 79cb19da 2026-07-06T15:06:47-07:00 libovsdb/ops: bridge-scope DeletePortWithInterfaces + - fdc69950 2026-07-06T15:06:47-07:00 node, libovsdb/ops: migrate del-br shell-outs to libovsdb + - 25b05aa5 2026-07-06T20:15:26+02:00 Only create ACCEPT rules for bypassing our own DROP rules + - fe9bd9f8 2026-07-06T20:15:26+02:00 Simplify initLocalGateway iptables/nftables setup + - f7401aeb 2026-07-03T15:15:57+02:00 routemanager: normalize IPv6 route metric to kernel default + - 7683207e 2026-07-03T10:03:37+02:00 e2e(kubevirt): drop fedora coreos image in favor of fedora + - d9d3e374 2026-07-02T18:14:51+02:00 area-merge: prevent bot comment feedback loop + - 635a3fd7 2026-07-02T15:50:39+01:00 docs: add "future work" section to OKEP-3926 + - 69f3a5e7 2026-07-02T15:50:39+01:00 docs: simplify OKEP-3926 and add per-attachment future section + - 00e2aa81 2026-07-02T15:50:39+01:00 docs: add OKEP-3926 for disabling port security on secondary networks + - 4246d935 2026-07-02T17:56:19+08:00 docs: fix typo in OKEP 5193 CUDN spec + - e9ed7419 2026-07-01T15:50:28-07:00 OKEP-6227: Add DHCP IPAM support for localnet UDNs + - 78e42465 2026-07-01T10:34:35-04:00 config: make routing table ID start configurable + - b19a79d2 2026-06-30T10:59:13-04:00 Revert "Route DPU host no-overlay traffic through OVN" + - 6eac3a2e 2026-06-30T15:35:05+02:00 docs/e2e: clarify E2E backward compatibility requirements in OKEP template + - f5692f2b 2026-06-26T11:04:37-07:00 OTE: Remove duplicate EVPN test from tests.go + - 732ca5db 2026-06-26T11:04:37-07:00 OTE: Add test list validation tooling + - 585b72c2 2026-06-26T16:33:10+02:00 Allow networks to start while route advertisements settle + +- kubernetes image-amd64 ba6535cbb8719c3ba6c3923f2725ba050c87faab to 7ffd39de9bbb8e3edca8ee7530cf1dab522fbce2 + - 69b0654c3 2026-08-13T00:18:08Z UPSTREAM: : Update openshift-hack/rebase.sh, REBASE.openshift.md + +- oc image-arm64 0276efa6de22b45e3c2915423fd203555382ff1c to 0aac049d01cfc3af876c5338576144773cbfa969 + - d85baabd 2026-08-05T09:51:04+02:00 Revert "Merge pull request #2310 from ricardomaraschini/OCPBUGS-98550" + +- router image-arm64 dc4c01d494f572773a05e82bffd19c2cdaf8dce9 to 22531cf0bb2435e73437be73c244913de4844812 + - 04e595f 2026-07-22T16:50:51+05:30 OCPBUGS-86729: Run go mod tidy and vendor for dependency update + - 389b9ac 2026-07-22T16:34:19+05:30 OCPBUGS-86729: Prevent SSRF via FQDN-typed EndpointSlices + +- ovn-kubernetes image-arm64 9f20d9cb39b32feb1dc2d4b1b33e686c9a3d8d9b to cf0788990aa2a2303189cc68edf785dfef5dd18f + - efcadbf9 2026-08-10T23:21:10+05:30 Revert "OCPBUGS-83863: Remove RHEL 8 build stage and version-specific CNI directories" + - d0fcfebb 2026-08-10T22:17:56+05:30 Update replace block in openshift/go.mod + - 6f6575a2 2026-08-10T14:45:16+02:00 Reserve platform port tunnel IDs 1-9 to avoid northd full recomputes + - 76b53a94 2026-08-10T14:38:14+02:00 Fix race in cm setTopologyType for fresh clusters + - c0740b76 2026-08-10T14:28:32+02:00 Add static kernel neighbor entries for UDN masquerade IPs + - d4cb48ec 2026-08-10T14:28:32+02:00 e2e: verify NO_FLOOD, priority-12, and priority-11 ARP/NDP flows for CUDNs + - 32634217 2026-08-10T14:28:32+02:00 test: reset config in TestOpenFlowManagerSyncsUplinkBridgeFlows + - bae8c0fa 2026-08-10T14:28:31+02:00 Fix ARP/NDP storm and FDB learning for CUDN GRs on breth0 + - ffd4c142 2026-08-10T11:05:30+02:00 e2e: fail control-plane runs that select zero specs + - ccf69490 2026-08-10T11:05:30+02:00 e2e: cover split DPU UplinkState condition ownership and recovery + - a16889f1 2026-08-10T11:05:30+02:00 util: unify MAC validity checks on IsUsableEthernetMAC + - 10d1023f 2026-08-10T11:05:30+02:00 Uplink: reject host interfaces without a usable MAC address + - f84a810e 2026-08-10T11:05:30+02:00 Uplink: retry discovery with backoff while unresolved + - f804f573 2026-08-10T11:05:30+02:00 Uplink: one writer per UplinkState condition in split DPU mode + - 13bc66a8 2026-08-07T18:53:35+02:00 [crd] Fix APBR comment + - 7c524476 2026-08-07T16:12:15+02:00 node: tolerate ExternalIP delete OpenFlow resync + - a4482ed6 2026-08-07T16:12:15+02:00 ovn: mark no-overlay cluster SNATs with DB IDs, clean up stale ones + - 1215fc2e 2026-08-07T16:12:15+02:00 ovn: fail SNAT creation when exemption address set is missing + - 26a9862e 2026-08-07T16:12:15+02:00 ovn: sync no-overlay SNAT exemptions before gateway NATs + - 559ee8b2 2026-08-07T16:12:15+02:00 libovsdb: ignore exempted_ext_ips when matching NATs + - 223c8c13 2026-08-07T14:59:35+05:30 docs: add mike-based multi-version docs publishing + - f7c5a957 2026-08-06T07:06:32-07:00 clustermanager: test inactive L2 transit router nodes + - bb92207b 2026-08-05T14:09:42+02:00 RA controller: make config error messages deterministic + - 00434fca 2026-08-05T14:09:42+02:00 RA controller: refresh status when failure reason or message changes + - 64f55117 2026-08-04T17:57:33+02:00 coderabbit: update definition of geenrated files. + - 19c90720 2026-08-04T17:57:33+02:00 UT: add EF SSA test for the NewClientset + - 211606a8 2026-08-04T17:57:27+02:00 update-codegen: check openapi-gen errors + - e8cbfc1e 2026-08-04T17:57:27+02:00 run update-codegen + - 35ffeca0 2026-08-04T17:57:20+02:00 Update update-codegen to generate SSA-compatible fake clients + - 3862ea30 2026-08-04T10:03:58-04:00 OCPBUGS-83863: Remove RHEL 8 build stage and version-specific CNI directories + - b1ab6276 2026-08-04T10:10:45+02:00 Revert "Get pod from apiserver on retryable annotation patch failure" + - 1f721cd8 2026-08-03T14:00:54-07:00 clustermanager: advertise dynamic L2 with transit router + - e1a2a9be 2026-08-03T10:25:06-04:00 clustermanager: re-evaluate egress IPs when cloud egress-ipconfig annotation changes + - d632294a 2026-08-03T10:25:06-04:00 util: add CloudEgressIPConfigAnnotationChanged helper + - 0a2e4e82 2026-08-03T11:55:20+02:00 node/uplink: ignore host representors when deriving the bridge uplink + - 540db4d4 2026-08-03T11:55:20+02:00 util: treat all-zero devlink function hw_addr as unset + - 4656af94 2026-08-03T11:55:20+02:00 bridgeconfig: select DPU gateway representor by host peer MAC + - 5a6bdc29 2026-08-03T11:55:20+02:00 node/uplink: resolve DPU bridges for VF and SF host interfaces + - 17c7662f 2026-07-31T19:03:32+05:30 ci: Use lint target of Makefile in lint lane + - cf911518 2026-07-31T14:09:18+05:30 Updating ovn-kubernetes-microshift-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/ovn-kubernetes-microshift.yml + - 3a8f25c9 2026-07-31T14:09:18+05:30 Updating ose-ovn-kubernetes-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/ose-ovn-kubernetes.yml + - 2e16b2ab 2026-07-31T14:08:48+05:30 Updating ose-ovn-kubernetes-base-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/7e3068230c1b2ba349579903983c811993b92820/images/ovn-kubernetes-base.yml + - f0321d17 2026-07-31T14:08:21+05:30 sync test annotations with upstream changes and version bump + - 6bcaede5 2026-07-30T14:27:48+02:00 docs: add Uplink feature flag to the docs + - 5994d6cc 2026-07-30T13:42:03+02:00 Uplink: report an error on CUDN that uses Uplink when flag is disabled + - 242c552a 2026-07-30T13:42:03+02:00 Enable Uplink in UT + - 8870fa49 2026-07-30T13:42:03+02:00 Wire uplink enabling through the helm and CI + - e776c689 2026-07-30T13:41:59+02:00 Add an uplink feature flag + - 1b9fb6df 2026-07-30T11:54:14+02:00 Update isEgressIPForUDNSupported to use IsNetworkSegmentationSupportEnabled + - 44c16294 2026-07-30T10:48:40+02:00 CI: add verify-codegen job to ensure generated code is not stale. + - 9c4e9095 2026-07-30T10:48:32+02:00 crd/uplink: update-codegen + - 8f64a3c4 2026-07-30T10:48:25+02:00 update-codegen: only list directories under crd/ + - 34e95eea 2026-07-30T11:19:02+03:00 docs: fix LocalnetConfig excludeSubnet GODOC and API reference doc + - 5d9782c7 2026-07-29T10:03:36+02:00 docs: document interface-defined BGP neighbors for route advertisements + - 8f84451c 2026-07-29T10:03:36+02:00 RA controller: advertise both families to unnumbered BGP neighbors + - b32e1110 2026-07-29T10:01:52+02:00 RA controller: fix raw FRR config for unnumbered BGP neighbors + - 11feeba5 2026-07-28T12:20:22-07:00 nooverlay: emit events on the configured default NAD + - ddbfebb2 2026-07-28T12:20:22-07:00 udn: Honor MAC requests on primary layer3 networks + - c7aa9825 2026-07-28T12:20:22-07:00 config: make default network NAD configurable + - ce712a9c 2026-07-28T13:41:34-04:00 Bump golang.org/x/crypto to v0.52.0 + - 62298e9d 2026-07-28T17:43:59+02:00 e2e: fix cross-UDN same-node nodeport test expectations per gateway mode + - 6568c450 2026-07-28T17:27:13+02:00 Fix Layer2 UDN same-node nodeport: use correct transit router port prefix + - f23d1d79 2026-07-28T17:27:13+02:00 Fix UDN masquerade ARP storm on external network + - cf7b1551 2026-07-27T07:52:40+02:00 ovspinning: remove pmd-cpu-mask from affinity + - 6bf19da7 2026-07-27T07:52:39+02:00 ovspinning: Only skip PMD threads if DPDK is enabled + - 41f27e4f 2026-07-27T07:52:39+02:00 ovspinning: skip OVS PMD threads if any + - 5ba4f536 2026-07-26T17:57:00+02:00 kind: use v1.36.1 node image until v1.36.2 is published + - 86421ba8 2026-07-24T14:46:46-07:00 ovn: complete egress node setup during reconciliation + - 314cbc04 2026-07-24T10:52:40-07:00 Restore DPU route import VRFs without Uplinks + - ab615f50 2026-07-24T12:18:59-04:00 egressip: migrate iptables manager to nftables + - 1b512fe1 2026-07-24T15:56:26Z Consolidate syncUDNIsolation into a single predicate scan + - 399f3ef8 2026-07-24T15:56:26Z Refactor deleteStaleMasqueradeRouteAndMACBinding to use router-scoped ops + - fd611011 2026-07-24T15:56:26Z Add upgrade migration for switch-based drop ACL to port group + - 80e969ef 2026-07-24T15:56:25Z Move advertised network drop ACL from switches to port group + - 4f32c7a2 2026-07-24T15:56:25Z Centralize router-to-switch and switch-to-router port naming into NetInfo + - e3f56978 2026-07-24T13:42:21Z Add PortGroupAdvertisedNetwork type and create PG in ConfigureAdvertisedNetworkIsolation + - d56fb7ff 2026-07-24T13:42:20Z Add EnsureAddressSetOps to AddressSetFactory interface + - 763ce2d4 2026-07-24T13:42:20Z Refactor: extract advertised network isolation init and cleanup helpers + - abe1ae2a 2026-07-23T18:16:46-04:00 Make DPU the sole Uplink gateway status writer + - 1d40e849 2026-07-23T15:28:03+02:00 ovn: fix flaky timing in NBDB-outage node retry unit tests + - 1d8befc7 2026-07-23T18:55:00+05:30 makefile: Fix lint to run when Makefile is invoked from another directory + - ed591bf5 2026-07-23T13:00:53+05:30 lint: use documented golangci-lint installer URL + - df6b3213 2026-07-23T13:00:53+05:30 lint: satisfy govet inline analyzer + - c0b63511 2026-07-23T13:00:53+05:30 test: move VTEP mocks out of generated CRD tree + - e9c15e8c 2026-07-23T13:00:53+05:30 codegen: fix generated manifests for Kubernetes 1.36 + - 7d693c53 2026-07-23T13:00:53+05:30 kind: use kubeadm v1beta4 patches for Kubernetes 1.36 + - 3b2d1a6d 2026-07-23T13:00:53+05:30 metallb: upgrade for Kubernetes 1.36 CRD validation + - 2324d2a1 2026-07-23T13:00:53+05:30 networkqos: use int64 schema for bandwidth fields + - 88d46dd8 2026-07-23T13:00:53+05:30 kind: upgrade to v0.32.0 for Kubernetes 1.36.2 + - cdc5c211 2026-07-23T13:00:53+05:30 deps: bump Kubernetes dependencies to 1.36.2 + - 15f16271 2026-07-23T12:44:47+05:30 Removing the duplicate word from the Error message + - 19b3ab36 2026-07-22T10:42:23+02:00 Remove redundant JSON unmarshal in SecondaryNetworkPodIPs + - f1434be2 2026-07-22T10:42:21+02:00 Optimize cleanupStalePodSNATs for scale + - 6556a867 2026-07-22T09:20:32+02:00 Filter namespaces not served by network controller + - 8a0fb2a9 2026-07-22T09:20:32+02:00 Use set-based lookup in hasOnlyAddresses + - d41e4256 2026-07-21T15:31:28-07:00 udn: add VRF routes for all UDN cluster subnets + - 69b3b1e6 2026-07-21T18:17:25-04:00 ci: Add image name to the e2e job name + - baa9c191 2026-07-21T18:23:32+02:00 unidling: fail controller creation when SB client cache is nil + - 959990e0 2026-07-21T10:50:40+02:00 Fix map-order flake in DPU host representor test + - d419656e 2026-07-21T09:55:40+02:00 Stabilize CUDN count metric deletion test + - f1285a42 2026-07-20T10:01:45+05:30 Fix typos in error messages + - 9b25d569 2026-07-18T10:36:35-04:00 Stabilize RouteAdvertisements preservation test + - cfdefcbb 2026-07-17T15:33:40-04:00 Stabilize transit switch IP reallocation test + - 468e83d3 2026-07-17T14:41:11-04:00 Restore simulated DPU devices when Pod state is gone + - 6ddcae93 2026-07-17T14:41:11-04:00 Aggregate Uplink gateway readiness for active CUDNs + - 53f9829f 2026-07-17T14:41:11-04:00 Update UplinkState identity and readiness semantics + - e834d672 2026-07-17T14:41:11-04:00 Fix focused Network Segmentation E2E selection + - 40d46e86 2026-07-17T14:41:11-04:00 Allow disjoint Dynamic CUDNs to share an Uplink + - 2e9c69ff 2026-07-17T14:35:32-04:00 Reject default gateway bridge as an Uplink + - d48fd1ab 2026-07-17T14:35:32-04:00 Add Uplink feature documentation + - 74477f60 2026-07-17T14:35:32-04:00 Fix RouteAdvertisements optional feature handling + - af6ec975 2026-07-17T14:35:32-04:00 Disable bridge netfilter for KIND BGP tests + - a8aa27cf 2026-07-17T14:35:32-04:00 Add Uplink e2e coverage + - cf20ae1b 2026-07-17T14:35:32-04:00 Reject Uplink outside shared gateway mode + - 38934225 2026-07-17T14:35:32-04:00 Resolve DPU Uplink bridges from host state + - 93aa53d5 2026-07-17T14:35:32-04:00 Enslave Uplink gateway interfaces to UDN VRFs + - 79cbe159 2026-07-17T14:35:32-04:00 Use Uplink bridges for UDN gateway plumbing + - b85da74d 2026-07-17T14:35:32-04:00 Teach OpenFlow manager about Uplink bridges + - 09a9359b 2026-07-17T14:35:32-04:00 Add unmanaged Uplink bridge configuration + - e3fbeb17 2026-07-17T14:35:32-04:00 Use UplinkState for CUDN gateways + - 848f9cc7 2026-07-17T14:35:32-04:00 Add node UplinkState discovery + - 9e195884 2026-07-17T14:35:32-04:00 Add Uplink cluster-manager controller + - 3c841452 2026-07-17T14:35:32-04:00 Wire Uplink API plumbing + - 82fc4de5 2026-07-17T14:30:25-04:00 Add Uplink API types + - 51047fae 2026-07-17T20:27:56+05:30 sync test annotations with upstream changes + - b05c351c 2026-07-17T20:27:53+05:30 Adapt OTE for E2E L3 CUDN multisubnet backward compatibility fixes + - 87839345 2026-07-17T16:07:27+02:00 util: wait for the bridge to inherit the NIC MAC address in NicToBridge + - cc5d2484 2026-07-17T15:23:34+02:00 Stop allocating L2 node tunnel IDs when transit router is used + - 11a9197e 2026-07-17T15:06:24+05:30 managedbgp: refactor to use GenerateName and unified labeling + - c5353747 2026-07-17T15:06:24+05:30 no-overlay: add CUDN support for no-overlay managed routing + - 70a2009b 2026-07-17T10:23:14+02:00 e2e(kubevirt): deflake "with pre-copy fails" migration test + - 47a35e07 2026-07-16T17:30:29-04:00 docs: update VRF-Lite uplink status OKEP + - 85348ff8 2026-07-16T13:37:17-04:00 ci: run a control-plane lane with ubuntu images + - fa8e140a 2026-07-16T15:33:44+02:00 Fix traffic leak in egress IP on secondary interface + - 8bce7389 2026-07-16T10:32:40+02:00 node: use libovsdb instead of ovs-vsctl exec in checkPorts + - 7b2e6eb5 2026-07-16T00:32:34+02:00 ci: cover dynamic UDN allocation on a no-overlay shared-gateway lane + - 1b7e0ec0 2026-07-16T00:32:34+02:00 e2e: adapt advertised network isolation tests to dynamic UDN allocation + - 156b75f9 2026-07-16T00:32:34+02:00 e2e: adapt CUDN advertisement tests to dynamic UDN allocation + - 501cc079 2026-07-16T00:32:34+02:00 e2e: cover RouteAdvertisements over a dynamically allocated CUDN + - 8df86599 2026-07-16T00:32:34+02:00 routeadvertisements: advertise dynamic UDNs only from active nodes + - 6a73851e 2026-07-15T14:34:58-04:00 build(deps): bump the go_modules group across 3 directories with 1 update + - 677d6113 2026-07-15T10:03:52-07:00 clustermanager: rename node allocation controller + - 5c9606a8 2026-07-15T19:10:30+05:30 openshift: fix lint issues + - 1fcfb18f 2026-07-14T16:09:34-04:00 no-overlay: host -> pods on other nodes via mp0 + - f49764be 2026-07-14T20:50:36+02:00 docs: add AGENTS.md for go-controller/pkg and CRDs + - 4620cb6d 2026-07-14T10:29:15-07:00 licenses: refresh generated third-party licenses + - 8b0dd877 2026-07-14T10:29:15-07:00 cni: fold libovsdb and shell-out ConfigureOVS paths into one + - 0b276e27 2026-07-14T10:29:15-07:00 libovsdb/ops: consolidate ovs helper operations + - 49393a41 2026-07-14T16:52:06+01:00 docs: rename portSecurity to macSecurity in OKEP-3926 + - 7229c04d 2026-07-14T20:27:41+05:30 node: skip configureGlobalForwarding tests in CI without root access + - 40bd24a5 2026-07-13T17:27:35+02:00 zone_interconnect: add unit test for stale IC route cleanup + - 3f34530b 2026-07-12T10:36:43+03:00 Update OWNERS file + - 60fcdaf5 2026-07-10T18:56:40+02:00 Use new IPv6 force_forwarding sysctl if available. + - 0e3a4e06 2026-07-10T18:56:40+02:00 Don't change FORWARD table default policy for IPv4 + - 7795aba2 2026-07-10T18:56:40+02:00 Don't override FORWARD default policy when `disable-forwarding` is not set + - 92fc5160 2026-07-10T18:56:40+02:00 Update disable-gateway unit tests + - a90d60b6 2026-07-10T18:56:40+02:00 Clarify/simplify/fix "Disable Forwarding Config" docs + - bdfd82fb 2026-07-10T17:48:35+02:00 Redo the AllocateLoadBalancerNodePorts=false test cases + - dcaf6dba 2026-07-10T12:46:42+02:00 [perf] fix netpol selection for cudn-l2 job + - d447e853 2026-07-10T11:17:19+02:00 Support update of chassis-id without re-creating the node. + - 0c9edf05 2026-07-08T12:59:20-07:00 ovnkube.sh: unify gateway option loading from OVS external_ids + - 945f64d7 2026-07-08T10:33:19-07:00 test: Use proper TLS certificate validation in metrics server tests + - 98e204fe 2026-07-08T13:36:28+02:00 coderabbit: add pre-merge checks and custom validation rules + - e36fbadc 2026-07-07T20:23:30+02:00 Get pod from apiserver on retryable annotation patch failure + - 06f453b7 2026-07-07T08:13:37+02:00 e2e(kubevirt): replace echoserver with iperf3 + - 853a72fa 2026-07-06T15:06:48-07:00 libovsdb/ops: document ovs-vsctl equivalents on read wrappers + - e3e40f10 2026-07-06T15:06:48-07:00 util, libovsdb/ops: migrate NicToBridge to libovsdb + - 497f470f 2026-07-06T15:06:48-07:00 test/e2e: pin docker while importing libovsdb + - c1c5603e 2026-07-06T15:06:48-07:00 util, node: migrate nicstobridge read paths to libovsdb + - 258eb623 2026-07-06T15:06:48-07:00 node/test: migrate DPU and gateway tests to libovsdb harness + - 1a64e7db 2026-07-06T15:06:48-07:00 cni, node: migrate ConfigureOVS and delRepPort to libovsdb + - 3785f7bd 2026-07-06T15:06:48-07:00 node: move ovsClient to BaseNodeNetworkController + - a58ead15 2026-07-06T15:06:47-07:00 libovsdb/ops: add GetOVSInterface and CreateOrUpdatePodPort + - ff6d3a79 2026-07-06T15:06:47-07:00 node, controllermanager: migrate stale-port cleanup to libovsdb + - 65e3926d 2026-07-06T15:06:47-07:00 node, libovsdb/ops: migrate port-to-br shell-outs to libovsdb + - f1a554fd 2026-07-06T15:06:47-07:00 node: migrate br-exists and del-port br-int to libovsdb + - 1e4c92c6 2026-07-06T15:06:47-07:00 util, ovn-kube-util: migrate BridgeToNic to libovsdb + - 79cb19da 2026-07-06T15:06:47-07:00 libovsdb/ops: bridge-scope DeletePortWithInterfaces + - fdc69950 2026-07-06T15:06:47-07:00 node, libovsdb/ops: migrate del-br shell-outs to libovsdb + - 25b05aa5 2026-07-06T20:15:26+02:00 Only create ACCEPT rules for bypassing our own DROP rules + - fe9bd9f8 2026-07-06T20:15:26+02:00 Simplify initLocalGateway iptables/nftables setup + - f7401aeb 2026-07-03T15:15:57+02:00 routemanager: normalize IPv6 route metric to kernel default + - 7683207e 2026-07-03T10:03:37+02:00 e2e(kubevirt): drop fedora coreos image in favor of fedora + - d9d3e374 2026-07-02T18:14:51+02:00 area-merge: prevent bot comment feedback loop + - 635a3fd7 2026-07-02T15:50:39+01:00 docs: add "future work" section to OKEP-3926 + - 69f3a5e7 2026-07-02T15:50:39+01:00 docs: simplify OKEP-3926 and add per-attachment future section + - 00e2aa81 2026-07-02T15:50:39+01:00 docs: add OKEP-3926 for disabling port security on secondary networks + - 4246d935 2026-07-02T17:56:19+08:00 docs: fix typo in OKEP 5193 CUDN spec + - e9ed7419 2026-07-01T15:50:28-07:00 OKEP-6227: Add DHCP IPAM support for localnet UDNs + - 78e42465 2026-07-01T10:34:35-04:00 config: make routing table ID start configurable + - b19a79d2 2026-06-30T10:59:13-04:00 Revert "Route DPU host no-overlay traffic through OVN" + - 6eac3a2e 2026-06-30T15:35:05+02:00 docs/e2e: clarify E2E backward compatibility requirements in OKEP template + - f5692f2b 2026-06-26T11:04:37-07:00 OTE: Remove duplicate EVPN test from tests.go + - 732ca5db 2026-06-26T11:04:37-07:00 OTE: Add test list validation tooling + - 585b72c2 2026-06-26T16:33:10+02:00 Allow networks to start while route advertisements settle + +- kubernetes image-arm64 ba6535cbb8719c3ba6c3923f2725ba050c87faab to 7ffd39de9bbb8e3edca8ee7530cf1dab522fbce2 + - 69b0654c3 2026-08-13T00:18:08Z UPSTREAM: : Update openshift-hack/rebase.sh, REBASE.openshift.md diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index cefd079af5..1d5e171f16 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,35 +1,35 @@ https://github.com/openshift/api embedded-component 1cb630ce7109e6c4780332bb8140c8c4f7157426 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 8c1ebc60a2014ab925cbad6ef255e06ea0bd72b4 https://github.com/openshift/cluster-dns-operator embedded-component 41a53fed36e6e99c7c9ceb3a699c3547ee5d9bb9 -https://github.com/openshift/cluster-ingress-operator embedded-component 172349116c92d6b0d9cf56610be99de2115ae726 +https://github.com/openshift/cluster-ingress-operator embedded-component 3da316787326c64b8e844f7cb7da3a05b78a1337 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component dc1c217c263cd220ddd2ed6fe827a466d47e3ebb https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 395de96705749de9c6a5f25747b9d5c3d5f65a8f https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 5ef1df3be41d38ddae9b3d22ce51ba486939e9f1 -https://github.com/openshift/cluster-network-operator embedded-component 72b5cba20082e859643ae3c4fc4e83ef2ae6fe20 +https://github.com/openshift/cluster-network-operator embedded-component 2013b3f580678672cc08f41d00f64ba1547acbeb https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2617a201bb3607192a9f82faa18384676f611e3c https://github.com/openshift/cluster-policy-controller embedded-component e510507e20f6eb09694c880ecd79fa512a2b3470 https://github.com/openshift/csi-external-snapshotter embedded-component 2c14afc50a30de62cb00cc8263b061383cfbd3b5 -https://github.com/openshift/etcd embedded-component 806f690e1f140e0aea2eb05ef5f288b756b62895 -https://github.com/openshift/kubernetes embedded-component ba6535cbb8719c3ba6c3923f2725ba050c87faab +https://github.com/openshift/etcd embedded-component b6dda5413ec33fc88fc9751d98d3b4bd96ea877d +https://github.com/openshift/kubernetes embedded-component 7ffd39de9bbb8e3edca8ee7530cf1dab522fbce2 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component ce5ff17e9a81ce754567e6dd5053d13409c251e9 -https://github.com/openshift/machine-config-operator embedded-component 0ba66a27bc734f20b2982d2d874b8bada58b78fd +https://github.com/openshift/machine-config-operator embedded-component db84d8368ef78e50f3bc0961dcf2b27a7975e053 https://github.com/openshift/openshift-controller-manager embedded-component 438d52e79d691e016d66eabfe9a53c84229db40c https://github.com/openshift/operator-framework-olm embedded-component 149d553b2057320d761c4d1913098a66787dd09a https://github.com/openshift/route-controller-manager embedded-component 166a3e96f8151d9e789b3951ae75b03cdede5081 https://github.com/openshift/service-ca-operator embedded-component e9622ba18c86bf24aceab0c19fdcb87339c14f44 -https://github.com/openshift/oc image-amd64 0276efa6de22b45e3c2915423fd203555382ff1c +https://github.com/openshift/oc image-amd64 0aac049d01cfc3af876c5338576144773cbfa969 https://github.com/openshift/coredns image-amd64 7486e9e4330c1e41d9a91e4673b7f2782efc112c https://github.com/openshift/csi-external-snapshotter image-amd64 2c14afc50a30de62cb00cc8263b061383cfbd3b5 -https://github.com/openshift/router image-amd64 dc4c01d494f572773a05e82bffd19c2cdaf8dce9 +https://github.com/openshift/router image-amd64 22531cf0bb2435e73437be73c244913de4844812 https://github.com/openshift/kube-rbac-proxy image-amd64 cd636680e06a55395c26570dff0cb37277014388 -https://github.com/openshift/ovn-kubernetes image-amd64 9f20d9cb39b32feb1dc2d4b1b33e686c9a3d8d9b -https://github.com/openshift/kubernetes image-amd64 ba6535cbb8719c3ba6c3923f2725ba050c87faab +https://github.com/openshift/ovn-kubernetes image-amd64 cf0788990aa2a2303189cc68edf785dfef5dd18f +https://github.com/openshift/kubernetes image-amd64 7ffd39de9bbb8e3edca8ee7530cf1dab522fbce2 https://github.com/openshift/service-ca-operator image-amd64 e9622ba18c86bf24aceab0c19fdcb87339c14f44 -https://github.com/openshift/oc image-arm64 0276efa6de22b45e3c2915423fd203555382ff1c +https://github.com/openshift/oc image-arm64 0aac049d01cfc3af876c5338576144773cbfa969 https://github.com/openshift/coredns image-arm64 7486e9e4330c1e41d9a91e4673b7f2782efc112c https://github.com/openshift/csi-external-snapshotter image-arm64 2c14afc50a30de62cb00cc8263b061383cfbd3b5 -https://github.com/openshift/router image-arm64 dc4c01d494f572773a05e82bffd19c2cdaf8dce9 +https://github.com/openshift/router image-arm64 22531cf0bb2435e73437be73c244913de4844812 https://github.com/openshift/kube-rbac-proxy image-arm64 cd636680e06a55395c26570dff0cb37277014388 -https://github.com/openshift/ovn-kubernetes image-arm64 9f20d9cb39b32feb1dc2d4b1b33e686c9a3d8d9b -https://github.com/openshift/kubernetes image-arm64 ba6535cbb8719c3ba6c3923f2725ba050c87faab +https://github.com/openshift/ovn-kubernetes image-arm64 cf0788990aa2a2303189cc68edf785dfef5dd18f +https://github.com/openshift/kubernetes image-arm64 7ffd39de9bbb8e3edca8ee7530cf1dab522fbce2 https://github.com/openshift/service-ca-operator image-arm64 e9622ba18c86bf24aceab0c19fdcb87339c14f44 From 1c0feb6a75a5e0c864d0daf6da73d29670afccff Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Aug 2026 04:29:30 +0000 Subject: [PATCH 03/10] update microshift/deps --- .../openshift/kubernetes/REBASE.openshift.md | 72 ++++++++++++---- .../kubernetes/openshift-hack/rebase.sh | 84 +++++++++++-------- 2 files changed, 105 insertions(+), 51 deletions(-) diff --git a/deps/github.com/openshift/kubernetes/REBASE.openshift.md b/deps/github.com/openshift/kubernetes/REBASE.openshift.md index 1d6d616f8e..a800ceecc4 100644 --- a/deps/github.com/openshift/kubernetes/REBASE.openshift.md +++ b/deps/github.com/openshift/kubernetes/REBASE.openshift.md @@ -360,9 +360,8 @@ The following repositories have been already bumped as well: -Followup work has been assigned to appropriate teams -through bugzillas linked in the code. Please treat -them as the highest priority after landing the bump. +A Jira ticket has been opened for the rebase process. +It has been linked to the pull request. Finally, this means we are blocking ALL PRs to our kubernetes fork. @@ -404,10 +403,55 @@ them as the highest priority and release blockers for your team: 1. Update cluster-kube-apiserver-operator `pre-release-lifecycle` alert's `removed_release` version similarly to https://github.com/openshift/cluster-kube-apiserver-operator/pull/1382. -## Updating with `git merge` +## Updating with `redhat-chai-bot` *This is the preferred way to update to patch releases of kubernetes* +[chai-bot](slack://app?team=T027F3GAJ&id=A0AJUKWDUR1&tab=messages) (ship-help-bot) is an internal tool has been given instructions to +periodically check for upstream patch releases and complete the rebase autonomously. The steps taken are outlined below: + + +1. Fetch upstream tags over the past 31 days: +``` +git fetch --tags upstream && git tag --sort=-creatordate | grep -E 'v[0-9]+\.[0-9]+\.[0-9]+$' | awk -v cutoff="$(date -d '31 days ago' +%s)" '$2 >= cutoff {print $1}' +``` +where `upstream` points at https://github.com/kubernetes/kubernetes/ + +2. Determine whether any patch release have occurred that have not yet been rebased and merged. If such patch releases exist, + the corresponding openshift branches are found and marked to be rebased. Otherwise, chai-bot reports that there is no rebase necessary. + - *Branches tracking master are skipped.* + +3. Output a mapping table of upstream release to openshift version, as well as whether that branch needs to be rebased, to the appropriate team: +``` +*Kubernetes patch rebase check* + +Upstream Release OCP Branch Current k8s Status Notes +───────────────── ────────────── ──────────── ───────── ────────────────────────── +v1.35.6 master 1.35.3 REBASE Patch 3 → 6 +v1.35.6 release-5.1 1.35.3 SKIP Points at openshift/master +v1.35.6 release-4.22 1.35.5 REBASE Patch 5 → 6 +v1.34.9 release-4.21 1.34.8 REBASE Patch 8 → 9 +``` + +4. For each branch requiring a rebase, chai-bot runs [rebase.sh](https://github.com/openshift/kubernetes/blob/master/openshift-hack/rebase.sh) (see usage below) with + the appropriate parameters of `kubernetes_tag` and `openshift_release`. + +5. After each successful rebase, a message is posted to the appropriate team: +``` +*:white_check_mark: Rebase of openshift/kubernetes:{openshift_release} → {kubernetes_tag} complete* + +Branch pushed: :{branch_name} +• Kubernetes version: {old_version} → {kubernetes_tag} +• Merge conflicts: {list of files or "None"} + +_Open a PR against `openshift/kubernetes:{openshift_release}` when ready._ +``` +On rebase failure, a message containing failure details is posted instead and the next branch is rebased. + +6. A final summary is posted and permission to open a pull request for each rebase is requested. + +## Updating with `git merge` + After the initial bump as described above it is possible to update to newer released version using `git merge`. To do that follow these steps: @@ -512,26 +556,24 @@ etcd version 3.5.6 or greater required Grab newer version of etcd from https://github.com/etcd-io/etcd/releases/ and place it in `/usr/local/bin/etcd`. -## Updating with `rebase.sh` (experimental) +## Updating with `rebase.sh` -The above steps are available as a script that will merge and rebase along the happy path without automatic conflict -resolution and at the end will create a PR for you. +In the event that chai-bot fails to rebase, [rebase.sh](https://github.com/openshift/kubernetes/blob/master/openshift-hack/rebase.sh) can also be run manually. Here are the steps: -1. Create a new BugZilla with the respective OpenShift version to rebase (Target Release stays ---), - Prio&Severity to High with a proper description of the change logs. - See [BZ2021468](https://bugzilla.redhat.com/show_bug.cgi?id=2021468) as an example. +1. Create a new Jira ticket under OCPBUGS with the respective OpenShift version to rebase, + Target Backport Version to the previous minor version + .z 2. It's best to start off with a fresh fork of [openshift/kubernetes](https://github.com/openshift/kubernetes/). Stay on the master branch. -3. This script requires `jq`, `git`, `podman` and `bash`, `gh` is optional. +3. This script requires `git`, `podman` and `bash`, and optionally uses `gh` to create a pull request. 4. In the root dir of that fork run: ``` -openshift-hack/rebase.sh --k8s-tag=v1.25.2 --openshift-release=release-4.12 --bugzilla-id=2003027 +openshift-hack/rebase.sh --k8s-tag=v1.25.2 --openshift-release=release-4.12 --jira-id=OCPBUGS-90150 ``` where `k8s-tag` is the [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes/) release tag, the `openshift-release` -is the OpenShift release branch in [openshift/kubernetes](https://github.com/openshift/kubernetes/) and the `bugzilla-id` is the -BugZilla ID created in step (1). +is the OpenShift release branch in [openshift/kubernetes](https://github.com/openshift/kubernetes/) and the `jira-id` is the +Jira ticket number created in step (1). 5. In case of conflicts, it will ask you to step into another shell to resolve those. The script will continue by committing the resolution with `UPSTREAM: `. 6. At the end, there will be a "rebase-$VERSION" branch pushed to your fork. -7. If you have `gh` installed and are logged in, it will attempt to create a PR for you by opening a web browser. +7. A pull request will be created with the title `$jira_id: Rebase $k8s_tag in $openshift_release` against the corresponding openshift branch. diff --git a/deps/github.com/openshift/kubernetes/openshift-hack/rebase.sh b/deps/github.com/openshift/kubernetes/openshift-hack/rebase.sh index ed2fdbbed5..9db68e2274 100755 --- a/deps/github.com/openshift/kubernetes/openshift-hack/rebase.sh +++ b/deps/github.com/openshift/kubernetes/openshift-hack/rebase.sh @@ -2,7 +2,7 @@ # READ FIRST BEFORE USING THIS SCRIPT # -# This script requires jq, git, podman and bash to work properly (dependencies are checked for you). +# This script requires git, podman and bash to work properly (dependencies are checked for you). # The Github CLI "gh" is optional, but convenient to create a pull request automatically at the end. # # This script generates a git remote structure described in: @@ -11,16 +11,16 @@ # # The usage is described in /Rebase.openshift.md. -# validate input args --k8s-tag=v1.21.2 --openshift-release=release-4.8 --bugzilla-id=2003027 +# validate input args --k8s-tag=v1.21.2 --openshift-release=release-4.8 --jira-id=OCPBUGS-91759 k8s_tag="" openshift_release="" -bugzilla_id="" +jira_id="" usage() { echo "Available arguments:" echo " --k8s-tag (required) Example: --k8s-tag=v1.21.2" echo " --openshift-release (required) Example: --openshift-release=release-4.8" - echo " --bugzilla-id (optional) creates new PR against openshift/kubernetes:${openshift-release}: Example: --bugzilla-id=2003027" + echo " --jira-id (optional) Include Jira ticket in PR title: Example: --jira-id=OCPBUGS-1234" } for i in "$@"; do @@ -33,8 +33,8 @@ for i in "$@"; do openshift_release="${i#*=}" shift ;; - --bugzilla-id=*) - bugzilla_id="${i#*=}" + --jira-id=*) + jira_id="${i#*=}" shift ;; *) @@ -61,7 +61,7 @@ fi echo "Processed arguments are:" echo "--k8s_tag=${k8s_tag}" echo "--openshift_release=${openshift_release}" -echo "--bugzilla_id=${bugzilla_id}" +echo "--jira_id=${jira_id}" # prerequisites (check git, podman, ... is present) if ! command -v git &>/dev/null; then @@ -69,11 +69,6 @@ if ! command -v git &>/dev/null; then exit 1 fi -if ! command -v jq &>/dev/null; then - echo "jq not installed, exiting" - exit 1 -fi - if ! command -v podman &>/dev/null; then echo "podman not installed, exiting" exit 1 @@ -98,9 +93,13 @@ git fetch upstream --tags -f git remote add openshift git@github.com:openshift/kubernetes.git git fetch openshift -#git checkout --track "openshift/$openshift_release" +git checkout --track "openshift/$openshift_release" git pull openshift "$openshift_release" +if [ -z "$(git tag -l "$k8s_tag")" ]; then + echo "No such tag exists in upstream for: $k8s_tag" + exit 1 +fi git merge "$k8s_tag" # shellcheck disable=SC2181 if [ $? -eq 0 ]; then @@ -125,18 +124,17 @@ fi # openshift-hack/images/hyperkube/Dockerfile.rhel still has FROM pointing to old tag # we need to remove the prefix "v" from the $k8s_tag to stay compatible -sed -i -E "s/(io.openshift.build.versions=\"kubernetes=)(1.[1-9]+.[1-9]+)/\1${k8s_tag:1}/" openshift-hack/images/hyperkube/Dockerfile.rhel +podman run --rm -v "$(pwd):/workspace:Z" docker.io/library/alpine:latest \ + sed -i -E "s/(io.openshift.build.versions=\"kubernetes=)(1.[1-9]+.[1-9]+)/\1${k8s_tag:1}/" \ + /workspace/openshift-hack/images/hyperkube/Dockerfile.rhel go_mod_go_ver=$(grep -E 'go 1\.[1-9][0-9]?' go.mod | sed -E 's/go (1\.[1-9][0-9]?)/\1/' | cut -d '.' -f 1,2) # Need to handle mod versions like 1.23 and 1.23.4; our release images only have major.minor -tag="rhel-8-release-golang-${go_mod_go_ver}-openshift-${openshift_release#release-}" - -# update openshift go.mod dependencies -sed -i -E "/=>/! s/(\tgithub.com\/openshift\/[a-z|-]+) (.*)$/\1 $openshift_release/" go.mod +tag=$(grep "^ tag:" .ci-operator.yaml | head -n1 | sed -E 's/.*: (.*)/\1/') echo "> go mod tidy && hack/update-vendor.sh" -podman run -it --rm -v "$(pwd):/go/k8s.io/kubernetes:Z" \ +podman run --rm -v "$(pwd):/go/k8s.io/kubernetes:Z" \ --workdir=/go/k8s.io/kubernetes \ "registry.ci.openshift.org/openshift/release:$tag" \ - go mod tidy && hack/update-vendor.sh + /bin/bash -c "go mod tidy && hack/update-vendor.sh" # shellcheck disable=SC2181 if [ $? -ne 0 ]; then @@ -144,10 +142,26 @@ if [ $? -ne 0 ]; then exit 1 fi -podman run -it --rm -v "$(pwd):/go/k8s.io/kubernetes:Z" \ +echo "> make clean to remove stale _output directory" +podman run --rm -v "$(pwd):/go/k8s.io/kubernetes:Z" \ + --workdir=/go/k8s.io/kubernetes \ + "registry.ci.openshift.org/openshift/release:$tag" \ + make clean +# shellcheck disable=SC2181 +if [ $? -ne 0 ]; then + echo "make clean failed — check filesystem permissions on _output/" + exit 1 +fi + +podman run --rm -v "$(pwd):/go/k8s.io/kubernetes:Z" \ --workdir=/go/k8s.io/kubernetes \ "registry.ci.openshift.org/openshift/release:$tag" \ make update OS_RUN_WITHOUT_DOCKER=yes +# shellcheck disable=SC2181 +if [ $? -ne 0 ]; then + echo "make update failed" + exit 1 +fi git add -A git commit -m "UPSTREAM: : hack/update-vendor.sh, make update and update image" @@ -155,21 +169,19 @@ git commit -m "UPSTREAM: : hack/update-vendor.sh, make update and update i remote_branch="rebase-$k8s_tag" git push origin "$openshift_release:$remote_branch" -XY=$(echo "$k8s_tag" | sed -E "s/v(1\.[0-9]+)\.[0-9]+/\1/") -ver=$(echo "$k8s_tag" | sed "s/\.//g") -link="https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-$XY.md#$ver" -if [ -n "${bugzilla_id}" ]; then - if command -v gh &>/dev/null; then - XY=$(echo "$k8s_tag" | sed -E "s/v(1\.[0-9]+)\.[0-9]+/\1/") - ver=$(echo "$k8s_tag" | sed "s/\.//g") - link="https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-$XY.md#$ver" - - # opens a web browser, because we can't properly create PRs against remote repositories with the GH CLI (yet): - # https://github.com/cli/cli/issues/2691 - gh pr create \ - --title "Bug $bugzilla_id: Rebase $k8s_tag" \ - --body "CHANGELOG $link" \ - --web +if command -v gh &>/dev/null; then + XY=$(echo "$k8s_tag" | sed -E "s/v(1\.[0-9]+)\.[0-9]+/\1/") + ver=$(echo "$k8s_tag" | sed "s/\.//g") + link="https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-$XY.md#$ver" + title="Rebase $k8s_tag in $openshift_release" + if [ -n "${jira_id}" ]; then + title="$jira_id: $title" fi + + gh pr create \ + --title "$title" \ + --body "CHANGELOG $link" \ + --base "$openshift_release" \ + --head "$remote_branch" fi From b17a338dfedd578cef15650db11451d01feed377 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Aug 2026 04:29:52 +0000 Subject: [PATCH 04/10] update etcd/go.mod --- etcd/go.mod | 10 +++++----- etcd/go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index b370595608..a1eba64faa 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -147,11 +147,11 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20251111143920-806f690e1f14 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260803133257-b6dda5413ec3 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 // from etcd ) replace ( diff --git a/etcd/go.sum b/etcd/go.sum index 093362e300..368df6dc7b 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -137,16 +137,16 @@ github.com/openshift/api v0.0.0-20260710095909-1cb630ce7109 h1:0aFlPaDL1r0+EUNJx github.com/openshift/api v0.0.0-20260710095909-1cb630ce7109/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY= github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af h1:UiYYMi/CCV+kwWrXuXfuUSOY2yNXOpWpNVgHc6aLQlE= github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= -github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 h1:3fyOgcjFbMjZgVGYGZvSTH8Zi5LavfXVwwjnAZOfpQA= -github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14/go.mod h1:ob0/oWA/UQQlT1BmaEkWQzI0sJ1M0Et0mMpaABxguOQ= -github.com/openshift/etcd/client/pkg/v3 v3.0.0-20251111143920-806f690e1f14 h1:dXIOqD1issPq7FFvWUcZ20QHi/tJ0bn0egqTDW0PuCU= -github.com/openshift/etcd/client/pkg/v3 v3.0.0-20251111143920-806f690e1f14/go.mod h1:8Wx3eGRPiy0qOFMZT/hfvdos+DjEaPxdIDiCDUv/FQk= -github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 h1:Eogcz8Tix+Lbh2poNuOKmVcYcxTT0ymeJLQB5jhJafk= -github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14/go.mod h1:ZqwG/7TAFZ0BJ0jXRPoJjKQJtbFo/9NIY8uoFFKcCyo= -github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 h1:Ndy/MFW8U36LJsXWfP8AP3shZvpyQqb3h3PXjVFQdeE= -github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14/go.mod h1:uqrXrzmMIJDEy5j00bCqhVLzR5jEJIwDp5wTlLwPGOU= -github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 h1:SpT3jxkbfO6cx9UH3dcDCmqBkbUuioFhqqYJRLlU1Rc= -github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14/go.mod h1:PLuhyVXz8WWRhzXDsl3A3zv/+aK9e4A9lpQkqawIaH0= +github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 h1:bZaBNaUXqFL0q6K3hPBLSDvpUIe/Qf7OongDGLUtFKg= +github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3/go.mod h1:ob0/oWA/UQQlT1BmaEkWQzI0sJ1M0Et0mMpaABxguOQ= +github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260803133257-b6dda5413ec3 h1:Fl9ein4BYBftiHACzuwnCSbxHS5EOIUlkcqR8ht3t14= +github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260803133257-b6dda5413ec3/go.mod h1:8Wx3eGRPiy0qOFMZT/hfvdos+DjEaPxdIDiCDUv/FQk= +github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 h1:5w19f524lHps4KBshBW8K7Z0vTH4+sLIWwOY5JT6GRI= +github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3/go.mod h1:ZqwG/7TAFZ0BJ0jXRPoJjKQJtbFo/9NIY8uoFFKcCyo= +github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 h1:QpeLgEmB9D+SsQ6Gyoo1+y/uvzR88LjnL/fHzAerSSQ= +github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3/go.mod h1:uqrXrzmMIJDEy5j00bCqhVLzR5jEJIwDp5wTlLwPGOU= +github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 h1:dlqvc6dKekQ86pVObL/GEZ3zKw1/ZnZqaKbfpATl+Ko= +github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3/go.mod h1:PLuhyVXz8WWRhzXDsl3A3zv/+aK9e4A9lpQkqawIaH0= github.com/openshift/library-go v0.0.0-20251112091634-ab97ebb73f0f h1:r1pLosA7z3+t+lzW29FU54sg4/pAWu+lsKD0L5Gx3wg= github.com/openshift/library-go v0.0.0-20251112091634-ab97ebb73f0f/go.mod h1:ErDfiIrPHH+menTP/B4LKd0nxFDdvCbTamAc6SWMIh8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 h1:PMTgifBcBRLJJiM+LgSzPDTk9/Rx4qS09OUrfpY6GBQ= From ab1a74def08a955e0b38d7b7cb049cc2d2854c1d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Aug 2026 04:30:02 +0000 Subject: [PATCH 05/10] update etcd/vendor --- .../server/v3/storage/mvcc/watchable_store.go | 61 ++++++------------- etcd/vendor/modules.txt | 20 +++--- 2 files changed, 30 insertions(+), 51 deletions(-) diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/storage/mvcc/watchable_store.go b/etcd/vendor/go.etcd.io/etcd/server/v3/storage/mvcc/watchable_store.go index 67b2d7f2d3..1a1d99fed4 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/storage/mvcc/watchable_store.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/storage/mvcc/watchable_store.go @@ -226,7 +226,6 @@ func (s *watchableStore) syncWatchersLoop() { delayTicker := time.NewTicker(watchResyncPeriod) defer delayTicker.Stop() - var evs []mvccpb.Event for { s.mu.RLock() @@ -236,7 +235,7 @@ func (s *watchableStore) syncWatchersLoop() { unsyncedWatchers := 0 if lastUnsyncedWatchers > 0 { - unsyncedWatchers, evs = s.syncWatchers(evs) + unsyncedWatchers = s.syncWatchers() } syncDuration := time.Since(st) @@ -344,12 +343,12 @@ func (s *watchableStore) moveVictims() (moved int) { // 2. iterate over the set to get the minimum revision and remove compacted watchers // 3. use minimum revision to get all key-value pairs and send those events to watchers // 4. remove synced watchers in set from unsynced group and move to synced group -func (s *watchableStore) syncWatchers(evs []mvccpb.Event) (int, []mvccpb.Event) { +func (s *watchableStore) syncWatchers() int { s.mu.Lock() defer s.mu.Unlock() if s.unsynced.size() == 0 { - return 0, []mvccpb.Event{} + return 0 } s.store.revMu.RLock() @@ -362,7 +361,7 @@ func (s *watchableStore) syncWatchers(evs []mvccpb.Event) (int, []mvccpb.Event) compactionRev := s.store.compactMainRev wg, minRev := s.unsynced.choose(maxWatchersPerSync, curRev, compactionRev) - evs = rangeEventsWithReuse(s.store.lg, s.store.b, evs, minRev, curRev+1) + evs := rangeEvents(s.store.lg, s.store.b, minRev, curRev+1, wg) victims := make(watcherBatch) wb := newWatcherBatch(wg, evs) @@ -411,43 +410,15 @@ func (s *watchableStore) syncWatchers(evs []mvccpb.Event) (int, []mvccpb.Event) } slowWatcherGauge.Set(float64(s.unsynced.size() + vsz)) - return s.unsynced.size(), evs -} - -// rangeEventsWithReuse returns events in range [minRev, maxRev), while reusing already provided events. -func rangeEventsWithReuse(lg *zap.Logger, b backend.Backend, evs []mvccpb.Event, minRev, maxRev int64) []mvccpb.Event { - if len(evs) == 0 { - return rangeEvents(lg, b, minRev, maxRev) - } - // append from left - if evs[0].Kv.ModRevision > minRev { - evs = append(rangeEvents(lg, b, minRev, evs[0].Kv.ModRevision), evs...) - } - // cut from left - prefixIndex := 0 - for prefixIndex < len(evs) && evs[prefixIndex].Kv.ModRevision < minRev { - prefixIndex++ - } - evs = evs[prefixIndex:] - - if len(evs) == 0 { - return rangeEvents(lg, b, minRev, maxRev) - } - // append from right - if evs[len(evs)-1].Kv.ModRevision+1 < maxRev { - evs = append(evs, rangeEvents(lg, b, evs[len(evs)-1].Kv.ModRevision+1, maxRev)...) - } - // cut from right - suffixIndex := len(evs) - 1 - for suffixIndex >= 0 && evs[suffixIndex].Kv.ModRevision >= maxRev { - suffixIndex-- - } - evs = evs[:suffixIndex+1] - return evs + return s.unsynced.size() } // rangeEvents returns events in range [minRev, maxRev). -func rangeEvents(lg *zap.Logger, b backend.Backend, minRev, maxRev int64) []mvccpb.Event { +func rangeEvents(lg *zap.Logger, b backend.Backend, minRev, maxRev int64, c contains) []mvccpb.Event { + if minRev < 0 { + lg.Warn("Unexpected negative revision range start", zap.Int64("minRev", minRev)) + minRev = 0 + } minBytes, maxBytes := NewRevBytes(), NewRevBytes() minBytes = RevToBytes(Revision{Main: minRev}, minBytes) maxBytes = RevToBytes(Revision{Main: maxRev}, maxBytes) @@ -457,7 +428,7 @@ func rangeEvents(lg *zap.Logger, b backend.Backend, minRev, maxRev int64) []mvcc tx := b.ReadTx() tx.RLock() revs, vs := tx.UnsafeRange(schema.Key, minBytes, maxBytes, 0) - evs := kvsToEvents(lg, revs, vs) + evs := kvsToEvents(lg, c, revs, vs) // Must unlock after kvsToEvents, because vs (come from boltdb memory) is not deep copy. // We can only unlock after Unmarshal, which will do deep copy. // Otherwise we will trigger SIGSEGV during boltdb re-mmap. @@ -465,14 +436,22 @@ func rangeEvents(lg *zap.Logger, b backend.Backend, minRev, maxRev int64) []mvcc return evs } +type contains interface { + contains(string) bool +} + // kvsToEvents gets all events for the watchers from all key-value pairs -func kvsToEvents(lg *zap.Logger, revs, vals [][]byte) (evs []mvccpb.Event) { +func kvsToEvents(lg *zap.Logger, c contains, revs, vals [][]byte) (evs []mvccpb.Event) { for i, v := range vals { var kv mvccpb.KeyValue if err := kv.Unmarshal(v); err != nil { lg.Panic("failed to unmarshal mvccpb.KeyValue", zap.Error(err)) } + if !c.contains(string(kv.Key)) { + continue + } + ty := mvccpb.PUT if isTombstone(revs[i]) { ty = mvccpb.DELETE diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 59f1aa63cc..f696c57d07 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -276,7 +276,7 @@ go.etcd.io/bbolt go.etcd.io/bbolt/errors go.etcd.io/bbolt/internal/common go.etcd.io/bbolt/internal/freelist -# go.etcd.io/etcd/api/v3 v3.6.5 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 +# go.etcd.io/etcd/api/v3 v3.6.5 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 ## explicit; go 1.24 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -286,7 +286,7 @@ go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version go.etcd.io/etcd/api/v3/versionpb -# go.etcd.io/etcd/client/pkg/v3 v3.6.5 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20251111143920-806f690e1f14 +# go.etcd.io/etcd/client/pkg/v3 v3.6.5 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260803133257-b6dda5413ec3 ## explicit; go 1.24 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -297,14 +297,14 @@ go.etcd.io/etcd/client/pkg/v3/tlsutil go.etcd.io/etcd/client/pkg/v3/transport go.etcd.io/etcd/client/pkg/v3/types go.etcd.io/etcd/client/pkg/v3/verify -# go.etcd.io/etcd/client/v3 v3.6.5 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 +# go.etcd.io/etcd/client/v3 v3.6.5 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 ## explicit; go 1.24 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/concurrency go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint go.etcd.io/etcd/client/v3/internal/resolver -# go.etcd.io/etcd/pkg/v3 v3.6.5 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 +# go.etcd.io/etcd/pkg/v3 v3.6.5 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 ## explicit; go 1.24 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -323,7 +323,7 @@ go.etcd.io/etcd/pkg/v3/runtime go.etcd.io/etcd/pkg/v3/schedule go.etcd.io/etcd/pkg/v3/traceutil go.etcd.io/etcd/pkg/v3/wait -# go.etcd.io/etcd/server/v3 v3.6.4 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 +# go.etcd.io/etcd/server/v3 v3.6.4 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 ## explicit; go 1.24 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -1101,11 +1101,11 @@ sigs.k8s.io/yaml/kyaml # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20251111143920-806f690e1f14 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20251111143920-806f690e1f14 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260803133257-b6dda5413ec3 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260803133257-b6dda5413ec3 # k8s.io/api => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/api # k8s.io/apiextensions-apiserver => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver # k8s.io/apimachinery => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery From 811610e86af76e754b16975754efd9c1e1af29a7 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Aug 2026 04:30:03 +0000 Subject: [PATCH 06/10] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 864f5b424e..aaf2ce8d9b 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -2,6 +2,6 @@ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d48cf4e9f495309b3c2e89f27712488d3082e0f1a87f2f04e27ce158aeb3f6a" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca761ac5454c637007e5a71c1034a690585d0bf9ec86af687e246a2552c24153" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index 22c4e48b9f..f36ac23784 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -2,6 +2,6 @@ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9366e77f7a8b66da74086330db3b12101804f318a166fc509bcb814dd3561fa0" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4975e373bf86cf6c2ef46021a06c96500dad56176f44bdd6ba71ae8da4581ff5" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From bb754d194485c75afc8a20970c2701e4339f648c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Aug 2026 04:30:04 +0000 Subject: [PATCH 07/10] update manifests --- .../multus/kustomization.aarch64.yaml | 4 ++-- .../multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 6 +++--- .../multus/release-multus-x86_64.json | 6 +++--- .../kustomization.aarch64.yaml | 10 +++++----- .../kustomization.x86_64.yaml | 10 +++++----- .../release-olm-aarch64.json | 8 ++++---- .../release-olm-x86_64.json | 8 ++++---- assets/release/release-aarch64.json | 18 +++++++++--------- assets/release/release-x86_64.json | 18 +++++++++--------- 10 files changed, 46 insertions(+), 46 deletions(-) diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index f0e8a8d0d8..eed15fdcf7 100644 --- a/assets/components/multus/kustomization.aarch64.yaml +++ b/assets/components/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:9c46922a21bd0ae743c76fff223c20df39de421c453c1e18ae0fed6c6af76452 + digest: sha256:40e54f90f81912b8ddd1683816c65667810e3fb3a4e0108dcdc6ee78bbbf20d7 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7c9e3b6703d1f1186011b90ad4840d4acafde845b7ce05bd3f184991e45ac887 + digest: sha256:4eb743030244ca568507c3c67934c58755bfd88e6a1dbfa2ae4dd6e6e5a70711 diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 72728813c3..67e88a0855 100644 --- a/assets/components/multus/kustomization.x86_64.yaml +++ b/assets/components/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:bfe2cdedca07243457a8a4509849aed7d17ad3f8a6042ba6ba93f516660a23a9 + digest: sha256:e23e347a525972e85b4afc95a679eaa0aba885980fff5b6a5e1db9e9a73b483c - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0d61ff9dce2accadf131c7c4408828673fa18456cd1f7380a123538346359c89 + digest: sha256:4be4a7c488a283f7d9fbe954be14e3a2da9e1f4ba5ab80900338998fe07743b8 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 5d54a23629..effdca831d 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2026-07-30-012031" + "base": "4.21.0-0.nightly-arm64-2026-08-19-232254" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c46922a21bd0ae743c76fff223c20df39de421c453c1e18ae0fed6c6af76452", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c9e3b6703d1f1186011b90ad4840d4acafde845b7ce05bd3f184991e45ac887" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40e54f90f81912b8ddd1683816c65667810e3fb3a4e0108dcdc6ee78bbbf20d7", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4eb743030244ca568507c3c67934c58755bfd88e6a1dbfa2ae4dd6e6e5a70711" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 74be590b6e..12c8292be0 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.21.0-0.nightly-2026-07-29-083019" + "base": "4.21.0-0.nightly-2026-08-18-080928" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfe2cdedca07243457a8a4509849aed7d17ad3f8a6042ba6ba93f516660a23a9", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d61ff9dce2accadf131c7c4408828673fa18456cd1f7380a123538346359c89" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e23e347a525972e85b4afc95a679eaa0aba885980fff5b6a5e1db9e9a73b483c", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4be4a7c488a283f7d9fbe954be14e3a2da9e1f4ba5ab80900338998fe07743b8" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 9ef393bd6f..c4cd5185b9 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6ca864715ebe6b3ff6531722f9f887b35b42cb37d4f07efa8927a811cc65bc19 + digest: sha256:53e693b28fa99a62e156ee15f5e394f6d76004fc2f90a94a437d2beec934324b - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:60d0dba79cf093b7f45c46ce1e97097d9fd6d46ef0f2f90b56d0ac55d96263b5 + digest: sha256:5038d7ed137269d294d2bad6aaa152783aa86c3e383ccc00492c8af1cf30e396 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:c20434325db1d2bd2644973e58966f8d8ca3793afd8df875a96a60e381571bb6 + digest: sha256:3c6c6adbb5cbbe12ce0f7d7fc7f1d184068c7c613e67d9744586a7b13f3ad916 patches: - patch: |- @@ -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:60d0dba79cf093b7f45c46ce1e97097d9fd6d46ef0f2f90b56d0ac55d96263b5 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5038d7ed137269d294d2bad6aaa152783aa86c3e383ccc00492c8af1cf30e396 - 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:6ca864715ebe6b3ff6531722f9f887b35b42cb37d4f07efa8927a811cc65bc19 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53e693b28fa99a62e156ee15f5e394f6d76004fc2f90a94a437d2beec934324b 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 6dc77bfdfb..ae3d41fe30 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:5a8549d4353edd06da204ebc1c7e43327c1c24bb82164c7f6e338c667c08add7 + digest: sha256:4a05f30d234690bab58863e4ab51beeec9386142cac6ad2322dd0543a3dd5586 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:75ad22915bb294701a4a85685785ab0d776a532296fab1e7a3ce3a9c5d0c9002 + digest: sha256:4458c7cf791b743261b8394e09c954bf1c458faa6db6164fb0d4b29d344d76e4 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:147ac00be29b9429bcad4164df488d1e5767c59c69af11b4fd9d61812dbf50b7 + digest: sha256:6a8c61c7e2d940fa06ff3bbbd8855fc4dad5852b181aa78a56cb7d5ae3542f39 patches: - patch: |- @@ -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:75ad22915bb294701a4a85685785ab0d776a532296fab1e7a3ce3a9c5d0c9002 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4458c7cf791b743261b8394e09c954bf1c458faa6db6164fb0d4b29d344d76e4 - 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:5a8549d4353edd06da204ebc1c7e43327c1c24bb82164c7f6e338c667c08add7 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a05f30d234690bab58863e4ab51beeec9386142cac6ad2322dd0543a3dd5586 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 0ecb0121c7..f0832b6e91 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.21.0-0.nightly-arm64-2026-07-30-012031" + "base": "4.21.0-0.nightly-arm64-2026-08-19-232254" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ca864715ebe6b3ff6531722f9f887b35b42cb37d4f07efa8927a811cc65bc19", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60d0dba79cf093b7f45c46ce1e97097d9fd6d46ef0f2f90b56d0ac55d96263b5", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c20434325db1d2bd2644973e58966f8d8ca3793afd8df875a96a60e381571bb6" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53e693b28fa99a62e156ee15f5e394f6d76004fc2f90a94a437d2beec934324b", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5038d7ed137269d294d2bad6aaa152783aa86c3e383ccc00492c8af1cf30e396", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c6c6adbb5cbbe12ce0f7d7fc7f1d184068c7c613e67d9744586a7b13f3ad916" } } 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 7cae45d16f..bceb7d3c3c 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.21.0-0.nightly-2026-07-29-083019" + "base": "4.21.0-0.nightly-2026-08-18-080928" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a8549d4353edd06da204ebc1c7e43327c1c24bb82164c7f6e338c667c08add7", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75ad22915bb294701a4a85685785ab0d776a532296fab1e7a3ce3a9c5d0c9002", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:147ac00be29b9429bcad4164df488d1e5767c59c69af11b4fd9d61812dbf50b7" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a05f30d234690bab58863e4ab51beeec9386142cac6ad2322dd0543a3dd5586", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4458c7cf791b743261b8394e09c954bf1c458faa6db6164fb0d4b29d344d76e4", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a8c61c7e2d940fa06ff3bbbd8855fc4dad5852b181aa78a56cb7d5ae3542f39" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index bc1578fd92..0ea45af148 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2026-07-30-012031" + "base": "4.21.0-0.nightly-arm64-2026-08-19-232254" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4baf1d2392143728f7bcfafa26f24161592ada6c2da1608948834b38e7f80cd", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7394d5614d1a3800d32b36e148fbdbc3222bf5fa8a163847defba671166e5f83", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b423908ca895043987974d0867ee91b53e6402901789bc213cdcd95636d9ebad", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c20434325db1d2bd2644973e58966f8d8ca3793afd8df875a96a60e381571bb6", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27b055a8e68fc5ae38873def2c966509e7d82d479d3dba4e59c4ad13875c1f52", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9366e77f7a8b66da74086330db3b12101804f318a166fc509bcb814dd3561fa0", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff5360ca1a513ce4f6ba3bdd77200ec5c87594c89a62e3dada56e9bbe0f19319", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59a7ca9472b52f3d6847a5592b51a9a149584a384fe06e651b3c2ba8eb89d36d", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cbcc0e4bf68553ae1e98cf83382fe7cb699928f89ec9bfd1c8c7f0d98414501d", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:82c6834bd389a85bb9cc4c18c8badd114cdeaa8b8b695e356de149354e991939", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c6c6adbb5cbbe12ce0f7d7fc7f1d184068c7c613e67d9744586a7b13f3ad916", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49c521b223bc873ab81464708831b640245a2e1b83c15ed1557daf25cc554584", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4975e373bf86cf6c2ef46021a06c96500dad56176f44bdd6ba71ae8da4581ff5", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b5f5dd1f48f0af54c7d7d2a8c639ff3bc2a9e453819fccca8c6ecfe81170801", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:e77365e44676fbd8ab9e4ce53f3a406856bbdfef3467c545a7df1197d84477af", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70d7afe32fae42cca5ec97fe6dd7a655f9a08ceaa93d90d7dd1fece4fed74fbd" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4893f17e4c001a4a3903220d51cf4f7836446b357d5e16a25dbad4dbdc6ac8c" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index c8089b0316..916b45a2d6 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.21.0-0.nightly-2026-07-29-083019" + "base": "4.21.0-0.nightly-2026-08-18-080928" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:730fa7709307d35d83d2e666aa18b806ac4bd9233d101484098d3a1220a60522", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01e18fb81efe1a975cc7a693564ed3fcb640d9d4c6fdefb9a70633eb4c351270", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:792bb54c2117d37e78e2c9a8297a65ed8e1907a48ad6bcf07ffdcc0c21a69971", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:147ac00be29b9429bcad4164df488d1e5767c59c69af11b4fd9d61812dbf50b7", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17b4a8b209a337f775731c66dc2e2f4d741fafcb362cfb1ba4cefbf5ea485c9c", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d48cf4e9f495309b3c2e89f27712488d3082e0f1a87f2f04e27ce158aeb3f6a", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9001817b7ad6bf355a12f4f92671ac8625c4f4ce26ca7fb67657b05fcd5d945", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d5d5854917a326e93443e9a51be3121195c9454cc7ea9b2d14d4f90ed5b590f", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7667791e0a1369f240602f810d145088388382f59684af44eced934181537cd", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f860186bf49308e35b0654034c8381eb3d23b21524b06306a9ba51021b752a1", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a8c61c7e2d940fa06ff3bbbd8855fc4dad5852b181aa78a56cb7d5ae3542f39", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1903faf4fea1a24829bc5ba853ed64a3786cb4451041909893d48e55885a4e0a", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca761ac5454c637007e5a71c1034a690585d0bf9ec86af687e246a2552c24153", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b00346989fd341923979f683430adcd5be5fad659e5116e7f26ff7c4ed68376", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:10c9ccab4f2857d113b55e12cac29aed0dc97d5a4e29ed2e4ea0f77551ee55f8", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9f03572ac8e5086eb916a6c38cf742c7449c5bae9a0797c121451d5383554c2" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98d4270508aacae31466b4a0d919c1d3fdf44a70fec214c29bae15df160bab1d" } } From 93e4988f6e91c883f0a4a5bd63ed5c14f4ea5549 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Aug 2026 04:30:09 +0000 Subject: [PATCH 08/10] update buildfiles --- Makefile.kube_git.var | 2 +- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 47fe7a71a0..f1bf964eb8 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=34 KUBE_GIT_VERSION=v1.34.9 -KUBE_GIT_COMMIT=ba6535cbb8719c3ba6c3923f2725ba050c87faab +KUBE_GIT_COMMIT=7ffd39de9bbb8e3edca8ee7530cf1dab522fbce2 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 0a74ebc34c..055e13ee79 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-arm64-2026-07-30-012031 +OCP_VERSION := 4.21.0-0.nightly-arm64-2026-08-19-232254 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 7b489e278e..bce8640119 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-2026-07-29-083019 +OCP_VERSION := 4.21.0-0.nightly-2026-08-18-080928 From 9ae6eaf4ba4c02eac7fa0f53a73284c88e7b37c1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Aug 2026 04:30:31 +0000 Subject: [PATCH 09/10] Update AI Model Serving for MicroShift --- .../ai-model-serving/release-ai-model-serving-x86_64.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json index 3ede9bcebf..a3e0977f6e 100644 --- a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json +++ b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "2.25.9" + "base": "2.25.10" }, "images": { "ray-tls-generator-image": "registry.redhat.io/ubi9/ubi-minimal:latest", From dacd3a605848ab4473dc4f41d2a0df7b0158437b Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Aug 2026 04:31:44 +0000 Subject: [PATCH 10/10] Update SR-IOV for MicroShift --- .../optional/sriov/kustomization.aarch64.yaml | 20 ++++++++--------- .../optional/sriov/kustomization.x86_64.yaml | 20 ++++++++--------- .../optional/sriov/release-sriov-aarch64.json | 22 +++++++++---------- .../optional/sriov/release-sriov-x86_64.json | 22 +++++++++---------- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/assets/optional/sriov/kustomization.aarch64.yaml b/assets/optional/sriov/kustomization.aarch64.yaml index 209c7239fd..0590efcb0f 100644 --- a/assets/optional/sriov/kustomization.aarch64.yaml +++ b/assets/optional/sriov/kustomization.aarch64.yaml @@ -1,7 +1,7 @@ images: - name: quay.io/openshift/sriov-network-operator newName: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator - digest: sha256:cf022b3d699c7f2988efa0ab32722c951bad164f1ef5e13adfc062fb46b47c1d + digest: sha256:8b0e43477287ca85f37abb6d03eedd3d77ee6eef4752213f0417419ec725f1d1 patches: - patch: |- @@ -9,47 +9,47 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: SRIOV_CNI_IMAGE - value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:a2042c240acaac54b214a3ea4e436c92c72c16111f093279048cb27ef38a1cd6 + value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:ab0bcef4de6f352e9c0bab949360fc9a4b85161024ee2dfbc2f6b1bf6896ae32 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_DEVICE_PLUGIN_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:0bb0c9b01fa23dd1a3ba6334fd8dc418a62992bdae7579c28002947d200eac6f + value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:98a590cb7ea209cd15855a3fac2997c972d677b8cbf7b3555fa59b2d159d1670 - op: add path: /spec/template/spec/containers/0/env/- value: name: NETWORK_RESOURCES_INJECTOR_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:540b6bf2abd31ec83d431b602c2e12e0f99ed4ab36fff776baf3417d26a40fc1 + value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:3c0a259bf3349df6bc986ed863ded3e2c4d45228e0cde41f9cb10a5a5af17356 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:89b210aee5cdabe41dfd25f04107a56cd145c36c3ad67f7ee900e3b01bf2c944 + value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:acdd1ed47fe167351eeaa45a7d73cfc55aed494fa2e40791bab942116c8c7bab - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_WEBHOOK_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:6db37040285eab4deaeb550f3d597d0962513244021f70241e38776db16d9e09 + value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:cfc8da535764b51b1cfc6f13ef03651682b833efead613a338792077169f59c0 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_INFINIBAND_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:150971baaf9663a24959b937eea6527934b3af6696357f0c235e496dd7679191 + value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:27b35c99580167199d67e0375696fba06f1ab17971f6b20c912aef2d35775c2b - op: add path: /spec/template/spec/containers/0/env/- value: name: RDMA_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:529a142daaacef07b226ec32901a5e20840fa448b7b9695206bfae501510c12c + value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:0f66af9322702c4b458e7d3a67ff33e5c587611708210be251ec1918e779bec5 - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:150ab64455da79c26206594c06e120d1895d64d500616c74527d35cf1a6e53bd + value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:a3a36e711deca413236e3659b7f4f895da7f21ce7a6b5d04287892602f3afa78 - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE - value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:9015fcc16550ac84be79e71e77b4ac2bce923e1ef1f967b1b0cde5e7b8df0eb3 + value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:bc60dfbb17d488dfa4ab73f0d430f4680a61605c502a37fde01cba89500cd08c target: kind: Deployment name: sriov-network-operator diff --git a/assets/optional/sriov/kustomization.x86_64.yaml b/assets/optional/sriov/kustomization.x86_64.yaml index b2052fcac3..24eddcec19 100644 --- a/assets/optional/sriov/kustomization.x86_64.yaml +++ b/assets/optional/sriov/kustomization.x86_64.yaml @@ -1,7 +1,7 @@ images: - name: quay.io/openshift/sriov-network-operator newName: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator - digest: sha256:698a45b1d8fda40d37c64dd5cf2d7380a8ea57c02c4a7df4faa217744567b943 + digest: sha256:882dcd3d2377d3b56ece1bda8036ddb82ecea10e81546dddca80e61093a62f58 patches: - patch: |- @@ -9,47 +9,47 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: SRIOV_CNI_IMAGE - value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:3271753f822f87cc8d6316dca3395b5c0c2e442f85018e08fd38b9118a48f22c + value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:4ec5b3166e93b8b4df7738fe778c030bebef1d40d70c0a6c9702415478a0ae41 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_DEVICE_PLUGIN_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:7fea9d7749ab5c9fa3416a832f43641953edbdd53228948f9d5a51aa9012460b + value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:da378ab41d9b178703b6f63021f53dcfa0eb13def879440b8388d284aba2fb8c - op: add path: /spec/template/spec/containers/0/env/- value: name: NETWORK_RESOURCES_INJECTOR_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:2b653e893913c7d9fec3a95fb7bc56055ce0530993e44ce2e768b26f26680383 + value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:69380c9546db0edbbd88f0562f11845554aaa29bc910c0a6a86b3ea51bcba6db - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:42567053ef707d75fdcb1982b8057c4f641665457c1e0734601384a2d9e661e2 + value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:95a2fdb7edeb1d602939f28d8275ce1f9a8eb6e5903b41ad49988b5764283bc9 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_WEBHOOK_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:5ddd012077ea5044ef76d72e51d422d4db67fc42dd6e08248cb8623385db922a + value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:f2e6a8c8fc8073712145e3e01df20755855d389ac9c543998d81d222607ebfa4 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_INFINIBAND_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:b22b99a1ada66fc7df460e9a008c37897f05e58758a418f4621a5358e4aa3677 + value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ba521292b2d11f083c3dbd3f762d1aa27ad5021903b43b7b4870a77e89997702 - op: add path: /spec/template/spec/containers/0/env/- value: name: RDMA_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:1c9349f3ae515382a96fb5b3921aaa7fb4ded80ee3ba889ed4a0c67054077fb7 + value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:e7ac128ebe65e5f7bc283f9615cd77608b94eb5fe997000d083fbc6159d75c30 - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:0f63c7ba3aca11bb60672d9a65b4dc275fe87fcece753e5198232a428e7c3257 + value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:b8f57de27e38f7c2bff1c109d2ab73b0de9ab7444ca1c987064da84e4d4d0c92 - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE - value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:61bc81ad1f2cb0f5e69583b43061c312c30bd0f5cd3c4005d5000c796eaa2429 + value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:0930105be4f986de94bae433c7fe08d2956d554d05ab011e5e900f3e75e21e7b target: kind: Deployment name: sriov-network-operator diff --git a/assets/optional/sriov/release-sriov-aarch64.json b/assets/optional/sriov/release-sriov-aarch64.json index 44c1f9b5ff..f683aef092 100644 --- a/assets/optional/sriov/release-sriov-aarch64.json +++ b/assets/optional/sriov/release-sriov-aarch64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.20.0-202607171900" + "base": "4.20.0-202608112153" }, "images": { - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:150ab64455da79c26206594c06e120d1895d64d500616c74527d35cf1a6e53bd", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:9015fcc16550ac84be79e71e77b4ac2bce923e1ef1f967b1b0cde5e7b8df0eb3", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:540b6bf2abd31ec83d431b602c2e12e0f99ed4ab36fff776baf3417d26a40fc1", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:529a142daaacef07b226ec32901a5e20840fa448b7b9695206bfae501510c12c", - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:a2042c240acaac54b214a3ea4e436c92c72c16111f093279048cb27ef38a1cd6", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:0bb0c9b01fa23dd1a3ba6334fd8dc418a62992bdae7579c28002947d200eac6f", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:150971baaf9663a24959b937eea6527934b3af6696357f0c235e496dd7679191", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:89b210aee5cdabe41dfd25f04107a56cd145c36c3ad67f7ee900e3b01bf2c944", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:cf022b3d699c7f2988efa0ab32722c951bad164f1ef5e13adfc062fb46b47c1d", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:6db37040285eab4deaeb550f3d597d0962513244021f70241e38776db16d9e09" + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:a3a36e711deca413236e3659b7f4f895da7f21ce7a6b5d04287892602f3afa78", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:bc60dfbb17d488dfa4ab73f0d430f4680a61605c502a37fde01cba89500cd08c", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:3c0a259bf3349df6bc986ed863ded3e2c4d45228e0cde41f9cb10a5a5af17356", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:0f66af9322702c4b458e7d3a67ff33e5c587611708210be251ec1918e779bec5", + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:ab0bcef4de6f352e9c0bab949360fc9a4b85161024ee2dfbc2f6b1bf6896ae32", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:98a590cb7ea209cd15855a3fac2997c972d677b8cbf7b3555fa59b2d159d1670", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:27b35c99580167199d67e0375696fba06f1ab17971f6b20c912aef2d35775c2b", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:acdd1ed47fe167351eeaa45a7d73cfc55aed494fa2e40791bab942116c8c7bab", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:8b0e43477287ca85f37abb6d03eedd3d77ee6eef4752213f0417419ec725f1d1", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:cfc8da535764b51b1cfc6f13ef03651682b833efead613a338792077169f59c0" } } diff --git a/assets/optional/sriov/release-sriov-x86_64.json b/assets/optional/sriov/release-sriov-x86_64.json index 7f11eac87e..7ab7ae45d6 100644 --- a/assets/optional/sriov/release-sriov-x86_64.json +++ b/assets/optional/sriov/release-sriov-x86_64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.20.0-202607171900" + "base": "4.20.0-202608112153" }, "images": { - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:0f63c7ba3aca11bb60672d9a65b4dc275fe87fcece753e5198232a428e7c3257", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:61bc81ad1f2cb0f5e69583b43061c312c30bd0f5cd3c4005d5000c796eaa2429", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:2b653e893913c7d9fec3a95fb7bc56055ce0530993e44ce2e768b26f26680383", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:1c9349f3ae515382a96fb5b3921aaa7fb4ded80ee3ba889ed4a0c67054077fb7", - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:3271753f822f87cc8d6316dca3395b5c0c2e442f85018e08fd38b9118a48f22c", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:7fea9d7749ab5c9fa3416a832f43641953edbdd53228948f9d5a51aa9012460b", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:b22b99a1ada66fc7df460e9a008c37897f05e58758a418f4621a5358e4aa3677", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:42567053ef707d75fdcb1982b8057c4f641665457c1e0734601384a2d9e661e2", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:698a45b1d8fda40d37c64dd5cf2d7380a8ea57c02c4a7df4faa217744567b943", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:5ddd012077ea5044ef76d72e51d422d4db67fc42dd6e08248cb8623385db922a" + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:b8f57de27e38f7c2bff1c109d2ab73b0de9ab7444ca1c987064da84e4d4d0c92", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:0930105be4f986de94bae433c7fe08d2956d554d05ab011e5e900f3e75e21e7b", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:69380c9546db0edbbd88f0562f11845554aaa29bc910c0a6a86b3ea51bcba6db", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:e7ac128ebe65e5f7bc283f9615cd77608b94eb5fe997000d083fbc6159d75c30", + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:4ec5b3166e93b8b4df7738fe778c030bebef1d40d70c0a6c9702415478a0ae41", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:da378ab41d9b178703b6f63021f53dcfa0eb13def879440b8388d284aba2fb8c", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ba521292b2d11f083c3dbd3f762d1aa27ad5021903b43b7b4870a77e89997702", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:95a2fdb7edeb1d602939f28d8275ce1f9a8eb6e5903b41ad49988b5764283bc9", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:882dcd3d2377d3b56ece1bda8036ddb82ecea10e81546dddca80e61093a62f58", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:f2e6a8c8fc8073712145e3e01df20755855d389ac9c543998d81d222607ebfa4" } }