Merge remote-tracking branch 'upstream/master' into fix/d/s-merge-08-16-2025

Author: jluhrsen

Dockerfile.microshift

@@ -12,15 +12,15 @@
 # openvswitch-devel, openvswitch-ipsec, libpcap, iproute etc
 # ovn-kube-util, hybrid-overlay-node.exe, ovndbchecker and ovnkube-trace
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
 
 WORKDIR /go/src/github.com/openshift/ovn-kubernetes
 COPY . .
 
 # build the binaries
 RUN cd go-controller; CGO_ENABLED=0 make
 
-FROM registry.ci.openshift.org/ocp/4.19:ovn-kubernetes-base
+FROM registry.ci.openshift.org/ocp/4.20:ovn-kubernetes-base
 
 USER root