Merge pull request #2675 from jluhrsen/4.19-sync-from-4.20-07-17-2025

[release-4.19] OCPBUGS-59530,OCPBUGS-48709: DownStream Merge Sync from 4.20 [07-17-2025]

Author: openshift-merge-bot[bot]

OWNERS

@@ -1,16 +1,14 @@
 reviewers:
-  - abhat
-  - dcbw
-  - JacobTanenbaum
   - jcaamano
+  - kyrtapz
+  - martinkennelly
   - trozet
   - tssurya
 approvers:
   - abhat
-  - danwinship
-  - dcbw
-  - JacobTanenbaum
   - jcaamano
+  - kyrtapz
+  - martinkennelly
   - knobunc
   - trozet
   - tssurya

contrib/kind.sh

@@ -845,14 +845,14 @@ build_ovn_image() {
     # store in local registry
     if [ "$KIND_LOCAL_REGISTRY" == true ];then
       echo "Pushing built image to local $OCI_BIN registry"
-      $OCI_BIN push "$push_args" "$OVN_IMAGE"
+      $OCI_BIN push $push_args "$OVN_IMAGE"
     fi
   # We should push to local registry if image is not remote
   elif [ "${OVN_IMAGE}" != "" -a "${KIND_LOCAL_REGISTRY}" == true ] && (echo "$OVN_IMAGE" | grep / -vq); then
     local local_registry_ovn_image="localhost:5000/${OVN_IMAGE}"
     $OCI_BIN tag "$OVN_IMAGE" $local_registry_ovn_image
     OVN_IMAGE=$local_registry_ovn_image
-    $OCI_BIN push "$push_args" "$OVN_IMAGE"
+    $OCI_BIN push $push_args "$OVN_IMAGE"
   fi
 }
 

docs/developer-guide/developer.md

@@ -5,11 +5,12 @@ This file aims to have information that is useful to the people contributing to
 ## Generating ovsdb bindings using modelgen
 
 In order to generate the latest NBDB and SBDB bindings, we have a tool called `modelgen`
-which lives in the libovsdb repo: https://github.com/ovn-org/libovsdb#modelgen. It is a
+which lives in the libovsdb repo: https://github.com/ovn-kubernetes/libovsdb#modelgen. It is a
 [code generator](https://go.dev/blog/generate) that uses `pkg/nbdb/gen.go` and `pkg/sbdb/gen.go`
 files to auto-generate the models and additional code like deep-copy methods.
 
 In order to use this tool do the following:
+
 ```
 $ cd go-controller/
 $ make modelgen

go-controller/.golangci.yml

@@ -33,6 +33,7 @@ linters-settings:
       - default
       - prefix(k8s.io,sigs.k8s.io)
       - prefix(github.com/ovn-org)
+      - prefix(github.com/ovn-kubernetes)
       - localmodule
       - dot
 
@@ -41,7 +42,7 @@ linters-settings:
     disable:
       - fieldalignment
       - shadow
-  
+
   importas:
     no-unaliased: true
     alias:
@@ -57,9 +58,9 @@ linters-settings:
       - pkg: sigs.k8s.io/controller-runtime
         alias: ctrl
       # Other frequently used deps
-      - pkg: github.com/ovn-org/libovsdb/ovsdb
+      - pkg: github.com/ovn-kubernetes/libovsdb/ovsdb
         alias: ""
-  
+
   revive:
     rules:
       # TODO: enable recommended (default) revive rules

go-controller/cmd/ovnkube/ovnkube.go

@@ -22,7 +22,7 @@ import (
 	"k8s.io/klog/v2"
 	kexec "k8s.io/utils/exec"
 
-	"github.com/ovn-org/libovsdb/client"
+	"github.com/ovn-kubernetes/libovsdb/client"
 
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/clustermanager"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"

go-controller/go.mod

@@ -38,7 +38,7 @@ require (
 	github.com/onsi/gomega v1.36.1
 	github.com/openshift/api v0.0.0-20231120222239-b86761094ee3
 	github.com/openshift/client-go v0.0.0-20231121143148-910ca30a1a9a
-	github.com/ovn-org/libovsdb v0.7.1-0.20240820095311-ce1951614a20
+	github.com/ovn-kubernetes/libovsdb v0.8.0
 	github.com/prometheus/client_golang v1.19.1
 	github.com/prometheus/client_model v0.6.1
 	github.com/safchain/ethtool v0.3.1-0.20231027162144-83e5e0097c91

go-controller/go.sum

@@ -639,8 +639,8 @@ github.com/openshift/client-go v0.0.0-20231121143148-910ca30a1a9a h1:4FVrw8hz0Wb
 github.com/openshift/client-go v0.0.0-20231121143148-910ca30a1a9a/go.mod h1:arApQobmOjZqtxw44TwnQdUCH+t9DgZ8geYPFqksHws=
 github.com/openshift/custom-resource-status v1.1.2 h1:C3DL44LEbvlbItfd8mT5jWrqPfHnSOQoQf/sypqA6A4=
 github.com/openshift/custom-resource-status v1.1.2/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA=
-github.com/ovn-org/libovsdb v0.7.1-0.20240820095311-ce1951614a20 h1:OoDvzyaK7F/ZANIIFOgb4Haj7mye3Hle0fYZZNdidSs=
-github.com/ovn-org/libovsdb v0.7.1-0.20240820095311-ce1951614a20/go.mod h1:dJbxEaalQl83nn904K32FaMjlH/qOObZ0bj4ejQ78AI=
+github.com/ovn-kubernetes/libovsdb v0.8.0 h1:cWhqWb5rCiS3yTJ6VJ7s85cElE1NWWJ2XksPGLd5WII=
+github.com/ovn-kubernetes/libovsdb v0.8.0/go.mod h1:8nqWvM5pjHRbI5K6Uy/yuA5MdhCnGhNFH5fsSjZD8Rc=
 github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=

go-controller/hack/update-modelgen.sh

@@ -4,12 +4,12 @@ set -o pipefail
 
 # generate ovsdb bindings
 if  ! ( command -v modelgen > /dev/null ); then
-  echo "modelgen not found, installing github.com/ovn-org/libovsdb/cmd/modelgen"
+  echo "modelgen not found, installing github.com/ovn-kubernetes/libovsdb/cmd/modelgen"
   olddir="${PWD}"
   builddir="$(mktemp -d)"
   cd "${builddir}"
   # ensure the hash value is not outdated, if wrong bindings are being generated re-install modelgen
-  GO111MODULE=on go install github.com/ovn-org/libovsdb/cmd/modelgen@v0.7.0
+  GO111MODULE=on go install github.com/ovn-kubernetes/libovsdb/cmd/modelgen@v0.8.0
   cd "${olddir}"
   if [[ "${builddir}" == /tmp/* ]]; then #paranoia
       rm -rf "${builddir}"