scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build code-generator tools directly

Browse Source
This commit is contained in:
Jordan Liggitt
2020-08-01 22:28:12 -04:00
parent a8ae7aefd0
commit d8b0f6fc50
7 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hack/lib/protoc.sh
View File

@@ -27,10 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
# $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::setup_env kube::golang::setup_env
local bins=( go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
)
make -C "${KUBE_ROOT}" WHAT="${bins[*]}"
kube::protoc::check_protoc kube::protoc::check_protoc

7
hack/lib/util.sh
View File

@@ -200,6 +200,13 @@ kube::util::find-binary-for-platform() {
"${KUBE_ROOT}/_output/local/bin/${platform}/${lookfor}" "${KUBE_ROOT}/_output/local/bin/${platform}/${lookfor}"
"${KUBE_ROOT}/platforms/${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. # Also search for binary in bazel build tree.
# The bazel go rules place some binaries in subtrees like # The bazel go rules place some binaries in subtrees like
# "bazel-bin/source/path/linux_amd64_pure_stripped/binaryname", so make sure # "bazel-bin/source/path/linux_amd64_pure_stripped/binaryname", so make sure

9
hack/update-codegen.sh
View File

@@ -26,12 +26,9 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
BUILD_TARGETS=( go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/client-gen
vendor/k8s.io/code-generator/cmd/client-gen go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/lister-gen
vendor/k8s.io/code-generator/cmd/lister-gen go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/informer-gen
vendor/k8s.io/code-generator/cmd/informer-gen
)
make -C "${KUBE_ROOT}" WHAT="${BUILD_TARGETS[*]}"
clientgen=$(kube::util::find-binary "client-gen") clientgen=$(kube::util::find-binary "client-gen")
listergen=$(kube::util::find-binary "lister-gen") listergen=$(kube::util::find-binary "lister-gen")

5
hack/update-generated-kms-dockerized.sh
View File

@@ -24,10 +24,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
BINS=( go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
)
make -C "${KUBE_ROOT}" WHAT="${BINS[*]}"
if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then
echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and" echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and"

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

@@ -28,11 +28,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
BINS=( go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/go-to-protobuf
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
vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
)
make -C "${KUBE_ROOT}" WHAT="${BINS[*]}"
if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then
echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and" echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and"

5
hack/update-generated-runtime-dockerized.sh
View File

@@ -27,10 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
BINS=( go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
)
make -C "${KUBE_ROOT}" WHAT="${BINS[*]}"
if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then
echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and" echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and"

2
hack/verify-import-boss.sh
View File

@@ -28,7 +28,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env 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=( packages=(
"k8s.io/kubernetes/pkg/..." "k8s.io/kubernetes/pkg/..."