github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-16 15:20:17 +00:00
Code Issues Projects Releases Wiki Activity

Make update-codegen protobuf work on gengo/v2

Browse Source
This commit is contained in:
Tim Hockin 2023-12-24 10:46:49 -08:00
parent b0a70dec4a
commit 251b22a7f8
No known key found for this signature in database
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/lib/protoc.sh
View File

@ -31,8 +31,8 @@ PROTOC_VERSION=23.4
# and formats it correctly # and formats it correctly
# $1: Full path to the directory where the api.proto file is # $1: Full path to the directory where the api.proto file is
function kube::protoc::generate_proto() { function kube::protoc::generate_proto() {
kube::golang::old::setup_env kube::golang::new::setup_env
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/protoc-gen-gogo
kube::protoc::check_protoc kube::protoc::check_protoc

15
hack/update-generated-protobuf-dockerized.sh
View File

@ -28,10 +28,10 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
source "${KUBE_ROOT}/hack/lib/protoc.sh" source "${KUBE_ROOT}/hack/lib/protoc.sh"
kube::protoc::check_protoc 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 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/protoc-gen-gogo
gotoprotobuf=$(kube::util::find-binary "go-to-protobuf") gotoprotobuf=$(kube::util::find-binary "go-to-protobuf")
@ -41,7 +41,10 @@ gotoprotobuf=$(kube::util::find-binary "go-to-protobuf")
# core Google protobuf types # core Google protobuf types
PATH="${KUBE_ROOT}/_output/bin:${PATH}" \ PATH="${KUBE_ROOT}/_output/bin:${PATH}" \
"${gotoprotobuf}" \ "${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" \ --proto-import="${KUBE_ROOT}/third_party/protobuf" \
--packages="$(IFS=, ; echo "$*")" \ --packages="$(IFS=, ; echo "$*")"
--go-header-file "${KUBE_ROOT}/hack/boilerplate/boilerplate.generatego.txt"