[release-4.18] OCPBUGS-59680, OCPBUGS-48710, OCPBUGS-61748: DownStream Merge Sync from 4.19 [07-14-2025]

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.23-openshift-4.19
+  tag: rhel-9-release-golang-1.24-openshift-4.20

.coderabbit.yml

@@ -0,0 +1,2 @@
+paths_ignore:
+  - "**/vendor/**"

.github/workflows/docker.yml

@@ -2,7 +2,7 @@ name: ovn-docker-images
 
 on:
   push:
-    branches: [ master,release-1.0 ]
+    branches: [ master,release-1.0,release-1.1 ]
 
 permissions:
   contents: read

Dockerfile

@@ -5,15 +5,15 @@
 # The standard name for this image is ovn-kube
 
 # Build RHEL-9 binaries
-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 . .
 RUN cd go-controller; CGO_ENABLED=1 make
 RUN cd go-controller; CGO_ENABLED=0 make windows
 
 # Build RHEL-8 binaries (for upgrades from 4.12 and earlier)
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.23-openshift-4.19 AS rhel8
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.20 AS rhel8
 WORKDIR /go/src/github.com/openshift/ovn-kubernetes
 COPY . .
 RUN cd go-controller; CGO_ENABLED=1 make
@@ -26,7 +26,7 @@ RUN cd go-controller; CGO_ENABLED=1 make
 # - creating directories required by ovn-kubernetes
 # - git commit number
 # - ovnkube.sh script
-FROM registry.ci.openshift.org/ocp/4.19:ovn-kubernetes-base
+FROM registry.ci.openshift.org/ocp/4.20:ovn-kubernetes-base
 
 USER root
 

Dockerfile.base

@@ -5,7 +5,7 @@
 # The standard name for this image is ovn-kubernetes-base
 
 # build base image shared by both OpenShift and MicroShift
-FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
 
 # install selinux-policy first to avoid a race
 RUN dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs \
@@ -17,13 +17,13 @@ RUN dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs \
 # reduces the number of variables in the system) and receive all the CVE and
 # bug fixes automatically.
 ARG ovsver=3.5
-ARG ovnver=24.09.2-69.el9fdp
+ARG ovnver=25.03.0-73.el9fdp
 # NOTE: Ensure that the versions of OVS and OVN are overriden for OKD in each of the subsequent layers.
 # Centos and RHEL releases for ovn are built out of sync, so please make sure to bump for OKD with
 # the corresponding Centos version when updating the OCP version.
 ARG ovsver_okd=3.5
 # We are not bumping the OVN version for OKD since the FDP release is not done yet.
-ARG ovnver_okd=24.09.1-10.el9s
+ARG ovnver_okd=25.03.1-36.el9s
 
 RUN INSTALL_PKGS="iptables nftables" && \
     source /etc/os-release && \

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
 

MEETINGS.md

@@ -6,7 +6,7 @@ All are welcome to join our meetings! If you want to discuss something with the
 
 ## Meeting time
 
-We meet alternate Monday's at 6:00 PM CET/CEST.
+We meet alternate Monday's at 5:00 PM CET/CEST.
 In order to figure out when our next meeting is, please check our agenda for previous meeting history.
 The meetings last up to 1 hour.