Merge pull request kubernetes#90252 from dims/no-need-to-vendor-bazel-gazelle/buildtools/kazel

Separate go module for tools to avoid polluting root go.mod

Author: k8s-ci-robot

Godeps/LICENSES

@@ -3,6 +3,7 @@
 	"SkippedPaths": [
 		"^_.*",
 		"/_",
+		"^hack/tools",
 		"^third_party/etcd.*"
 	],
 	"AddSourcesRules": true,

build/root/.kazelcfg.json

@@ -20,22 +20,13 @@ limitations under the License.
 package tools
 
 import (
-	_ "github.com/bazelbuild/bazel-gazelle/cmd/gazelle"
-	_ "github.com/bazelbuild/buildtools/buildozer"
-	_ "github.com/cespare/prettybench"
-	_ "github.com/client9/misspell/cmd/misspell"
 	_ "github.com/go-bindata/go-bindata/go-bindata"
 	_ "github.com/onsi/ginkgo/ginkgo"
-	_ "golang.org/x/lint/golint"
-	_ "gotest.tools"
-	_ "gotest.tools/gotestsum"
-	_ "honnef.co/go/tools/cmd/staticcheck"
 	_ "k8s.io/code-generator/cmd/go-to-protobuf"
 	_ "k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo"
 	_ "k8s.io/gengo/examples/deepcopy-gen/generators"
 	_ "k8s.io/gengo/examples/defaulter-gen/generators"
 	_ "k8s.io/gengo/examples/import-boss/generators"
 	_ "k8s.io/gengo/examples/set-gen/generators"
 	_ "k8s.io/kube-openapi/cmd/openapi-gen"
-	_ "k8s.io/repo-infra/cmd/kazel"
 )

build/tools.go

@@ -43,8 +43,11 @@ export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH}
 # As individual scripts make use of go modules, they can explicitly set GO111MODULE=on
 export GO111MODULE=off
 
-go install k8s.io/kubernetes/vendor/github.com/cespare/prettybench
-go install k8s.io/kubernetes/vendor/gotest.tools/gotestsum
+# Install tools we need
+pushd "${KUBE_ROOT}/hack/tools" >/dev/null
+  GO111MODULE=on go install github.com/cespare/prettybench
+  GO111MODULE=on go install gotest.tools/gotestsum
+popd >/dev/null
 
 # Disable the Go race detector.
 export KUBE_RACE=" "

go.mod

@@ -42,7 +42,10 @@ export PATH=${GOPATH}/bin:${PWD}/third_party/etcd:/usr/local/go/bin:${PATH}
 # As individual scripts make use of go modules, they can explicitly set GO111MODULE=on
 export GO111MODULE=off
 
-go install k8s.io/kubernetes/vendor/gotest.tools/gotestsum
+# Install tools we need
+pushd "./hack/tools" >/dev/null
+  GO111MODULE=on go install gotest.tools/gotestsum
+popd >/dev/null
 
 # Enable the Go race detector.
 export KUBE_RACE=-race

go.sum

@@ -225,8 +225,8 @@ produceJUnitXMLReport() {
   junit_xml_filename="${junit_filename_prefix}.xml"
 
   if ! command -v gotestsum >/dev/null 2>&1; then
-    kube::log::error "gotestsum not found; please install with " \
-      "GO111MODULE=off go install k8s.io/kubernetes/vendor/gotest.tools/gotestsum"
+    kube::log::error "gotestsum not found; please cd to hack/tools and install with " \
+      "GO111MODULE=on go install gotest.tools/gotestsum"
     return
   fi
   gotestsum --junitfile "${junit_xml_filename}" --raw-command cat "${junit_filename_prefix}"*.stdout

hack/jenkins/benchmark-dockerized.sh

@@ -49,7 +49,7 @@ if [[ ${#targets[@]} -eq 0 ]]; then
   # Do not run on third_party directories or generated client code or build tools.
   while IFS='' read -r line; do
     targets+=("${line}")
-  done < <(go list -e ./... | grep -E -v "/(build|third_party|vendor|staging|clientset_generated)/")
+  done < <(go list -e ./... | grep -E -v "/(build|third_party|vendor|staging|clientset_generated|hack)/")
 fi
 
 go vet "${goflags[@]:+${goflags[@]}}" "${targets[@]}"

hack/jenkins/test-dockerized.sh

@@ -0,0 +1 @@
+vendor/