OCPBUGS-56749: DownStream Merge [10-24-2025]

contrib/kind-common

@@ -413,8 +413,18 @@ install_kubevirt() {
       if ! is_nested_virt_enabled; then
         kubectl -n kubevirt patch kubevirt kubevirt --type=merge --patch '{"spec":{"configuration":{"developerConfiguration":{"useEmulation":true}}}}'
       fi
-      kubectl -n kubevirt patch kubevirt kubevirt --type=merge --patch '{"spec":{"configuration":{"virtualMachineOptions":{"disableSerialConsoleLog":{}}}}}'
     fi
+
+    kubectl -n kubevirt patch kubevirt kubevirt --type=json --patch '[
+        {"op":"add","path":"/spec/configuration/virtualMachineOptions","value":{}},
+        {"op":"add","path":"/spec/configuration/virtualMachineOptions/disableSerialConsoleLog","value":{}},
+        {"op":"add","path":"/spec/configuration/developerConfiguration","value":{"featureGates":[]}},
+        {"op":"add","path":"/spec/configuration/developerConfiguration/featureGates/-","value":"NetworkBindingPlugins"},
+        {"op":"add","path":"/spec/configuration/developerConfiguration/featureGates/-","value":"DynamicPodInterfaceNaming"},
+        {"op":"add","path":"/spec/configuration/network","value":{}},
+        {"op":"add","path":"/spec/configuration/network/binding","value":{"l2bridge":{"domainAttachmentType":"managedTap","migration":{}}}}
+    ]'
+
     if ! kubectl wait -n kubevirt kv kubevirt --for condition=Available --timeout 15m; then
         kubectl get pod -n kubevirt -l || true
         kubectl describe pod -n kubevirt -l || true
@@ -423,12 +433,6 @@ install_kubevirt() {
             kubectl logs --all-containers=true -n kubevirt $p || true
         done
     fi
-
-    kubectl -n kubevirt patch kubevirt kubevirt --type=json --patch '[{"op":"add","path":"/spec/configuration/developerConfiguration","value":{"featureGates":[]}},{"op":"add","path":"/spec/configuration/developerConfiguration/featureGates/-","value":"NetworkBindingPlugins"},{"op":"add","path":"/spec/configuration/developerConfiguration/featureGates/-","value":"DynamicPodInterfaceNaming"}]'
-
-    local kubevirt_stable_release_url=$(get_kubevirt_release_url "stable")
-    kubectl -n kubevirt patch kubevirt kubevirt --type=json --patch '[{"op":"add","path":"/spec/configuration/network","value":{}},{"op":"add","path":"/spec/configuration/network/binding","value":{"l2bridge":{"domainAttachmentType":"managedTap","migration":{}}}}]'
-
 }
 
 install_cert_manager() {

contrib/kind-helm.sh

@@ -52,8 +52,8 @@ set_default_params() {
   export SVC_CIDR_IPV6=${SVC_CIDR_IPV6:-fd00:10:96::/112}
   export JOIN_SUBNET_IPV4=${JOIN_SUBNET_IPV4:-100.64.0.0/16}
   export JOIN_SUBNET_IPV6=${JOIN_SUBNET_IPV6:-fd98::/64}
-  export TRANSIT_SWITCH_SUBNET_IPV4=${TRANSIT_SWITCH_SUBNET_IPV4:-100.88.0.0/16}
-  export TRANSIT_SWITCH_SUBNET_IPV6=${TRANSIT_SWITCH_SUBNET_IPV6:-fd97::/64}
+  export TRANSIT_SUBNET_IPV4=${TRANSIT_SUBNET_IPV4:-100.88.0.0/16}
+  export TRANSIT_SUBNET_IPV6=${TRANSIT_SUBNET_IPV6:-fd97::/64}
   export METALLB_CLIENT_NET_SUBNET_IPV4=${METALLB_CLIENT_NET_SUBNET_IPV4:-172.22.0.0/16}
   export METALLB_CLIENT_NET_SUBNET_IPV6=${METALLB_CLIENT_NET_SUBNET_IPV6:-fc00:f853:ccd:e792::/64}
 

contrib/kind.sh

@@ -593,8 +593,8 @@ set_default_params() {
   JOIN_SUBNET_IPV6=${JOIN_SUBNET_IPV6:-fd98::/64}
   MASQUERADE_SUBNET_IPV4=${MASQUERADE_SUBNET_IPV4:-169.254.0.0/17}
   MASQUERADE_SUBNET_IPV6=${MASQUERADE_SUBNET_IPV6:-fd69::/112}
-  TRANSIT_SWITCH_SUBNET_IPV4=${TRANSIT_SWITCH_SUBNET_IPV4:-100.88.0.0/16}
-  TRANSIT_SWITCH_SUBNET_IPV6=${TRANSIT_SWITCH_SUBNET_IPV6:-fd97::/64}
+  TRANSIT_SUBNET_IPV4=${TRANSIT_SUBNET_IPV4:-100.88.0.0/16}
+  TRANSIT_SUBNET_IPV6=${TRANSIT_SUBNET_IPV6:-fd97::/64}
   METALLB_CLIENT_NET_SUBNET_IPV4=${METALLB_CLIENT_NET_SUBNET_IPV4:-172.22.0.0/16}
   METALLB_CLIENT_NET_SUBNET_IPV6=${METALLB_CLIENT_NET_SUBNET_IPV6:-fc00:f853:ccd:e792::/64}
   BGP_SERVER_NET_SUBNET_IPV4=${BGP_SERVER_NET_SUBNET_IPV4:-172.26.0.0/16}
@@ -631,7 +631,7 @@ set_default_params() {
   OVN_HOST_NETWORK_NAMESPACE=${OVN_HOST_NETWORK_NAMESPACE:-ovn-host-network}
   OVN_EGRESSIP_HEALTHCHECK_PORT=${OVN_EGRESSIP_HEALTHCHECK_PORT:-9107}
   OCI_BIN=${KIND_EXPERIMENTAL_PROVIDER:-docker}
-  OVN_DEPLOY_PODS=${OVN_DEPLOY_PODS:-"ovnkube-zone-controller ovnkube-control-plane ovnkube-master ovnkube-node"}
+  OVN_DEPLOY_PODS=${OVN_DEPLOY_PODS:-"ovnkube-identity ovnkube-zone-controller ovnkube-control-plane ovnkube-master ovnkube-node"}
   OVN_METRICS_SCALE_ENABLE=${OVN_METRICS_SCALE_ENABLE:-false}
   OVN_ISOLATED=${OVN_ISOLATED:-false}
   OVN_GATEWAY_OPTS=${OVN_GATEWAY_OPTS:-""}
@@ -914,8 +914,8 @@ create_ovn_kube_manifests() {
     --v6-join-subnet="${JOIN_SUBNET_IPV6}" \
     --v4-masquerade-subnet="${MASQUERADE_SUBNET_IPV4}" \
     --v6-masquerade-subnet="${MASQUERADE_SUBNET_IPV6}" \
-    --v4-transit-switch-subnet="${TRANSIT_SWITCH_SUBNET_IPV4}" \
-    --v6-transit-switch-subnet="${TRANSIT_SWITCH_SUBNET_IPV6}" \
+    --v4-transit-subnet="${TRANSIT_SUBNET_IPV4}" \
+    --v6-transit-subnet="${TRANSIT_SUBNET_IPV6}" \
     --ex-gw-network-interface="${OVN_EX_GW_NETWORK_INTERFACE}" \
     --multi-network-enable="${ENABLE_MULTI_NET}" \
     --network-segmentation-enable="${ENABLE_NETWORK_SEGMENTATION}" \

dist/images/daemonset.sh

@@ -79,8 +79,8 @@ OVN_V4_JOIN_SUBNET=""
 OVN_V6_JOIN_SUBNET=""
 OVN_V4_MASQUERADE_SUBNET=""
 OVN_V6_MASQUERADE_SUBNET=""
-OVN_V4_TRANSIT_SWITCH_SUBNET=""
-OVN_V6_TRANSIT_SWITCH_SUBNET=""
+OVN_V4_TRANSIT_SUBNET=""
+OVN_V6_TRANSIT_SUBNET=""
 OVN_NETFLOW_TARGETS=""
 OVN_SFLOW_TARGETS=""
 OVN_IPFIX_TARGETS=""
@@ -302,11 +302,11 @@ while [ "$1" != "" ]; do
   --v6-masquerade-subnet)
     OVN_V6_MASQUERADE_SUBNET=$VALUE
     ;;
-  --v4-transit-switch-subnet)
-    OVN_V4_TRANSIT_SWITCH_SUBNET=$VALUE
+  --v4-transit-subnet)
+    OVN_V4_TRANSIT_SUBNET=$VALUE
     ;; 
-  --v6-transit-switch-subnet)
-    OVN_V6_TRANSIT_SWITCH_SUBNET=$VALUE
+  --v6-transit-subnet)
+    OVN_V6_TRANSIT_SUBNET=$VALUE
     ;; 
   --netflow-targets)
     OVN_NETFLOW_TARGETS=$VALUE
@@ -536,10 +536,10 @@ ovn_v4_masquerade_subnet=${OVN_V4_MASQUERADE_SUBNET}
 echo "ovn_v4_masquerade_subnet: ${ovn_v4_masquerade_subnet}"
 ovn_v6_masquerade_subnet=${OVN_V6_MASQUERADE_SUBNET}
 echo "ovn_v6_masquerade_subnet: ${ovn_v6_masquerade_subnet}"
-ovn_v4_transit_switch_subnet=${OVN_V4_TRANSIT_SWITCH_SUBNET}
-echo "ovn_v4_transit_switch_subnet: ${ovn_v4_transit_switch_subnet}"
-ovn_v6_transit_switch_subnet=${OVN_V6_TRANSIT_SWITCH_SUBNET}
-echo "ovn_v6_transit_switch_subnet: ${ovn_v6_transit_switch_subnet}"
+ovn_v4_transit_subnet=${OVN_V4_TRANSIT_SUBNET}
+echo "ovn_v4_transit_subnet: ${ovn_v4_transit_subnet}"
+ovn_v6_transit_subnet=${OVN_V6_TRANSIT_SUBNET}
+echo "ovn_v6_transit_subnet: ${ovn_v6_transit_subnet}"
 ovn_netflow_targets=${OVN_NETFLOW_TARGETS}
 echo "ovn_netflow_targets: ${ovn_netflow_targets}"
 ovn_sflow_targets=${OVN_SFLOW_TARGETS}
@@ -842,8 +842,8 @@ ovn_image=${ovnkube_image} \
   ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
   ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
   ovn_network_qos_enable=${ovn_network_qos_enable} \
-  ovn_v4_transit_switch_subnet=${ovn_v4_transit_switch_subnet} \
-  ovn_v6_transit_switch_subnet=${ovn_v6_transit_switch_subnet} \
+  ovn_v4_transit_subnet=${ovn_v4_transit_subnet} \
+  ovn_v6_transit_subnet=${ovn_v6_transit_subnet} \
   ovn_enable_persistent_ips=${ovn_enable_persistent_ips} \
   ovn_enable_dnsnameresolver=${ovn_enable_dnsnameresolver} \
   ovn_observ_enable=${ovn_observ_enable} \

dist/images/ovnkube.sh

@@ -238,10 +238,10 @@ ovn_v6_join_subnet=${OVN_V6_JOIN_SUBNET:-}
 ovn_v4_masquerade_subnet=${OVN_V4_MASQUERADE_SUBNET:-}
 # OVN_V6_MASQUERADE_SUBNET - v6 masquerade subnet
 ovn_v6_masquerade_subnet=${OVN_V6_MASQUERADE_SUBNET:-}
-# OVN_V4_TRANSIT_SWITCH_SUBNET - v4 Transit switch subnet
-ovn_v4_transit_switch_subnet=${OVN_V4_TRANSIT_SWITCH_SUBNET:-}
-# OVN_V6_TRANSIT_SWITCH_SUBNET - v6 Transit switch subnet
-ovn_v6_transit_switch_subnet=${OVN_V6_TRANSIT_SWITCH_SUBNET:-}
+# OVN_V4_TRANSIT_SUBNET - v4 Transit subnet
+ovn_v4_transit_subnet=${OVN_V4_TRANSIT_SUBNET:-}
+# OVN_V6_TRANSIT_SUBNET - v6 Transit subnet
+ovn_v6_transit_subnet=${OVN_V6_TRANSIT_SUBNET:-}
 #OVN_REMOTE_PROBE_INTERVAL - ovn remote probe interval in ms (default 100000)
 ovn_remote_probe_interval=${OVN_REMOTE_PROBE_INTERVAL:-100000}
 #OVN_MONITOR_ALL - ovn-controller monitor all data in SB DB
@@ -2356,17 +2356,17 @@ ovn-cluster-manager() {
   fi
   echo "ovn_v6_masquerade_subnet_opt=${ovn_v6_masquerade_subnet_opt}"
 
-  ovn_v4_transit_switch_subnet_opt=
-  if [[ -n ${ovn_v4_transit_switch_subnet} ]]; then
-      ovn_v4_transit_switch_subnet_opt="--cluster-manager-v4-transit-switch-subnet=${ovn_v4_transit_switch_subnet}"
+  ovn_v4_transit_subnet_opt=
+  if [[ -n ${ovn_v4_transit_subnet} ]]; then
+      ovn_v4_transit_subnet_opt="--cluster-manager-v4-transit-subnet=${ovn_v4_transit_subnet}"
   fi
-  echo "ovn_v4_transit_switch_subnet_opt=${ovn_v4_transit_switch_subnet}"
+  echo "ovn_v4_transit_subnet_opt=${ovn_v4_transit_subnet}"
 
-  ovn_v6_transit_switch_subnet_opt=
-  if [[ -n ${ovn_v6_transit_switch_subnet} ]]; then
-      ovn_v6_transit_switch_subnet_opt="--cluster-manager-v6-transit-switch-subnet=${ovn_v6_transit_switch_subnet}"
+  ovn_v6_transit_subnet_opt=
+  if [[ -n ${ovn_v6_transit_subnet} ]]; then
+      ovn_v6_transit_subnet_opt="--cluster-manager-v6-transit-subnet=${ovn_v6_transit_subnet}"
   fi
-  echo "ovn_v6_transit_switch_subnet_opt=${ovn_v6_transit_switch_subnet}"
+  echo "ovn_v6_transit_subnet_opt=${ovn_v6_transit_subnet}"
 
   multicast_enabled_flag=
   if [[ ${ovn_multicast_enable} == "true" ]]; then
@@ -2476,8 +2476,8 @@ ovn-cluster-manager() {
     ${ovn_v4_masquerade_subnet_opt} \
     ${ovn_v6_join_subnet_opt} \
     ${ovn_v6_masquerade_subnet_opt} \
-    ${ovn_v4_transit_switch_subnet_opt} \
-    ${ovn_v6_transit_switch_subnet_opt} \
+    ${ovn_v4_transit_subnet_opt} \
+    ${ovn_v6_transit_subnet_opt} \
     ${network_qos_enabled_flag} \
     ${ovn_enable_dnsnameresolver_flag} \
     --gateway-mode=${ovn_gateway_mode} \

dist/templates/ovnkube-control-plane.yaml.j2

@@ -179,10 +179,10 @@ spec:
           value: "{{ ovn_enable_interconnect }}"
         - name: OVN_ENABLE_MULTI_EXTERNAL_GATEWAY
           value: "{{ ovn_enable_multi_external_gateway }}"
-        - name: OVN_V4_TRANSIT_SWITCH_SUBNET
-          value: "{{ ovn_v4_transit_switch_subnet }}"
-        - name: OVN_V6_TRANSIT_SWITCH_SUBNET
-          value: "{{ ovn_v6_transit_switch_subnet }}"
+        - name: OVN_V4_TRANSIT_SUBNET
+          value: "{{ ovn_v4_transit_subnet }}"
+        - name: OVN_V6_TRANSIT_SUBNET
+          value: "{{ ovn_v6_transit_subnet }}"
         - name: OVN_ENABLE_PERSISTENT_IPS
           value: "{{ ovn_enable_persistent_ips }}"
         - name: OVN_NETWORK_QOS_ENABLE

docs/installation/ovnkube.1

@@ -154,10 +154,10 @@ Show help.
 \fB\--version\fR, \fB\-v\fR
 Print the version.
 .TP
-\fB\--cluster-manager-v4-transit-switch-subnet\fR string
+\fB\--cluster-manager-v4-transit-subnet\fR string
 The v4 transit switch subnet to use for assigning transit switch IPv4 addresses\fR.
 .TP
-\fB\--cluster-manager-v6-transit-switch-subnet\fR string
+\fB\--cluster-manager-v6-transit-subnet\fR string
 The v6 transit switch subnet to use for assigning transit switch IPv6 addresses\fR.
 
 .SH "SEE ALSO"

go-controller/.mockery.yaml

@@ -13,7 +13,6 @@ packages:
   github.com/ovn-org/ovn-kubernetes/go-controller/pkg/cni:
     interfaces:
       CNIPluginLibOps:
-      NetNS:
     config:
       dir: pkg/cni/mocks
   github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube:
@@ -24,9 +23,9 @@ packages:
     config:
       all: true
       dir: pkg/kube/mocks
-  github.com/ovn-org/ovn-kubernetes/go-controller/pkg/node:
+  github.com/ovn-org/ovn-kubernetes/go-controller/pkg/node/managementport:
     interfaces:
-      ManagementPort:
+      Interface:
   github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/address_set:
     config:
       all: true

go-controller/Makefile

@@ -35,7 +35,7 @@ TOOLS_OUTPUT_DIR = ${CURDIR}/${OUT_DIR}
 MOCKERY = ${TOOLS_OUTPUT_DIR}/mockery-${MOCKERY_VERSION}
 
 ## Tool Versions
-MOCKERY_VERSION ?= v2.43.2
+MOCKERY_VERSION ?= v2.53.4
 
 export NOROOT