From 03d3aae8215efc606c74bf55a68a36b45a5387f9 Mon Sep 17 00:00:00 2001 From: runzexia Date: Thu, 15 Aug 2019 14:32:03 +0800 Subject: [PATCH] update generate script Signed-off-by: runzexia --- Makefile | 1 + hack/generate_group.sh | 6 +++--- pkg/apis/apis.go | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 96637ff98..2f21f5f23 100644 --- a/Makefile +++ b/Makefile @@ -76,6 +76,7 @@ deploy: manifests # generate will generate crds' deepcopy & go openapi structs # Futher more about go:genreate . https://blog.golang.org/generate generate: + GO111MODULE=on go install -mod=vendor k8s.io/code-generator/cmd/deepcopy-gen go generate ./pkg/... ./cmd/... # Build the docker image diff --git a/hack/generate_group.sh b/hack/generate_group.sh index c61bac623..a13475281 100755 --- a/hack/generate_group.sh +++ b/hack/generate_group.sh @@ -46,9 +46,9 @@ APIS_PKG="$3" GROUPS_WITH_VERSIONS="$4" shift 4 - ( - go install --pkgdir ./vendor/k8s.io/code-generator/cmd/ - ) + +GO111MODULE=on go install -mod=vendor k8s.io/code-generator/cmd/{client-gen,lister-gen,informer-gen} + function codegen::join() { local IFS="$1"; shift; echo "$*"; } diff --git a/pkg/apis/apis.go b/pkg/apis/apis.go index bc45ac7d2..db8140e03 100644 --- a/pkg/apis/apis.go +++ b/pkg/apis/apis.go @@ -29,7 +29,6 @@ import ( // Generate deepcopy for apis -//go:generate go install --pkgdir ../../vendor/k8s.io/code-generator/cmd/deepcopy-gen //go:generate ${GOPATH}/bin/deepcopy-gen -i kubesphere.io/kubesphere/pkg/apis/... -h ../../hack/boilerplate.go.txt -O zz_generated.deepcopy // AddToSchemes may be used to add all resources defined in the project to a Scheme var AddToSchemes runtime.SchemeBuilder