Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contrib/kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
3 changes: 2 additions & 1 deletion docs/developer-guide/developer.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions go-controller/.golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -41,7 +42,7 @@ linters-settings:
disable:
- fieldalignment
- shadow

importas:
no-unaliased: true
alias:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go-controller/cmd/ovnkube/ovnkube.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go-controller/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go-controller/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions go-controller/hack/update-modelgen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion go-controller/observability-lib/ovsdb/bridge.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go-controller/observability-lib/ovsdb/interface.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go-controller/observability-lib/ovsdb/observ_model.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ovsdb

import "github.com/ovn-org/libovsdb/model"
import "github.com/ovn-kubernetes/libovsdb/model"

// ObservDatabaseModel returns the DatabaseModel object to be used by observability library.
func ObservDatabaseModel() (model.ClientDBModel, error) {
Expand Down
4 changes: 2 additions & 2 deletions go-controller/observability-lib/sampledecoder/db_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"k8s.io/klog/v2/textlogger"

"github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/libovsdb/model"
"github.com/ovn-kubernetes/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/model"

"github.com/ovn-org/ovn-kubernetes/go-controller/observability-lib/ovsdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"strings"

"github.com/ovn-org/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/observability-lib/model"
"github.com/ovn-org/ovn-kubernetes/go-controller/observability-lib/ovsdb"
Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/cni/cni.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"k8s.io/klog/v2"
utilnet "k8s.io/utils/net"

"github.com/ovn-org/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/client"

ovncnitypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/cni/types"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/cni/udn"
Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/cni/cni_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/kubernetes/fake"

"github.com/ovn-org/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/cni/types"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/cni/cniserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
corev1listers "k8s.io/client-go/listers/core/v1"
"k8s.io/klog/v2"

"github.com/ovn-org/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory"
Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/cni/cniserver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"k8s.io/client-go/kubernetes/fake"
utiltesting "k8s.io/client-go/util/testing"

"github.com/ovn-org/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/networkmanager"
Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/cni/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
corev1listers "k8s.io/client-go/listers/core/v1"
"k8s.io/klog/v2"

"github.com/ovn-org/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/cni/types"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/networkmanager"
Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/controllermanager/controller_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"k8s.io/client-go/tools/record"
"k8s.io/klog/v2"

libovsdbclient "github.com/ovn-org/libovsdb/client"
libovsdbclient "github.com/ovn-kubernetes/libovsdb/client"

ovncnitypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/cni/types"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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/cni"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
Expand Down
4 changes: 4 additions & 0 deletions go-controller/pkg/factory/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ func (h *Handler) OnDelete(obj interface{}) {
}
}

func (h *Handler) FilterFunc(obj interface{}) bool {
return h.base.FilterFunc(obj)
}

func (h *Handler) kill() bool {
return atomic.CompareAndSwapUint32(&h.tombstone, handlerAlive, handlerDead)
}
Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/kubevirt/dhcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
ktypes "k8s.io/apimachinery/pkg/types"
utilnet "k8s.io/utils/net"

libovsdbclient "github.com/ovn-org/libovsdb/client"
libovsdbclient "github.com/ovn-kubernetes/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory"
Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/kubevirt/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
ktypes "k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/util/retry"

libovsdbclient "github.com/ovn-org/libovsdb/client"
libovsdbclient "github.com/ovn-kubernetes/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube"
Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/kubevirt/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
corev1 "k8s.io/api/core/v1"
utilnet "k8s.io/utils/net"

libovsdbclient "github.com/ovn-org/libovsdb/client"
libovsdbclient "github.com/ovn-kubernetes/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/factory"
Expand Down
4 changes: 2 additions & 2 deletions go-controller/pkg/libovsdb/libovsdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"k8s.io/klog/v2"
"k8s.io/klog/v2/textlogger"

"github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/libovsdb/model"
"github.com/ovn-kubernetes/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/model"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
Expand Down
4 changes: 2 additions & 2 deletions go-controller/pkg/libovsdb/ops/acl.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

libovsdbclient "github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/libovsdb/ovsdb"
libovsdbclient "github.com/ovn-kubernetes/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/ovsdb"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
Expand Down
6 changes: 3 additions & 3 deletions go-controller/pkg/libovsdb/ops/address_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ops
import (
"context"

libovsdbclient "github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/libovsdb/ovsdb"
libovsdbclient "github.com/ovn-kubernetes/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/ovsdb"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
Expand All @@ -18,7 +18,7 @@ type addressSetPredicate func(*nbdb.AddressSet) bool
// The purpose is to prevent libovsdb interpreting non-nil empty maps/slices
// as default and thus being filtered out of the update. The intention is to
// use non-nil empty maps/slices to clear them out in the update.
// See: https://github.com/ovn-org/libovsdb/issues/226
// See: https://github.com/ovn-kubernetes/libovsdb/issues/226
func getNonZeroAddressSetMutableFields(as *nbdb.AddressSet) []interface{} {
fields := []interface{}{}
if as.Addresses != nil {
Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/libovsdb/ops/chassis.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"k8s.io/apimachinery/pkg/util/sets"

libovsdbclient "github.com/ovn-org/libovsdb/client"
libovsdbclient "github.com/ovn-kubernetes/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb"
Expand Down
4 changes: 2 additions & 2 deletions go-controller/pkg/libovsdb/ops/copp.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ops

import (
libovsdbclient "github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/libovsdb/ovsdb"
libovsdbclient "github.com/ovn-kubernetes/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/ovsdb"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
)
Expand Down
4 changes: 2 additions & 2 deletions go-controller/pkg/libovsdb/ops/dhcp.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ops

import (
libovsdbclient "github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/libovsdb/ovsdb"
libovsdbclient "github.com/ovn-kubernetes/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/ovsdb"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
)
Expand Down
4 changes: 2 additions & 2 deletions go-controller/pkg/libovsdb/ops/lbgroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ops
import (
"context"

libovsdbclient "github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/libovsdb/ovsdb"
libovsdbclient "github.com/ovn-kubernetes/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/ovsdb"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
Expand Down
6 changes: 3 additions & 3 deletions go-controller/pkg/libovsdb/ops/loadbalancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ops
import (
"context"

libovsdbclient "github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/libovsdb/ovsdb"
libovsdbclient "github.com/ovn-kubernetes/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/ovsdb"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
Expand All @@ -16,7 +16,7 @@ import (
// The purpose is to prevent libovsdb interpreting non-nil empty maps/slices
// as default and thus being filtered out of the update. The intention is to
// use non-nil empty maps/slices to clear them out in the update.
// See: https://github.com/ovn-org/libovsdb/issues/226
// See: https://github.com/ovn-kubernetes/libovsdb/issues/226
func getNonZeroLoadBalancerMutableFields(lb *nbdb.LoadBalancer) []interface{} {
fields := []interface{}{}
if lb.Name != "" {
Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/libovsdb/ops/mac_binding.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ops

import (
libovsdbclient "github.com/ovn-org/libovsdb/client"
libovsdbclient "github.com/ovn-kubernetes/libovsdb/client"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
)
Expand Down
4 changes: 2 additions & 2 deletions go-controller/pkg/libovsdb/ops/meter.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"k8s.io/apimachinery/pkg/util/sets"

libovsdbclient "github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/libovsdb/ovsdb"
libovsdbclient "github.com/ovn-kubernetes/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/ovsdb"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
)
Expand Down
6 changes: 3 additions & 3 deletions go-controller/pkg/libovsdb/ops/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"reflect"

"github.com/ovn-org/libovsdb/client"
"github.com/ovn-org/libovsdb/model"
"github.com/ovn-org/libovsdb/ovsdb"
"github.com/ovn-kubernetes/libovsdb/client"
"github.com/ovn-kubernetes/libovsdb/model"
"github.com/ovn-kubernetes/libovsdb/ovsdb"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb"
Expand Down
Loading