From 91efe7e571286b9041cb98191a02a1c40595f8d7 Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Thu, 28 Dec 2023 19:36:51 -0800
Subject: [PATCH] Fix import-boss wrt gengo/v2

---
 hack/verify-import-boss.sh                    | 30 ++++++++-----------
 .../code-generator/cmd/import-boss/README.md  |  6 ++--
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/hack/verify-import-boss.sh b/hack/verify-import-boss.sh
index a3b2fddccfe..c1bb5a2d75f 100755
--- a/hack/verify-import-boss.sh
+++ b/hack/verify-import-boss.sh
@@ -26,22 +26,18 @@ set -o pipefail
 KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"
 
-kube::golang::old::setup_env
+kube::golang::new::setup_env
 
-GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/import-boss
+GOPROXY=off go install k8s.io/code-generator/cmd/import-boss
 
-packages=(
-  "k8s.io/kubernetes/pkg/..."
-  "k8s.io/kubernetes/cmd/..."
-  "k8s.io/kubernetes/plugin/..."
-  "k8s.io/kubernetes/test/e2e_node/..."
-  "k8s.io/kubernetes/test/e2e/framework/..."
-  "k8s.io/kubernetes/test/integration/..."
-)
-for d in staging/src/k8s.io/*/; do
-  if [ -d "$d" ]; then
-    packages+=("./vendor/${d#"staging/src/"}...")
-  fi
-done
-
-$(kube::util::find-binary "import-boss") --include-test-files=true --verify-only --input-dirs "$(IFS=, ; echo "${packages[*]}")"
+$(kube::util::find-binary "import-boss") \
+    -v "${KUBE_VERBOSE:-0}" \
+    --include-test-files \
+    --verify-only \
+    --input-dirs "./pkg/..." \
+    --input-dirs "./cmd/..." \
+    --input-dirs "./plugin/..." \
+    --input-dirs "./test/e2e_node/..." \
+    --input-dirs "./test/e2e/framework/..." \
+    --input-dirs "./test/integration/..." \
+    --input-dirs "./staging/src/..."
diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/README.md b/staging/src/k8s.io/code-generator/cmd/import-boss/README.md
index 88dc010ef68..6d3aa8da37a 100644
--- a/staging/src/k8s.io/code-generator/cmd/import-boss/README.md
+++ b/staging/src/k8s.io/code-generator/cmd/import-boss/README.md
@@ -23,7 +23,7 @@
     {
       "SelectorRegexp": "k8s[.]io",
       "AllowedPrefixes": [
-        "k8s.io/gengo/examples",
+        "k8s.io/gengo/v2/examples",
         "k8s.io/kubernetes/third_party"
       ],
       "ForbiddenPrefixes": [
@@ -59,7 +59,7 @@
 rules:
   - selectorRegexp: k8s[.]io
     allowedPrefixes:
-      - k8s.io/gengo/examples
+      - k8s.io/gengo/v2/examples
       - k8s.io/kubernetes/third_party
     forbiddenPrefixes:
       - k8s.io/kubernetes/pkg/third_party/deprecated
@@ -94,4 +94,4 @@ inverseRules:
 
 ## Reference
 
-- [import-boss](https://github.com/kubernetes/gengo/tree/master/examples/import-boss)
\ No newline at end of file
+- [import-boss](https://github.com/kubernetes/gengo/tree/master/examples/import-boss)