diff --git a/.goreleaser.yml b/.goreleaser.yml index b7e94f396..5026353a8 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -20,7 +20,7 @@ builds: - arm64 - s390x ldflags: - - -X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.version={{ .Tag }} -X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.commit={{ .Commit }} -X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.date={{ .Date }} + - -X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.version={{ .Tag }} -X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.commit={{ .Commit }} -X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.date={{ .Date }} - env: - CGO_ENABLED=0 id: multus-daemon @@ -35,7 +35,7 @@ builds: - arm64 - s390x ldflags: - - -X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.version={{ .Tag }} -X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.commit={{ .Commit }} -X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.date={{ .Date }} + - -X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.version={{ .Tag }} -X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.commit={{ .Commit }} -X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.date={{ .Date }} - env: - CGO_ENABLED=0 id: multus-shim @@ -50,7 +50,7 @@ builds: - arm64 - s390x ldflags: - - -X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.version={{ .Tag }} -X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.commit={{ .Commit }} -X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.date={{ .Date }} + - -X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.version={{ .Tag }} -X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.commit={{ .Commit }} -X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.date={{ .Date }} archives: - wrap_in_directory: true checksum: diff --git a/cmd/install_multus/main.go b/cmd/install_multus/main.go index 367b82cfd..1740b5e07 100644 --- a/cmd/install_multus/main.go +++ b/cmd/install_multus/main.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/pflag" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/cmdutils" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/cmdutils" ) func main() { diff --git a/cmd/multus-daemon/main.go b/cmd/multus-daemon/main.go index 7954182c8..8c57d210a 100644 --- a/cmd/multus-daemon/main.go +++ b/cmd/multus-daemon/main.go @@ -29,11 +29,11 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilwait "k8s.io/apimachinery/pkg/util/wait" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus" - srv "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/server" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/server/api" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/server/config" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus" + srv "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/server" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/server/api" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/server/config" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/cmd/multus-shim/main.go b/cmd/multus-shim/main.go index c3c34dc0c..e5151c36f 100644 --- a/cmd/multus-shim/main.go +++ b/cmd/multus-shim/main.go @@ -25,8 +25,8 @@ import ( "github.com/containernetworking/cni/pkg/skel" cniversion "github.com/containernetworking/cni/pkg/version" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/server/api" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/server/api" ) func main() { diff --git a/cmd/multus/main.go b/cmd/multus/main.go index 34ce4b3fa..5e9b6440e 100644 --- a/cmd/multus/main.go +++ b/cmd/multus/main.go @@ -25,7 +25,7 @@ import ( "github.com/containernetworking/cni/pkg/skel" cniversion "github.com/containernetworking/cni/pkg/version" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus" ) func main() { diff --git a/cmd/thin_entrypoint/main.go b/cmd/thin_entrypoint/main.go index d77ad3264..ac7215182 100644 --- a/cmd/thin_entrypoint/main.go +++ b/cmd/thin_entrypoint/main.go @@ -31,7 +31,7 @@ import ( "github.com/containernetworking/cni/libcni" "github.com/spf13/pflag" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/cmdutils" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/cmdutils" ) // Options stores command line options diff --git a/docs/development.md b/docs/development.md index 987b524a1..25218eb96 100644 --- a/docs/development.md +++ b/docs/development.md @@ -16,7 +16,7 @@ Multus now uses [gopkg.in](http://gopkg.in/) to expose its code as library. You can use following command to import our code into your go code. ``` -go get gopkg.in/k8snetworkplumbingwg/multus-cni.v3 +go get gopkg.in/k8snetworkplumbingwg/multus-cni.v4 ``` ## How do I submit an issue? diff --git a/go.mod b/go.mod index 814a7a69a..c73110465 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gopkg.in/k8snetworkplumbingwg/multus-cni.v3 +module gopkg.in/k8snetworkplumbingwg/multus-cni.v4 go 1.18 diff --git a/hack/build-go.sh b/hack/build-go.sh index e652b3cfe..77317971c 100755 --- a/hack/build-go.sh +++ b/hack/build-go.sh @@ -52,11 +52,11 @@ fi # Add version/commit/date into binary DATE=$(date -u -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}" --iso-8601=seconds) COMMIT=${COMMIT:-$(git rev-parse --verify HEAD)} -LDFLAGS="-X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.version=${VERSION} \ - -X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.commit=${COMMIT} \ - -X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.gitTreeState=${GIT_TREE_STATE} \ - -X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.releaseStatus=${RELEASE_STATUS} \ - -X gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.date=${DATE}" +LDFLAGS="-X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.version=${VERSION} \ + -X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.commit=${COMMIT} \ + -X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.gitTreeState=${GIT_TREE_STATE} \ + -X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.releaseStatus=${RELEASE_STATUS} \ + -X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.date=${DATE}" export CGO_ENABLED=0 # build with go modules diff --git a/pkg/checkpoint/checkpoint.go b/pkg/checkpoint/checkpoint.go index da891102b..2fc0de5a3 100644 --- a/pkg/checkpoint/checkpoint.go +++ b/pkg/checkpoint/checkpoint.go @@ -19,8 +19,8 @@ import ( "encoding/json" "os" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/checkpoint/checkpoint_test.go b/pkg/checkpoint/checkpoint_test.go index f17c2ceaa..ef5edd7b9 100644 --- a/pkg/checkpoint/checkpoint_test.go +++ b/pkg/checkpoint/checkpoint_test.go @@ -24,7 +24,7 @@ import ( "testing" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8sTypes "k8s.io/apimachinery/pkg/types" diff --git a/pkg/k8sclient/k8sclient.go b/pkg/k8sclient/k8sclient.go index 212c281d1..006d5a48a 100644 --- a/pkg/k8sclient/k8sclient.go +++ b/pkg/k8sclient/k8sclient.go @@ -42,9 +42,9 @@ import ( nettypes "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" netclient "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1" netutils "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/kubeletclient" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/kubeletclient" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" ) const ( diff --git a/pkg/k8sclient/k8sclient_test.go b/pkg/k8sclient/k8sclient_test.go index 33a53e00f..b1ab352ed 100644 --- a/pkg/k8sclient/k8sclient_test.go +++ b/pkg/k8sclient/k8sclient_test.go @@ -22,10 +22,10 @@ import ( "testing" types020 "github.com/containernetworking/cni/pkg/types/020" - testutils "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" + testutils "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/testing" "github.com/containernetworking/cni/pkg/skel" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" nettypes "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" netfake "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake" diff --git a/pkg/kubeletclient/kubeletclient.go b/pkg/kubeletclient/kubeletclient.go index f10a3e760..d0438f012 100644 --- a/pkg/kubeletclient/kubeletclient.go +++ b/pkg/kubeletclient/kubeletclient.go @@ -27,9 +27,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/checkpoint" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/checkpoint" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" v1 "k8s.io/api/core/v1" podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1" ) diff --git a/pkg/kubeletclient/kubeletclient_test.go b/pkg/kubeletclient/kubeletclient_test.go index db4e703b5..5e0e43b82 100644 --- a/pkg/kubeletclient/kubeletclient_test.go +++ b/pkg/kubeletclient/kubeletclient_test.go @@ -33,7 +33,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8sTypes "k8s.io/apimachinery/pkg/types" - mtypes "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" + mtypes "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" podresourcesapi "k8s.io/kubelet/pkg/apis/podresources/v1" ) diff --git a/pkg/logging/logging_test.go b/pkg/logging/logging_test.go index d1d17acfb..c33007e6f 100644 --- a/pkg/logging/logging_test.go +++ b/pkg/logging/logging_test.go @@ -20,7 +20,7 @@ import ( "os" "testing" - testutils "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" + testutils "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/testing" "gopkg.in/natefinch/lumberjack.v2" . "github.com/onsi/ginkgo/v2" diff --git a/pkg/multus/multus.go b/pkg/multus/multus.go index 5d257783c..24cff874a 100644 --- a/pkg/multus/multus.go +++ b/pkg/multus/multus.go @@ -39,10 +39,10 @@ import ( k8snet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/wait" - k8s "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/k8sclient" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/netutils" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" + k8s "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/k8sclient" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/netutils" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" ) const ( diff --git a/pkg/multus/multus_cni020_test.go b/pkg/multus/multus_cni020_test.go index f1dbc03c9..23558deb6 100644 --- a/pkg/multus/multus_cni020_test.go +++ b/pkg/multus/multus_cni020_test.go @@ -24,10 +24,10 @@ import ( types020 "github.com/containernetworking/cni/pkg/types/020" "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/k8sclient" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" - testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/k8sclient" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" + testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/testing" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/record" diff --git a/pkg/multus/multus_cni040_test.go b/pkg/multus/multus_cni040_test.go index def3bdd09..f7d7803df 100644 --- a/pkg/multus/multus_cni040_test.go +++ b/pkg/multus/multus_cni040_test.go @@ -24,10 +24,10 @@ import ( cni040 "github.com/containernetworking/cni/pkg/types/040" "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/k8sclient" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" - testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/k8sclient" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" + testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/testing" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" . "github.com/onsi/ginkgo/v2" diff --git a/pkg/multus/multus_cni100_test.go b/pkg/multus/multus_cni100_test.go index aa285c0a2..54d36a4dd 100644 --- a/pkg/multus/multus_cni100_test.go +++ b/pkg/multus/multus_cni100_test.go @@ -23,10 +23,10 @@ import ( cni100 "github.com/containernetworking/cni/pkg/types/100" "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/k8sclient" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" - testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/k8sclient" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" + testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/testing" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/multus/multus_suite_test.go b/pkg/multus/multus_suite_test.go index d3756d867..e635d1c36 100644 --- a/pkg/multus/multus_suite_test.go +++ b/pkg/multus/multus_suite_test.go @@ -29,7 +29,7 @@ import ( cni100 "github.com/containernetworking/cni/pkg/types/100" cniversion "github.com/containernetworking/cni/pkg/version" netfake "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/k8sclient" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/k8sclient" "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/record" diff --git a/pkg/netutils/netutils.go b/pkg/netutils/netutils.go index 8d87787b1..84e35128b 100644 --- a/pkg/netutils/netutils.go +++ b/pkg/netutils/netutils.go @@ -25,7 +25,7 @@ import ( "github.com/containernetworking/cni/libcni" "github.com/containernetworking/plugins/pkg/ns" "github.com/vishvananda/netlink" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" ) // DeleteDefaultGW removes the default gateway from marked interfaces. diff --git a/pkg/server/api/shim.go b/pkg/server/api/shim.go index adb1b5b7e..e9e1e2aad 100644 --- a/pkg/server/api/shim.go +++ b/pkg/server/api/shim.go @@ -23,7 +23,7 @@ import ( "github.com/containernetworking/cni/pkg/skel" cnitypes "github.com/containernetworking/cni/pkg/types" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" ) // ShimNetConf for the SHIM cni config file written in json diff --git a/pkg/server/config/generator.go b/pkg/server/config/generator.go index fcfac33af..947e8f87d 100644 --- a/pkg/server/config/generator.go +++ b/pkg/server/config/generator.go @@ -26,7 +26,7 @@ import ( "github.com/blang/semver" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" ) const ( diff --git a/pkg/server/config/manager.go b/pkg/server/config/manager.go index 610ae0fb4..6a79846cd 100644 --- a/pkg/server/config/manager.go +++ b/pkg/server/config/manager.go @@ -21,7 +21,7 @@ import ( "github.com/fsnotify/fsnotify" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" ) // MultusDefaultNetworkName holds the default name of the multus network diff --git a/pkg/server/server.go b/pkg/server/server.go index 0a4f46c04..23da971b3 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -32,12 +32,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - k8s "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/k8sclient" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/server/api" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/server/config" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" + k8s "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/k8sclient" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/server/api" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/server/config" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/types" ) const ( diff --git a/pkg/server/thick_cni_test.go b/pkg/server/thick_cni_test.go index b9d3eefaa..cc5fbc74f 100644 --- a/pkg/server/thick_cni_test.go +++ b/pkg/server/thick_cni_test.go @@ -36,9 +36,9 @@ import ( "k8s.io/client-go/tools/record" netfake "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake" - k8s "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/k8sclient" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/server/api" - testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" + k8s "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/k8sclient" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/server/api" + testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/testing" ) const suiteName = "Thick CNI architecture" diff --git a/pkg/server/types.go b/pkg/server/types.go index 8e9b7cd2a..d24ad7b76 100644 --- a/pkg/server/types.go +++ b/pkg/server/types.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/k8sclient" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/k8sclient" ) const ( diff --git a/pkg/types/conf.go b/pkg/types/conf.go index 9ed5ccef7..36d8d6f9f 100644 --- a/pkg/types/conf.go +++ b/pkg/types/conf.go @@ -28,7 +28,7 @@ import ( cni100 "github.com/containernetworking/cni/pkg/types/100" "github.com/containernetworking/cni/pkg/version" nadutils "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" ) const ( diff --git a/pkg/types/conf_test.go b/pkg/types/conf_test.go index b61cffb04..a2dc647f8 100644 --- a/pkg/types/conf_test.go +++ b/pkg/types/conf_test.go @@ -26,7 +26,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" netutils "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils" - testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" + testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/testing" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/types/types.go b/pkg/types/types.go index cf61d261e..1a410db59 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -18,7 +18,7 @@ package types import ( "net" - "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/logging" "github.com/containernetworking/cni/pkg/types" cni100 "github.com/containernetworking/cni/pkg/types/100"