From d8b0f6fc504ecb48c0b6a44c27c5b6e565ee361e Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <liggitt@google.com>
Date: Sat, 1 Aug 2020 22:28:12 -0400
Subject: [PATCH] Build code-generator tools directly

---
 hack/lib/protoc.sh                           | 5 +----
 hack/lib/util.sh                             | 7 +++++++
 hack/update-codegen.sh                       | 9 +++------
 hack/update-generated-kms-dockerized.sh      | 5 +----
 hack/update-generated-protobuf-dockerized.sh | 7 ++-----
 hack/update-generated-runtime-dockerized.sh  | 5 +----
 hack/verify-import-boss.sh                   | 2 +-
 7 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/hack/lib/protoc.sh b/hack/lib/protoc.sh
index dac437ecdb7..ff8a1d57dc4 100644
--- a/hack/lib/protoc.sh
+++ b/hack/lib/protoc.sh
@@ -27,10 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 # $1: Full path to the directory where the api.proto file is
 function kube::protoc::generate_proto() {
   kube::golang::setup_env
-  local bins=(
-    vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
-  )
-  make -C "${KUBE_ROOT}" WHAT="${bins[*]}"
+  go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
 
   kube::protoc::check_protoc
 
diff --git a/hack/lib/util.sh b/hack/lib/util.sh
index f72ffaabacd..34e189bff21 100755
--- a/hack/lib/util.sh
+++ b/hack/lib/util.sh
@@ -200,6 +200,13 @@ kube::util::find-binary-for-platform() {
     "${KUBE_ROOT}/_output/local/bin/${platform}/${lookfor}"
     "${KUBE_ROOT}/platforms/${platform}/${lookfor}"
   )
+  # if we're looking for the host platform, add local non-platform-qualified search paths
+  if [[ "${platform}" = "$(kube::util::host_platform)" ]]; then
+    locations+=(
+      "${KUBE_ROOT}/_output/local/go/bin/${lookfor}"
+      "${KUBE_ROOT}/_output/dockerized/go/bin/${lookfor}"
+    );
+  fi
   # Also search for binary in bazel build tree.
   # The bazel go rules place some binaries in subtrees like
   # "bazel-bin/source/path/linux_amd64_pure_stripped/binaryname", so make sure
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
index 838fe0917cc..d4bdae609f9 100755
--- a/hack/update-codegen.sh
+++ b/hack/update-codegen.sh
@@ -26,12 +26,9 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
 
-BUILD_TARGETS=(
-  vendor/k8s.io/code-generator/cmd/client-gen
-  vendor/k8s.io/code-generator/cmd/lister-gen
-  vendor/k8s.io/code-generator/cmd/informer-gen
-)
-make -C "${KUBE_ROOT}" WHAT="${BUILD_TARGETS[*]}"
+go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/client-gen
+go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/lister-gen
+go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/informer-gen
 
 clientgen=$(kube::util::find-binary "client-gen")
 listergen=$(kube::util::find-binary "lister-gen")
diff --git a/hack/update-generated-kms-dockerized.sh b/hack/update-generated-kms-dockerized.sh
index 0ccae983d15..50104c0d536 100755
--- a/hack/update-generated-kms-dockerized.sh
+++ b/hack/update-generated-kms-dockerized.sh
@@ -24,10 +24,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
 
-BINS=(
-	vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
-)
-make -C "${KUBE_ROOT}" WHAT="${BINS[*]}"
+go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
 
 if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then
   echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and"
diff --git a/hack/update-generated-protobuf-dockerized.sh b/hack/update-generated-protobuf-dockerized.sh
index d4f72988e17..2b2a2c24225 100755
--- a/hack/update-generated-protobuf-dockerized.sh
+++ b/hack/update-generated-protobuf-dockerized.sh
@@ -28,11 +28,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
 
-BINS=(
-	vendor/k8s.io/code-generator/cmd/go-to-protobuf
-	vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
-)
-make -C "${KUBE_ROOT}" WHAT="${BINS[*]}"
+go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/go-to-protobuf
+go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
 
 if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then
   echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and"
diff --git a/hack/update-generated-runtime-dockerized.sh b/hack/update-generated-runtime-dockerized.sh
index a977bb16cdb..946fef80c95 100755
--- a/hack/update-generated-runtime-dockerized.sh
+++ b/hack/update-generated-runtime-dockerized.sh
@@ -27,10 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
 
-BINS=(
-	vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
-)
-make -C "${KUBE_ROOT}" WHAT="${BINS[*]}"
+go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
 
 if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then
   echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and"
diff --git a/hack/verify-import-boss.sh b/hack/verify-import-boss.sh
index 714fb6d5fa9..cefd33eee0c 100755
--- a/hack/verify-import-boss.sh
+++ b/hack/verify-import-boss.sh
@@ -28,7 +28,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
 
-make -C "${KUBE_ROOT}" WHAT=vendor/k8s.io/code-generator/cmd/import-boss
+go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/import-boss
 
 packages=(
   "k8s.io/kubernetes/pkg/..."