kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9396 from rifelpet/modvendor 

Use -mod=vendor for most go commands
This commit is contained in:
Kubernetes Prow Robot 2020-06-18 20:35:58 -07:00 committed by GitHub
parent b5b544d691 2504ad19f2
commit d5e1bab8b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -45,6 +45,9 @@ BAZEL_CONFIG?=
API_OPTIONS?=
GCFLAGS?=
# This can be removed when we upgrade to go 1.14
export GOFLAGS=-mod=vendor
UPLOAD_CMD=$(KOPS_ROOT)/hack/upload
# Unexport environment variables that can affect tests and are not used in builds
@ -448,7 +451,7 @@ gomod-prereqs:
.PHONY: gomod
gomod: gomod-prereqs
GO111MODULE=on go mod vendor
GO111MODULE=on GOFLAGS= go mod vendor
# Switch weavemesh to use peer_name_hash - bazel rule-go doesn't support build tags yet
rm vendor/github.com/weaveworks/mesh/peer_name_mac.go
sed -i -e 's/peer_name_hash/!peer_name_mac/g' vendor/github.com/weaveworks/mesh/peer_name_hash.go

1
hack/make-apimachinery.sh
View File

@ -30,6 +30,7 @@ mkdir -p "${WORK_DIR}/go/"
cp -R "${GOPATH}/src/k8s.io/kops/vendor/" "${WORK_DIR}/go/src"
unset GOBIN
unset GOFLAGS
env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install -v k8s.io/code-generator/cmd/conversion-gen/
cp "${WORK_DIR}/go/bin/conversion-gen" "${GOPATH}/bin/"