From b0af0f68b102e37df474c4c21fa46935850f824b Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Thu, 7 Jun 2018 15:30:39 -0700 Subject: [PATCH] gazelle: set proper importmap on dependencies in vendor/ --- hack/update-bazel.sh | 6 ++++++ vendor/BUILD | 2 ++ 2 files changed, 8 insertions(+) diff --git a/hack/update-bazel.sh b/hack/update-bazel.sh index 98def35f9f5..10fb3b38004 100755 --- a/hack/update-bazel.sh +++ b/hack/update-bazel.sh @@ -36,6 +36,12 @@ go install ./vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle go install ./vendor/github.com/kubernetes/repo-infra/kazel touch "${KUBE_ROOT}/vendor/BUILD" +# Ensure that we use the correct importmap for all vendored dependencies. +# Probably not necessary in gazelle 0.13+ +# (https://github.com/bazelbuild/bazel-gazelle/pull/207). +if ! grep -q "# gazelle:importmap_prefix" "${KUBE_ROOT}/vendor/BUILD"; then + echo "# gazelle:importmap_prefix k8s.io/kubernetes/vendor" >> "${KUBE_ROOT}/vendor/BUILD" +fi gazelle fix \ -build_file_name=BUILD,BUILD.bazel \ diff --git a/vendor/BUILD b/vendor/BUILD index 1c1e2e5713c..09df8b1e01d 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -1,3 +1,5 @@ +# gazelle:importmap_prefix k8s.io/kubernetes/vendor + filegroup( name = "package-srcs", srcs = glob(["**"]),