chore(deps): update all dependencies on main (main) (#326)

* chore(deps): update all dependencies on main

Signed-off-by: redhat-renovate-bot <[email protected]>

* chore(deps): Fix import paths after bump

Some of the imported modules has changed their paths since they were
introduced to the project.

This commit reflects their current path.

Without this change, go mod tidy fails.

Signed-off-by: Petr Horacek <[email protected]>

* Fix ovsdb signatures after bump

OVSDB has changed some of its signatures. This commit reflects that
to allow compilation of ovsdb.go.

Signed-off-by: Petr Horacek <[email protected]>

* Install Go detected from go.mod

Replace duplicated Go version requirement from the script and use the
one specified in the go.mod instead.

Without this change, linter fails on OOM due to incompatible version:
running lint of 1.22 codebase with 1.21 Go.

Signed-off-by: Petr Horacek <[email protected]>

* Bump version of the go linter

Signed-off-by: Petr Horacek <[email protected]>

* chore(deps): Fix cni testlib singnatures after bump

Some of the CNI testlib functions has changed their signatures. This
commits reflects that in our unit tests.

Signed-off-by: Petr Horacek <[email protected]>

* chore(deps): Switch to ginkgo v2

The QE reporter now seems to rely on Ginkgo v2. Using Ginkgo v1 results
in a compilation failure.

This commit bumps the used Ginkgo version to v2.

Signed-off-by: Petr Horacek <[email protected]>

* Fix linter deprecation warnings

With the recent bump, some of the importent functions became
deprecated.

This commit replaces deprecated functions with their replacements.

Signed-off-by: Petr Horacek <[email protected]>

* Remove minimal Go requirement from SR-IOV

This explicit requirement for Go >=1.10 is ancient and not needed
anymore since all the compilation is happening with 1.22+ already.

This requirement also started preventing compilation, thus removing it.

Signed-off-by: Petr Horacek <[email protected]>

* Explicitly bring container veth up

containernetwork/plugins changed the behavior of SetupVeth in 1.1,
to not set the container-side of the veth up.

This commit makes sure we set it up after the veth is created.

Signed-off-by: Petr Horacek <[email protected]>

---------

Signed-off-by: redhat-renovate-bot <[email protected]>
Signed-off-by: Petr Horacek <[email protected]>
Co-authored-by: Petr Horacek <[email protected]>

.github/workflows/check_hashicorp_modules.yaml

@@ -5,6 +5,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Run script
       run: ./hack/check_hashicorp.sh

.github/workflows/image-build-test.yaml

@@ -23,7 +23,7 @@ jobs:
         run: ./hack/get_version.sh > .version
 
       - name: Build and push container image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: false

.github/workflows/image-push-main.yaml

@@ -41,7 +41,7 @@ jobs:
         run: ./hack/get_version.sh > .version
 
       - name: Build and push container image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

.github/workflows/image-push-release.yaml

@@ -43,7 +43,7 @@ jobs:
         run: ./hack/get_version.sh > .version
 
       - name: Build and push container image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

Makefile

@@ -36,8 +36,8 @@ $(BASE): ; $(info  setting GOPATH...)
 	@ln -sf $(CURDIR) $@
 
 GOLANGCI = $(GOBIN)/golangci-lint
-$(GOBIN)/golangci-lint: | $(BASE) ; $(info  building golangci-lint...)
-	$Q go install -mod=mod github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.0
+$(GOBIN)/golangci-lint: $(GO) | $(BASE) ; $(info  building golangci-lint...)
+	$Q $(GO) install -mod=mod github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.1
 
 build: format $(patsubst %, build-%, $(COMPONENTS))
 

cmd/mirror-consumer/main.go

@@ -24,5 +24,9 @@ import (
 
 // mirror-consumer
 func main() {
-	skel.PluginMain(plugin.CmdAdd, plugin.CmdCheck, plugin.CmdDel, version.All, buildversion.BuildString("OVS mirror consumer"))
+	skel.PluginMainFuncs(skel.CNIFuncs{
+		Add:   plugin.CmdAdd,
+		Check: plugin.CmdCheck,
+		Del:   plugin.CmdDel,
+	}, version.All, buildversion.BuildString("OVS mirror consumer"))
 }

cmd/mirror-producer/main.go

@@ -24,5 +24,9 @@ import (
 
 // ovs-mirror-producer
 func main() {
-	skel.PluginMain(plugin.CmdAdd, plugin.CmdCheck, plugin.CmdDel, version.All, buildversion.BuildString("OVS mirror producer"))
+	skel.PluginMainFuncs(skel.CNIFuncs{
+		Add:   plugin.CmdAdd,
+		Check: plugin.CmdCheck,
+		Del:   plugin.CmdDel,
+	}, version.All, buildversion.BuildString("OVS mirror producer"))
 }

cmd/plugin/main.go

@@ -23,5 +23,9 @@ import (
 )
 
 func main() {
-	skel.PluginMain(plugin.CmdAdd, plugin.CmdCheck, plugin.CmdDel, version.All, buildversion.BuildString("OVS bridge"))
+	skel.PluginMainFuncs(skel.CNIFuncs{
+		Add:   plugin.CmdAdd,
+		Check: plugin.CmdCheck,
+		Del:   plugin.CmdDel,
+	}, version.All, buildversion.BuildString("OVS bridge"))
 }

go.mod

@@ -1,103 +1,111 @@
 module github.com/k8snetworkplumbingwg/ovs-cni
 
 require (
-	github.com/Mellanox/sriovnet v1.0.2
-	github.com/containernetworking/cni v1.0.1
-	github.com/containernetworking/plugins v1.0.1
-	github.com/golang/glog v1.1.0
-	github.com/imdario/mergo v0.3.12
-	github.com/j-keck/arping v1.0.2
-	github.com/k8snetworkplumbingwg/network-attachment-definition-client v0.0.0-20200626054723-37f83d1996bc
-	github.com/onsi/ginkgo v1.16.4
-	github.com/onsi/gomega v1.31.0
-	github.com/ovn-org/libovsdb v0.6.0
+	dario.cat/mergo v1.0.0
+	github.com/containernetworking/cni v1.2.3
+	github.com/containernetworking/plugins v1.5.1
+	github.com/golang/glog v1.2.2
+	github.com/j-keck/arping v1.0.3
+	github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.1
+	github.com/k8snetworkplumbingwg/sriovnet v1.2.0
+	github.com/onsi/ginkgo/v2 v2.20.0
+	github.com/onsi/gomega v1.34.1
+	github.com/ovn-org/libovsdb v0.7.0
 	github.com/pkg/errors v0.9.1
-	github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
-	k8s.io/api v0.30.3
-	k8s.io/apimachinery v0.30.3
-	k8s.io/client-go v0.30.3
-	kubevirt.io/qe-tools v0.1.6
+	github.com/vishvananda/netlink v1.2.1-beta.2
+	k8s.io/api v0.31.0
+	k8s.io/apimachinery v0.31.0
+	k8s.io/client-go v0.31.0
+	kubevirt.io/qe-tools v0.1.8
 )
 
 require (
+	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cenkalti/hub v1.0.1 // indirect
-	github.com/cenkalti/rpc2 v0.0.0-20210220005819-4a29bc83afe1 // indirect
-	github.com/coreos/go-iptables v0.6.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/cenkalti/rpc2 v0.0.0-20210604223624-c1acbc6ec984 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/coreos/go-iptables v0.7.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/moby/spdystream v0.2.0 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/moby/spdystream v0.4.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 // indirect
-	github.com/spf13/afero v1.9.2 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_golang v1.12.1 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/safchain/ethtool v0.4.0 // indirect
+	github.com/spf13/afero v1.9.4 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/testify v1.8.4 // indirect
-	github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/oauth2 v0.13.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/term v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	github.com/stretchr/testify v1.9.0 // indirect
+	github.com/vishvananda/netns v0.0.4 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
+	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/oauth2 v0.21.0 // indirect
+	golang.org/x/sys v0.23.0 // indirect
+	golang.org/x/term v0.23.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	golang.org/x/tools v0.24.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/klog/v2 v2.120.1 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-// Pinned to kubernetes-1.30.3
 replace (
-	k8s.io/api => k8s.io/api v0.30.3
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.3
-	k8s.io/apimachinery => k8s.io/apimachinery v0.30.3
-	k8s.io/apiserver => k8s.io/apiserver v0.30.3
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.3
-	k8s.io/client-go => k8s.io/client-go v0.30.3
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.3
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.3
-	k8s.io/code-generator => k8s.io/code-generator v0.30.3
-	k8s.io/component-base => k8s.io/component-base v0.30.3
-	k8s.io/cri-api => k8s.io/cri-api v0.30.3
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.3
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.3
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.3
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.3
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.3
-	k8s.io/kubectl => k8s.io/kubectl v0.30.3
-	k8s.io/kubelet => k8s.io/kubelet v0.30.3
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.3
-	k8s.io/metrics => k8s.io/metrics v0.30.3
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.3
+	k8s.io/api => k8s.io/api v0.31.0
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.31.0
+	k8s.io/apiserver => k8s.io/apiserver v0.31.0
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0
+	k8s.io/client-go => k8s.io/client-go v0.31.0
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0
+	k8s.io/code-generator => k8s.io/code-generator v0.31.0
+	k8s.io/component-base => k8s.io/component-base v0.31.0
+	k8s.io/cri-api => k8s.io/cri-api v0.31.0
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0
+	k8s.io/kubectl => k8s.io/kubectl v0.31.0
+	k8s.io/kubelet => k8s.io/kubelet v0.31.0
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.4
+	k8s.io/metrics => k8s.io/metrics v0.31.0
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0
 )
 
 go 1.22.0
-
-toolchain go1.22.5