diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index ed1d4aecc78..194c33c233c 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -548,7 +548,7 @@ EOF fi } -# kube::golang::new::setup_env will check that the `go` commands is available in +# kube::golang::setup_env will check that the `go` commands is available in # ${PATH}. It will also check that the Go version is good enough for the # Kubernetes build. # @@ -556,8 +556,7 @@ EOF # env-var GOPATH points to our local output dir # env-var GOBIN is unset (we want binaries in a predictable place) # env-var PATH includes the local GOPATH -#FIXME: rename this when all callers are converted -kube::golang::new::setup_env() { +kube::golang::setup_env() { kube::golang::verify_go_version # Even in module mode, we need to set GOPATH for `go build` and `go install` @@ -876,7 +875,7 @@ kube::golang::build_binaries() { # Create a sub-shell so that we don't pollute the outer environment ( # Check for `go` binary and set ${GOPATH}. - kube::golang::new::setup_env + kube::golang::setup_env V=2 kube::log::info "Go version: $(GOFLAGS='' go version)" local host_platform diff --git a/hack/lib/protoc.sh b/hack/lib/protoc.sh index 26faaaebc50..8fbf0e9ba0f 100644 --- a/hack/lib/protoc.sh +++ b/hack/lib/protoc.sh @@ -31,7 +31,7 @@ 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::new::setup_env + kube::golang::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/lib/verify-generated.sh b/hack/lib/verify-generated.sh index a65e46444cc..4770f99ca5c 100755 --- a/hack/lib/verify-generated.sh +++ b/hack/lib/verify-generated.sh @@ -35,7 +35,7 @@ kube::verify::generated() { kube::util::ensure_clean_working_dir # This sets up the environment, like GOCACHE, which keeps the worktree cleaner. - kube::golang::new::setup_env + kube::golang::setup_env _tmpdir="$(kube::realpath "$(mktemp -d -t "verify-generated-$(basename "$1").XXXXXX")")" git worktree add -f -q "${_tmpdir}" HEAD diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index 5ef239efba3..e791f845383 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -17,7 +17,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::new::setup_env +kube::golang::setup_env kube::golang::setup_gomaxprocs # start the cache mutation detector by default so that cache mutators will be found diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh index 400e630d448..a5c626a0131 100755 --- a/hack/make-rules/test.sh +++ b/hack/make-rules/test.sh @@ -21,7 +21,7 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::new::setup_env +kube::golang::setup_env kube::golang::setup_gomaxprocs # start the cache mutation detector by default so that cache mutators will be found diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 55e246c7cf8..ef8fc98c52e 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -27,7 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/protoc.sh" cd "${KUBE_ROOT}" -kube::golang::new::setup_env +kube::golang::setup_env DBG_CODEGEN="${DBG_CODEGEN:-0}" GENERATED_FILE_PREFIX="${GENERATED_FILE_PREFIX:-zz_generated.}" diff --git a/hack/update-generated-api-compatibility-data.sh b/hack/update-generated-api-compatibility-data.sh index 215c119a10d..65614e585a8 100755 --- a/hack/update-generated-api-compatibility-data.sh +++ b/hack/update-generated-api-compatibility-data.sh @@ -21,7 +21,7 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::new::setup_env +kube::golang::setup_env # Nuke old files so we don't accidentally carry stuff forward. rm -f staging/src/k8s.io/api/testdata/HEAD/*.{yaml,json,pb} diff --git a/hack/update-generated-docs.sh b/hack/update-generated-docs.sh index 114b4f0cca9..220c2dc3daa 100755 --- a/hack/update-generated-docs.sh +++ b/hack/update-generated-docs.sh @@ -25,7 +25,7 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::new::setup_env +kube::golang::setup_env BINS=( cmd/gendocs diff --git a/hack/update-generated-protobuf-dockerized.sh b/hack/update-generated-protobuf-dockerized.sh index cc6c949a2ab..b7f1b3917aa 100755 --- a/hack/update-generated-protobuf-dockerized.sh +++ b/hack/update-generated-protobuf-dockerized.sh @@ -28,7 +28,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/protoc.sh" kube::protoc::check_protoc -kube::golang::new::setup_env +kube::golang::setup_env 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 diff --git a/hack/update-go-workspace.sh b/hack/update-go-workspace.sh index cd4ccff21b8..1142dc147fe 100755 --- a/hack/update-go-workspace.sh +++ b/hack/update-go-workspace.sh @@ -28,8 +28,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" # This sets up the environment, like GOCACHE, which keeps the worktree cleaner. -kube::golang::new::setup_env -export GO111MODULE=on +kube::golang::setup_env cd "${KUBE_ROOT}" diff --git a/hack/update-golangci-lint-config.sh b/hack/update-golangci-lint-config.sh index 7ace6766681..172ab070018 100755 --- a/hack/update-golangci-lint-config.sh +++ b/hack/update-golangci-lint-config.sh @@ -26,7 +26,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" # This sets up the environment, like GOCACHE, which keeps the worktree cleaner. -kube::golang::new::setup_env +kube::golang::setup_env # Remove all files, some of them might be obsolete. rm -f hack/golangci*.yaml diff --git a/hack/update-mocks.sh b/hack/update-mocks.sh index 87dfe11e708..a76b8b139ce 100755 --- a/hack/update-mocks.sh +++ b/hack/update-mocks.sh @@ -25,7 +25,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::verify_go_version -kube::golang::new::setup_env +kube::golang::setup_env echo 'installing mockgen' pushd "${KUBE_ROOT}/hack/tools" >/dev/null diff --git a/hack/update-openapi-spec.sh b/hack/update-openapi-spec.sh index e90d74eb8cf..90d59115111 100755 --- a/hack/update-openapi-spec.sh +++ b/hack/update-openapi-spec.sh @@ -27,7 +27,7 @@ OPENAPI_ROOT_DIR="${KUBE_ROOT}/api/openapi-spec" source "${KUBE_ROOT}/hack/lib/init.sh" kube::util::require-jq -kube::golang::new::setup_env +kube::golang::setup_env kube::etcd::install make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver diff --git a/hack/update-vendor.sh b/hack/update-vendor.sh index 31636b35c06..327406aa4b1 100755 --- a/hack/update-vendor.sh +++ b/hack/update-vendor.sh @@ -25,7 +25,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" # Get all the default Go environment. -kube::golang::new::setup_env +kube::golang::setup_env kube::golang::verify_go_version # Turn off workspaces until we are ready for them later diff --git a/hack/update-yamlfmt.sh b/hack/update-yamlfmt.sh index fbbe4d61780..ca784eb3997 100755 --- a/hack/update-yamlfmt.sh +++ b/hack/update-yamlfmt.sh @@ -21,7 +21,7 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::new::setup_env +kube::golang::setup_env cd "${KUBE_ROOT}" diff --git a/hack/verify-cli-conventions.sh b/hack/verify-cli-conventions.sh index cd70aa58e62..809d493a5f5 100755 --- a/hack/verify-cli-conventions.sh +++ b/hack/verify-cli-conventions.sh @@ -25,7 +25,7 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::new::setup_env +kube::golang::setup_env hack/make-rules/build.sh ./cmd/clicheck diff --git a/hack/verify-conformance-requirements.sh b/hack/verify-conformance-requirements.sh index 8f36a9eb46c..a9293a728f7 100755 --- a/hack/verify-conformance-requirements.sh +++ b/hack/verify-conformance-requirements.sh @@ -27,7 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/util.sh" kube::golang::verify_go_version -kube::golang::new::setup_env +kube::golang::setup_env cd "${KUBE_ROOT}" diff --git a/hack/verify-description.sh b/hack/verify-description.sh index 2b211e78bf1..95db1a3d49a 100755 --- a/hack/verify-description.sh +++ b/hack/verify-description.sh @@ -26,7 +26,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/util.sh" -kube::golang::new::setup_env +kube::golang::setup_env make -C "${KUBE_ROOT}" WHAT=cmd/genswaggertypedocs diff --git a/hack/verify-fieldname-docs.sh b/hack/verify-fieldname-docs.sh index 4eabc87cec9..2997234cf65 100755 --- a/hack/verify-fieldname-docs.sh +++ b/hack/verify-fieldname-docs.sh @@ -26,7 +26,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/util.sh" -kube::golang::new::setup_env +kube::golang::setup_env make -C "${KUBE_ROOT}" WHAT=cmd/fieldnamedocscheck diff --git a/hack/verify-generated-docs.sh b/hack/verify-generated-docs.sh index e46e2695d1f..a38df2e91d4 100755 --- a/hack/verify-generated-docs.sh +++ b/hack/verify-generated-docs.sh @@ -25,7 +25,7 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::new::setup_env +kube::golang::setup_env BINS=( cmd/gendocs diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh index 20389a7a85b..4e2fc06a389 100755 --- a/hack/verify-gofmt.sh +++ b/hack/verify-gofmt.sh @@ -30,7 +30,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" cd "${KUBE_ROOT}" -kube::golang::new::setup_env +kube::golang::setup_env find_files() { find . -not \( \ diff --git a/hack/verify-golangci-lint.sh b/hack/verify-golangci-lint.sh index ad4e7f8a503..72cb0d7d8bd 100755 --- a/hack/verify-golangci-lint.sh +++ b/hack/verify-golangci-lint.sh @@ -44,7 +44,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/util.sh" -kube::golang::new::setup_env +kube::golang::setup_env kube::golang::verify_go_version export GOBIN="${KUBE_OUTPUT_BIN}" diff --git a/hack/verify-govulncheck.sh b/hack/verify-govulncheck.sh index ee1c2cc5bc8..6502c35c298 100755 --- a/hack/verify-govulncheck.sh +++ b/hack/verify-govulncheck.sh @@ -25,7 +25,7 @@ source "${KUBE_ROOT}/hack/lib/util.sh" kube::util::ensure_clean_working_dir # This sets up the environment, like GOCACHE, which keeps the worktree cleaner. -kube::golang::new::setup_env +kube::golang::setup_env go install golang.org/x/vuln/cmd/govulncheck@v1.0.1 diff --git a/hack/verify-import-boss.sh b/hack/verify-import-boss.sh index c1bb5a2d75f..a1c75c0fdf5 100755 --- a/hack/verify-import-boss.sh +++ b/hack/verify-import-boss.sh @@ -26,7 +26,7 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::new::setup_env +kube::golang::setup_env GOPROXY=off go install k8s.io/code-generator/cmd/import-boss diff --git a/hack/verify-imports.sh b/hack/verify-imports.sh index 50269f94068..35a2e5caa69 100755 --- a/hack/verify-imports.sh +++ b/hack/verify-imports.sh @@ -26,7 +26,7 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::new::setup_env +kube::golang::setup_env make -C "${KUBE_ROOT}" WHAT=cmd/importverifier diff --git a/hack/verify-licenses.sh b/hack/verify-licenses.sh index 624b03ef8b0..2c29cba6bd7 100755 --- a/hack/verify-licenses.sh +++ b/hack/verify-licenses.sh @@ -27,7 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/util.sh" # This sets up the environment, like GOCACHE, which keeps the worktree cleaner. -kube::golang::new::setup_env +kube::golang::setup_env kube::util::ensure-temp-dir ARTIFACTS="${ARTIFACTS:-${PWD}/_artifacts}" diff --git a/hack/verify-no-vendor-cycles.sh b/hack/verify-no-vendor-cycles.sh index 00e41d4591b..6a5888c039c 100755 --- a/hack/verify-no-vendor-cycles.sh +++ b/hack/verify-no-vendor-cycles.sh @@ -25,7 +25,7 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::new::setup_env +kube::golang::setup_env kube::golang::verify_go_version staging_repos=() diff --git a/hack/verify-openapi-spec.sh b/hack/verify-openapi-spec.sh index 479941aeb57..cfb582bb845 100755 --- a/hack/verify-openapi-spec.sh +++ b/hack/verify-openapi-spec.sh @@ -26,7 +26,7 @@ set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::new::setup_env +kube::golang::setup_env kube::etcd::install make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver diff --git a/hack/verify-typecheck.sh b/hack/verify-typecheck.sh index a96afb58d8b..99ea3b1e3fd 100755 --- a/hack/verify-typecheck.sh +++ b/hack/verify-typecheck.sh @@ -25,7 +25,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" cd "${KUBE_ROOT}" -kube::golang::new::setup_env +kube::golang::setup_env kube::golang::verify_go_version ret=0 diff --git a/test/instrumentation/stability-utils.sh b/test/instrumentation/stability-utils.sh index e42ac552c10..a0495e9519b 100755 --- a/test/instrumentation/stability-utils.sh +++ b/test/instrumentation/stability-utils.sh @@ -26,7 +26,7 @@ stability_check_setup() { kube::golang::verify_go_version kube::util::ensure-temp-dir cd "${KUBE_ROOT}" - kube::golang::new::setup_env + kube::golang::setup_env } function find_files_to_check() { diff --git a/test/integration/ipamperf/test-performance.sh b/test/integration/ipamperf/test-performance.sh index 976a2237a17..20d9832c87d 100755 --- a/test/integration/ipamperf/test-performance.sh +++ b/test/integration/ipamperf/test-performance.sh @@ -70,7 +70,7 @@ done KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../../../ source "${KUBE_ROOT}/hack/lib/init.sh" -kube::golang::new::setup_env +kube::golang::setup_env DIR_BASENAME=$(dirname "${BASH_SOURCE[0]}") pushd "${DIR_BASENAME}"