Merge pull request #4564 from justinsb/vendor_gazelle

vendor gazelle

Gopkg.toml

@@ -13,6 +13,9 @@ required = [
   "k8s.io/code-generator/cmd/openapi-gen",
   "github.com/kubernetes-incubator/apiserver-builder/cmd/apiserver-boot",
   "github.com/kubernetes-incubator/reference-docs/gen-apidocs",
+
+  # Needed for bazel generation / verification
+  "github.com/bazelbuild/bazel-gazelle/cmd/gazelle",
 ]
 
 [prune]
@@ -25,6 +28,10 @@ required = [
     unused-packages = false
     non-go = false
 
+[[override]]
+  name = "github.com/bazelbuild/bazel-gazelle"
+  version = "0.11.0"
+
 # aws-sdk-go is one of our critical dependencies
 [[override]]
   name = "github.com/aws/aws-sdk-go"
@@ -270,7 +277,7 @@ required = [
   revision = "e31f36ffc91a2ba9ddb72a4b6a607ff9b3d3cb63"
 [[override]]
   name = "github.com/pelletier/go-toml"
-  revision = "0049ab3dc4c4c70a9eee23087437b69c0dde2130"
+  revision = "16398bac157da96aa88f98a2df640c7f32af1da2"
 [[override]]
   name = "github.com/google/gofuzz"
   revision = "44d81051d367757e1c7c6a5a86423ece9afcf63c"

hack/update-bazel.sh

@@ -18,21 +18,21 @@ set -o nounset
 set -o pipefail
 
 KOPS_ROOT=$(git rev-parse --show-toplevel)
-# https://github.com/kubernetes/test-infra/issues/5699#issuecomment-348350792
 cd ${KOPS_ROOT}
-TMP_GOPATH=$(mktemp -d)
+
+export GOPATH=${KOPS_ROOT}/../../../
+
+TMP_OUT=$(mktemp -d)
+trap "{ rm -rf ${TMP_OUT}; }" EXIT
+
+GOBIN="${TMP_OUT}" go install ./vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle
 
 # manually remove BUILD file for k8s.io/apimachinery/pkg/util/sets/BUILD if it
 # exists; there is a specific set-gen rule that breaks importing
 # ref: https://github.com/kubernetes/kubernetes/blob/4e2f5e2212b05a305435ef96f4b49dc0932e1264/staging/src/k8s.io/apimachinery/pkg/util/sets/BUILD#L23-L49
 # rm -f ${KOPS_ROOT}/vendor/k8s.io/apimachinery/pkg/util/sets/{BUILD,BUILD.bazel}
 
-"${KOPS_ROOT}/hack/go_install_from_commit.sh" \
-  github.com/bazelbuild/bazel-gazelle/cmd/gazelle \
-  8bc6a862933eaa0d7431e15b308ceadc5729a6f9 \
-  "${TMP_GOPATH}"
-
-"${TMP_GOPATH}/bin/gazelle" fix \
+"${TMP_OUT}/gazelle" fix \
   -external=vendored \
   -mode=fix \
   -proto=disable \

hack/verify-bazel.sh

@@ -18,16 +18,16 @@ set -o nounset
 set -o pipefail
 
 KOPS_ROOT=$(git rev-parse --show-toplevel)
-TMP_GOPATH=$(mktemp -d)
-cd "${KOPS_ROOT}"
+cd ${KOPS_ROOT}
 
-"${KOPS_ROOT}/hack/go_install_from_commit.sh" \
-  github.com/bazelbuild/bazel-gazelle/cmd/gazelle \
-  8bc6a862933eaa0d7431e15b308ceadc5729a6f9 \
-  "${TMP_GOPATH}"
+export GOPATH=${KOPS_ROOT}/../../../
 
+TMP_OUT=$(mktemp -d)
+trap "{ rm -rf ${TMP_OUT}; }" EXIT
 
-gazelle_diff=$("${TMP_GOPATH}/bin/gazelle" fix \
+GOBIN="${TMP_OUT}" go install ./vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle
+
+gazelle_diff=$("${TMP_OUT}/gazelle" fix \
   -external=vendored \
   -mode=diff \
   -proto=disable \