From 2a10ca650dd74dcdcca1e71316247bde302fb9ee Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <liggitt@google.com>
Date: Wed, 13 Apr 2022 12:25:58 -0400
Subject: [PATCH] drop vendor from test targets

---
 hack/dev-push-conformance.sh          | 2 +-
 hack/lib/golang.sh                    | 6 +++---
 test/conformance/gen-specsummaries.sh | 2 +-
 test/e2e_node/builder/build.go        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hack/dev-push-conformance.sh b/hack/dev-push-conformance.sh
index 7e0191addca..daedfef90f6 100755
--- a/hack/dev-push-conformance.sh
+++ b/hack/dev-push-conformance.sh
@@ -42,7 +42,7 @@ IMAGE="${REGISTRY}/conformance-amd64:${VERSION}"
 
 kube::build::verify_prereqs
 kube::build::build_image
-kube::build::run_build_command make WHAT="vendor/github.com/onsi/ginkgo/ginkgo test/e2e/e2e.test cmd/kubectl test/conformance/image/go-runner"
+kube::build::run_build_command make WHAT="github.com/onsi/ginkgo/ginkgo test/e2e/e2e.test cmd/kubectl test/conformance/image/go-runner"
 kube::build::copy_output
 
 make -C "${KUBE_ROOT}/test/conformance/image" build
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index 2865da28dae..c22b4599b9f 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -111,7 +111,7 @@ readonly KUBE_SERVER_IMAGE_BINARIES=("${KUBE_SERVER_IMAGE_TARGETS[@]##*/}")
 kube::golang::conformance_image_targets() {
   # NOTE: this contains cmd targets for kube::release::build_conformance_image
   local targets=(
-    vendor/github.com/onsi/ginkgo/ginkgo
+    github.com/onsi/ginkgo/ginkgo
     test/e2e/e2e.test
     test/conformance/image/go-runner
     cmd/kubectl
@@ -274,7 +274,7 @@ kube::golang::test_targets() {
     cmd/genyaml
     cmd/genswaggertypedocs
     cmd/linkcheck
-    vendor/github.com/onsi/ginkgo/ginkgo
+    github.com/onsi/ginkgo/ginkgo
     test/e2e/e2e.test
     test/conformance/image/go-runner
   )
@@ -301,7 +301,7 @@ readonly KUBE_TEST_PORTABLE=(
 kube::golang::server_test_targets() {
   local targets=(
     cmd/kubemark
-    vendor/github.com/onsi/ginkgo/ginkgo
+    github.com/onsi/ginkgo/ginkgo
   )
 
   if [[ "${OSTYPE:-}" == "linux"* ]]; then
diff --git a/test/conformance/gen-specsummaries.sh b/test/conformance/gen-specsummaries.sh
index f1376f20a11..ba19a4eba2a 100755
--- a/test/conformance/gen-specsummaries.sh
+++ b/test/conformance/gen-specsummaries.sh
@@ -26,7 +26,7 @@ cd "${KUBE_ROOT}"
 # NOTE: we do *not* use `make WHAT=...` because we do *not* want to be running
 # make generated_files when diffing things (see: hack/verify-conformance-yaml.sh)
 # other update/verify already handle the generated files
-hack/make-rules/build.sh vendor/github.com/onsi/ginkgo/ginkgo test/e2e/e2e.test
+hack/make-rules/build.sh github.com/onsi/ginkgo/ginkgo test/e2e/e2e.test
 
 # dump spec
 ./_output/bin/ginkgo --dryRun=true --focus='[Conformance]' ./_output/bin/e2e.test -- --spec-dump "${KUBE_ROOT}/_output/specsummaries.json" > /dev/null
diff --git a/test/e2e_node/builder/build.go b/test/e2e_node/builder/build.go
index ab5576b348a..5826c2f7190 100644
--- a/test/e2e_node/builder/build.go
+++ b/test/e2e_node/builder/build.go
@@ -33,7 +33,7 @@ var k8sBinDir = flag.String("k8s-bin-dir", "", "Directory containing k8s kubelet
 var buildTargets = []string{
 	"cmd/kubelet",
 	"test/e2e_node/e2e_node.test",
-	"vendor/github.com/onsi/ginkgo/ginkgo",
+	"github.com/onsi/ginkgo/ginkgo",
 	"cluster/gce/gci/mounter",
 	"test/e2e_node/plugins/gcp-credential-provider",
 }