drop vendor from go install paths

This commit is contained in:
Jordan Liggitt 2021-02-18 23:56:34 -05:00
parent b81a2a7373
commit 39f5c13510
8 changed files with 13 additions and 13 deletions

View File

@ -27,7 +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
go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
kube::protoc::check_protoc kube::protoc::check_protoc

View File

@ -53,7 +53,7 @@ EOF
if ! which genswaggertypedocs >/dev/null; then if ! which genswaggertypedocs >/dev/null; then
# build if needed # build if needed
go install k8s.io/kubernetes/cmd/genswaggertypedocs GO111MODULE=on GOPROXY=off go install k8s.io/kubernetes/cmd/genswaggertypedocs
fi fi
genswaggertypedocs -s \ genswaggertypedocs -s \

View File

@ -26,11 +26,11 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
go install k8s.io/kubernetes/pkg/generated/openapi/cmd/models-schema GO111MODULE=on GOPROXY=off go install k8s.io/kubernetes/pkg/generated/openapi/cmd/models-schema
go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/client-gen GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/client-gen
go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/lister-gen GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/lister-gen
go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/informer-gen GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/informer-gen
go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/applyconfiguration-gen GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/applyconfiguration-gen
modelsschema=$(kube::util::find-binary "models-schema") modelsschema=$(kube::util::find-binary "models-schema")
clientgen=$(kube::util::find-binary "client-gen") clientgen=$(kube::util::find-binary "client-gen")

View File

@ -24,7 +24,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
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"

View File

@ -28,8 +28,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/go-to-protobuf GO111MODULE=on GOPROXY=off go install 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 GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
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"

View File

@ -29,7 +29,7 @@ runtime_versions=("v1alpha2" "v1")
kube::golang::setup_env kube::golang::setup_env
go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
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"

View File

@ -36,7 +36,7 @@ for group_version in "${GROUP_VERSIONS[@]}"; do
rm -f "$(kube::util::group-version-to-pkg-path "${group_version}")/types_swagger_doc_generated.go" rm -f "$(kube::util::group-version-to-pkg-path "${group_version}")/types_swagger_doc_generated.go"
done done
# ensure we have the latest genswaggertypedocs built # ensure we have the latest genswaggertypedocs built
go install k8s.io/kubernetes/cmd/genswaggertypedocs GO111MODULE=on GOPROXY=off go install k8s.io/kubernetes/cmd/genswaggertypedocs
for group_version in "${GROUP_VERSIONS[@]}"; do for group_version in "${GROUP_VERSIONS[@]}"; do
kube::swagger::gen_types_swagger_doc "${group_version}" "$(kube::util::group-version-to-pkg-path "${group_version}")" kube::swagger::gen_types_swagger_doc "${group_version}" "$(kube::util::group-version-to-pkg-path "${group_version}")"
done done

View File

@ -28,7 +28,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/import-boss GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/import-boss
packages=( packages=(
"k8s.io/kubernetes/pkg/..." "k8s.io/kubernetes/pkg/..."