From 251b22a7f894e743f7d745c14192f8aaa3cacc93 Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Sun, 24 Dec 2023 10:46:49 -0800
Subject: [PATCH] Make update-codegen protobuf work on gengo/v2

---
 hack/lib/protoc.sh                           |  4 ++--
 hack/update-generated-protobuf-dockerized.sh | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/hack/lib/protoc.sh b/hack/lib/protoc.sh
index 74bfd9d6c12..26faaaebc50 100644
--- a/hack/lib/protoc.sh
+++ b/hack/lib/protoc.sh
@@ -31,8 +31,8 @@ PROTOC_VERSION=23.4
 # and formats it correctly
 # $1: Full path to the directory where the api.proto file is
 function kube::protoc::generate_proto() {
-  kube::golang::old::setup_env
-  GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
+  kube::golang::new::setup_env
+  GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
 
   kube::protoc::check_protoc
 
diff --git a/hack/update-generated-protobuf-dockerized.sh b/hack/update-generated-protobuf-dockerized.sh
index 500c5f387f0..cc6c949a2ab 100755
--- a/hack/update-generated-protobuf-dockerized.sh
+++ b/hack/update-generated-protobuf-dockerized.sh
@@ -28,10 +28,10 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 source "${KUBE_ROOT}/hack/lib/protoc.sh"
 
 kube::protoc::check_protoc
-kube::golang::old::setup_env
+kube::golang::new::setup_env
 
-GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf
-GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
+GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf
+GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
 
 gotoprotobuf=$(kube::util::find-binary "go-to-protobuf")
 
@@ -41,7 +41,10 @@ gotoprotobuf=$(kube::util::find-binary "go-to-protobuf")
 # core Google protobuf types
 PATH="${KUBE_ROOT}/_output/bin:${PATH}" \
   "${gotoprotobuf}" \
-  --proto-import="${KUBE_ROOT}/vendor" \
+  -v "${KUBE_VERBOSE}" \
+  --go-header-file "${KUBE_ROOT}/hack/boilerplate/boilerplate.generatego.txt" \
+  --output-base="${KUBE_ROOT}/staging/src" \
+  --proto-import="${KUBE_ROOT}/staging/src" \
+  --proto-import="${KUBE_ROOT}/vendor" `# required for gogo.proto` \
   --proto-import="${KUBE_ROOT}/third_party/protobuf" \
-  --packages="$(IFS=, ; echo "$*")" \
-  --go-header-file "${KUBE_ROOT}/hack/boilerplate/boilerplate.generatego.txt"
+  --packages="$(IFS=, ; echo "$*")"