Merge pull request kubernetes#72255 from krzyzacy/get-golint

Vendor golint in k/k, and use the vendor version in verify-golint check
atsivakumar · Dec 29, 2018 · a65ba5f · a65ba5f
2 parents fcdc365 + 6b7ccc9
commit a65ba5f
Show file tree

Hide file tree

Showing 27 changed files with 5,766 additions and 19 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/LICENSES b/Godeps/LICENSES
diff --git a/hack/godep-save.sh b/hack/godep-save.sh
@@ -63,6 +63,7 @@ REQUIRED_BINS=(
   "github.com/bazelbuild/bazel-gazelle/cmd/gazelle"
   "github.com/kubernetes/repo-infra/kazel"
   "k8s.io/kube-openapi/cmd/openapi-gen"
+  "golang.org/x/lint/golint"
   "./..."
 )
 

diff --git a/hack/verify-golint.sh b/hack/verify-golint.sh
@@ -23,11 +23,15 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::verify_go_version
 
-if ! which golint > /dev/null; then
-  echo 'Can not find golint, install with:'
-  echo 'go get -u golang.org/x/lint/golint'
-  exit 1
-fi
+
+# Ensure that we find the binaries we build before anything else.
+export GOBIN="${KUBE_OUTPUT_BINPATH}"
+PATH="${GOBIN}:${PATH}"
+
+# Install golint from vendor
+echo 'installing golint from vendor'
+go install k8s.io/kubernetes/vendor/golang.org/x/lint/golint
+
 
 cd "${KUBE_ROOT}"
 

diff --git a/vendor/BUILD b/vendor/BUILD
@@ -390,6 +390,7 @@ filegroup(
         "//vendor/golang.org/x/crypto/poly1305:all-srcs",
         "//vendor/golang.org/x/crypto/salsa20/salsa:all-srcs",
         "//vendor/golang.org/x/crypto/ssh:all-srcs",
+        "//vendor/golang.org/x/lint:all-srcs",
         "//vendor/golang.org/x/net/context:all-srcs",
         "//vendor/golang.org/x/net/html:all-srcs",
         "//vendor/golang.org/x/net/http2:all-srcs",
@@ -417,6 +418,8 @@ filegroup(
         "//vendor/golang.org/x/tools/benchmark/parse:all-srcs",
         "//vendor/golang.org/x/tools/container/intsets:all-srcs",
         "//vendor/golang.org/x/tools/go/ast/astutil:all-srcs",
+        "//vendor/golang.org/x/tools/go/gcexportdata:all-srcs",
+        "//vendor/golang.org/x/tools/go/gcimporter15:all-srcs",
         "//vendor/golang.org/x/tools/go/vcs:all-srcs",
         "//vendor/golang.org/x/tools/imports:all-srcs",
         "//vendor/gonum.org/v1/gonum/blas:all-srcs",

diff --git a/vendor/github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/BUILD b/vendor/github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/BUILD
diff --git a/vendor/github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/gen/BUILD b/vendor/github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/gen/BUILD
diff --git a/vendor/golang.org/x/lint/.travis.yml b/vendor/golang.org/x/lint/.travis.yml
diff --git a/vendor/golang.org/x/lint/BUILD b/vendor/golang.org/x/lint/BUILD
diff --git a/vendor/golang.org/x/lint/CONTRIBUTING.md b/vendor/golang.org/x/lint/CONTRIBUTING.md
diff --git a/vendor/golang.org/x/lint/LICENSE b/vendor/golang.org/x/lint/LICENSE