diff --git a/Dockerfile_generator b/Dockerfile_generator index ab347b4d3..c0865e990 100644 --- a/Dockerfile_generator +++ b/Dockerfile_generator @@ -1,7 +1,7 @@ FROM golang:1.18-buster as builder # Install tools -RUN go install github.com/vektra/mockery@v1.0.0 && \ +RUN go install github.com/vektra/mockery/v2@v2.13.0 && \ go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0 && \ git clone https://github.com/kubernetes/code-generator -b v0.20.7 --depth 1 && \ go install k8s.io/code-generator/cmd/...@v0.20.7 && \ diff --git a/pkg/apihelper/apihelpers.go b/pkg/apihelper/apihelpers.go index d3fef4c46..bfcdec6a7 100644 --- a/pkg/apihelper/apihelpers.go +++ b/pkg/apihelper/apihelpers.go @@ -16,7 +16,7 @@ limitations under the License. package apihelper -//go:generate mockery --name=APIHelpers --inpkg +//go:generate mockery --name=APIHelpers --inpackage import ( topologyclientset "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/generated/clientset/versioned" diff --git a/pkg/labeler/doc.go b/pkg/labeler/doc.go index bc4774157..4f0e89ade 100644 --- a/pkg/labeler/doc.go +++ b/pkg/labeler/doc.go @@ -17,4 +17,4 @@ limitations under the License. package labeler //go:generate protoc --go_opt=paths=source_relative --go_out=plugins=grpc:. -I . -I ../.. -I ../../vendor labeler.proto -//go:generate mockery --name=LabelerClient --inpkg +//go:generate mockery --name=LabelerClient --inpackage diff --git a/pkg/topologyupdater/doc.go b/pkg/topologyupdater/doc.go index 689af805c..b95359c68 100644 --- a/pkg/topologyupdater/doc.go +++ b/pkg/topologyupdater/doc.go @@ -17,4 +17,4 @@ limitations under the License. package topologyupdater //go:generate protoc --go_opt=paths=source_relative --go_out=plugins=grpc:. -I . -I ../../vendor/ topology-updater.proto -//go:generate mockery --name=NodeTopologyClient --inpkg +//go:generate mockery --name=NodeTopologyClient --inpackage diff --git a/source/source.go b/source/source.go index 489442ba8..44a725ba8 100644 --- a/source/source.go +++ b/source/source.go @@ -16,7 +16,7 @@ limitations under the License. package source -//go:generate mockery --name=LabelSource --inpkg +//go:generate mockery --name=LabelSource --inpackage import ( "fmt"