diff --git a/hack/lib/protoc.sh b/hack/lib/protoc.sh index 45e163b2f4b..7d4174a4565 100644 --- a/hack/lib/protoc.sh +++ b/hack/lib/protoc.sh @@ -27,7 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" # $1: Full path to the directory where the api.proto file is function kube::protoc::generate_proto() { 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 diff --git a/hack/lib/swagger.sh b/hack/lib/swagger.sh index 99f11d91268..ba2a59c7f45 100644 --- a/hack/lib/swagger.sh +++ b/hack/lib/swagger.sh @@ -53,7 +53,7 @@ EOF if ! which genswaggertypedocs >/dev/null; then # build if needed - go install k8s.io/kubernetes/cmd/genswaggertypedocs + GO111MODULE=on GOPROXY=off go install k8s.io/kubernetes/cmd/genswaggertypedocs fi genswaggertypedocs -s \ diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index aabe0f4d80e..c4bbfb5e9be 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -26,11 +26,11 @@ source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env -go install k8s.io/kubernetes/pkg/generated/openapi/cmd/models-schema -go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/client-gen -go install k8s.io/kubernetes/vendor/k8s.io/code-generator/cmd/lister-gen -go install k8s.io/kubernetes/vendor/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/kubernetes/pkg/generated/openapi/cmd/models-schema +GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/client-gen +GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/lister-gen +GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/informer-gen +GO111MODULE=on GOPROXY=off go install k8s.io/code-generator/cmd/applyconfiguration-gen modelsschema=$(kube::util::find-binary "models-schema") clientgen=$(kube::util::find-binary "client-gen") diff --git a/hack/update-generated-kms-dockerized.sh b/hack/update-generated-kms-dockerized.sh index 66709da3b06..883325e6b4f 100755 --- a/hack/update-generated-kms-dockerized.sh +++ b/hack/update-generated-kms-dockerized.sh @@ -24,7 +24,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" 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 echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and" diff --git a/hack/update-generated-protobuf-dockerized.sh b/hack/update-generated-protobuf-dockerized.sh index 32fcb45dae4..292db78f074 100755 --- a/hack/update-generated-protobuf-dockerized.sh +++ b/hack/update-generated-protobuf-dockerized.sh @@ -28,8 +28,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env -go install k8s.io/kubernetes/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 +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 if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3."* ]]; then echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and" diff --git a/hack/update-generated-runtime-dockerized.sh b/hack/update-generated-runtime-dockerized.sh index c63eff7cf11..fcad6d1fae1 100755 --- a/hack/update-generated-runtime-dockerized.sh +++ b/hack/update-generated-runtime-dockerized.sh @@ -29,7 +29,7 @@ runtime_versions=("v1alpha2" "v1") 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 echo "Generating protobuf requires protoc 3.0.0-beta1 or newer. Please download and" diff --git a/hack/update-generated-swagger-docs.sh b/hack/update-generated-swagger-docs.sh index 33bc54fd366..ba5c7c4edec 100755 --- a/hack/update-generated-swagger-docs.sh +++ b/hack/update-generated-swagger-docs.sh @@ -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" done # 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 kube::swagger::gen_types_swagger_doc "${group_version}" "$(kube::util::group-version-to-pkg-path "${group_version}")" done diff --git a/hack/verify-import-boss.sh b/hack/verify-import-boss.sh index cefd33eee0c..8c4e39672af 100755 --- a/hack/verify-import-boss.sh +++ b/hack/verify-import-boss.sh @@ -28,7 +28,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" 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=( "k8s.io/kubernetes/pkg/..."