github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Rename new::setup_env back to setup_env

Browse Source
This commit is contained in:
Tim Hockin 2023-12-29 13:29:04 -08:00
parent bece9bc3f4
commit 530c4352fb
No known key found for this signature in database
31 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hack/lib/golang.sh
View File

@ -548,7 +548,7 @@ EOF
fi 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 # ${PATH}. It will also check that the Go version is good enough for the
# Kubernetes build. # Kubernetes build.
# #
@ -556,8 +556,7 @@ EOF
# env-var GOPATH points to our local output dir # env-var GOPATH points to our local output dir
# env-var GOBIN is unset (we want binaries in a predictable place) # env-var GOBIN is unset (we want binaries in a predictable place)
# env-var PATH includes the local GOPATH # env-var PATH includes the local GOPATH
#FIXME: rename this when all callers are converted kube::golang::setup_env() {
kube::golang::new::setup_env() {
kube::golang::verify_go_version kube::golang::verify_go_version
# Even in module mode, we need to set GOPATH for `go build` and `go install` # 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 # Create a sub-shell so that we don't pollute the outer environment
( (
# Check for `go` binary and set ${GOPATH}. # 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)" V=2 kube::log::info "Go version: $(GOFLAGS='' go version)"
local host_platform local host_platform

2
hack/lib/protoc.sh
View File

@ -31,7 +31,7 @@ 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::new::setup_env kube::golang::setup_env
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

2
hack/lib/verify-generated.sh
View File

@ -35,7 +35,7 @@ kube::verify::generated() {
kube::util::ensure_clean_working_dir kube::util::ensure_clean_working_dir
# This sets up the environment, like GOCACHE, which keeps the worktree cleaner. # 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")")" _tmpdir="$(kube::realpath "$(mktemp -d -t "verify-generated-$(basename "$1").XXXXXX")")"
git worktree add -f -q "${_tmpdir}" HEAD git worktree add -f -q "${_tmpdir}" HEAD

2
hack/make-rules/test-e2e-node.sh
View File

@ -17,7 +17,7 @@
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::new::setup_env kube::golang::setup_env
kube::golang::setup_gomaxprocs kube::golang::setup_gomaxprocs
# start the cache mutation detector by default so that cache mutators will be found # start the cache mutation detector by default so that cache mutators will be found

2
hack/make-rules/test.sh
View File

@ -21,7 +21,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::new::setup_env kube::golang::setup_env
kube::golang::setup_gomaxprocs kube::golang::setup_gomaxprocs
# start the cache mutation detector by default so that cache mutators will be found # start the cache mutation detector by default so that cache mutators will be found

2
hack/update-codegen.sh
View File

@ -27,7 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
source "${KUBE_ROOT}/hack/lib/protoc.sh" source "${KUBE_ROOT}/hack/lib/protoc.sh"
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"
kube::golang::new::setup_env kube::golang::setup_env
DBG_CODEGEN="${DBG_CODEGEN:-0}" DBG_CODEGEN="${DBG_CODEGEN:-0}"
GENERATED_FILE_PREFIX="${GENERATED_FILE_PREFIX:-zz_generated.}" GENERATED_FILE_PREFIX="${GENERATED_FILE_PREFIX:-zz_generated.}"

2
hack/update-generated-api-compatibility-data.sh
View File

@ -21,7 +21,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" 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. # Nuke old files so we don't accidentally carry stuff forward.
rm -f staging/src/k8s.io/api/testdata/HEAD/*.{yaml,json,pb} rm -f staging/src/k8s.io/api/testdata/HEAD/*.{yaml,json,pb}

2
hack/update-generated-docs.sh
View File

@ -25,7 +25,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::new::setup_env kube::golang::setup_env
BINS=( BINS=(
cmd/gendocs cmd/gendocs

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

@ -28,7 +28,7 @@ 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::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
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

3
hack/update-go-workspace.sh
View File

@ -28,8 +28,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
# This sets up the environment, like GOCACHE, which keeps the worktree cleaner. # This sets up the environment, like GOCACHE, which keeps the worktree cleaner.
kube::golang::new::setup_env kube::golang::setup_env
export GO111MODULE=on
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"

2
hack/update-golangci-lint-config.sh
View File

@ -26,7 +26,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
# This sets up the environment, like GOCACHE, which keeps the worktree cleaner. # 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. # Remove all files, some of them might be obsolete.
rm -f hack/golangci*.yaml rm -f hack/golangci*.yaml

2
hack/update-mocks.sh
View File

@ -25,7 +25,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::verify_go_version kube::golang::verify_go_version
kube::golang::new::setup_env kube::golang::setup_env
echo 'installing mockgen' echo 'installing mockgen'
pushd "${KUBE_ROOT}/hack/tools" >/dev/null pushd "${KUBE_ROOT}/hack/tools" >/dev/null

2
hack/update-openapi-spec.sh
View File

@ -27,7 +27,7 @@ OPENAPI_ROOT_DIR="${KUBE_ROOT}/api/openapi-spec"
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::util::require-jq kube::util::require-jq
kube::golang::new::setup_env kube::golang::setup_env
kube::etcd::install kube::etcd::install
make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver

2
hack/update-vendor.sh
View File

@ -25,7 +25,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
# Get all the default Go environment. # Get all the default Go environment.
kube::golang::new::setup_env kube::golang::setup_env
kube::golang::verify_go_version kube::golang::verify_go_version
# Turn off workspaces until we are ready for them later # Turn off workspaces until we are ready for them later

2
hack/update-yamlfmt.sh
View File

@ -21,7 +21,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::new::setup_env kube::golang::setup_env
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"

2
hack/verify-cli-conventions.sh
View File

@ -25,7 +25,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::new::setup_env kube::golang::setup_env
hack/make-rules/build.sh ./cmd/clicheck hack/make-rules/build.sh ./cmd/clicheck

2
hack/verify-conformance-requirements.sh
View File

@ -27,7 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
source "${KUBE_ROOT}/hack/lib/util.sh" source "${KUBE_ROOT}/hack/lib/util.sh"
kube::golang::verify_go_version kube::golang::verify_go_version
kube::golang::new::setup_env kube::golang::setup_env
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"

2
hack/verify-description.sh
View File

@ -26,7 +26,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
source "${KUBE_ROOT}/hack/lib/util.sh" source "${KUBE_ROOT}/hack/lib/util.sh"
kube::golang::new::setup_env kube::golang::setup_env
make -C "${KUBE_ROOT}" WHAT=cmd/genswaggertypedocs make -C "${KUBE_ROOT}" WHAT=cmd/genswaggertypedocs

2
hack/verify-fieldname-docs.sh
View File

@ -26,7 +26,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
source "${KUBE_ROOT}/hack/lib/util.sh" source "${KUBE_ROOT}/hack/lib/util.sh"
kube::golang::new::setup_env kube::golang::setup_env
make -C "${KUBE_ROOT}" WHAT=cmd/fieldnamedocscheck make -C "${KUBE_ROOT}" WHAT=cmd/fieldnamedocscheck

2
hack/verify-generated-docs.sh
View File

@ -25,7 +25,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::new::setup_env kube::golang::setup_env
BINS=( BINS=(
cmd/gendocs cmd/gendocs

2
hack/verify-gofmt.sh
View File

@ -30,7 +30,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"
kube::golang::new::setup_env kube::golang::setup_env
find_files() { find_files() {
find . -not \( \ find . -not \( \

2
hack/verify-golangci-lint.sh
View File

@ -44,7 +44,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
source "${KUBE_ROOT}/hack/lib/util.sh" source "${KUBE_ROOT}/hack/lib/util.sh"
kube::golang::new::setup_env kube::golang::setup_env
kube::golang::verify_go_version kube::golang::verify_go_version
export GOBIN="${KUBE_OUTPUT_BIN}" export GOBIN="${KUBE_OUTPUT_BIN}"

2
hack/verify-govulncheck.sh
View File

@ -25,7 +25,7 @@ source "${KUBE_ROOT}/hack/lib/util.sh"
kube::util::ensure_clean_working_dir kube::util::ensure_clean_working_dir
# This sets up the environment, like GOCACHE, which keeps the worktree cleaner. # 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 go install golang.org/x/vuln/cmd/govulncheck@v1.0.1

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

@ -26,7 +26,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" 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 GOPROXY=off go install k8s.io/code-generator/cmd/import-boss

2
hack/verify-imports.sh
View File

@ -26,7 +26,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::new::setup_env kube::golang::setup_env
make -C "${KUBE_ROOT}" WHAT=cmd/importverifier make -C "${KUBE_ROOT}" WHAT=cmd/importverifier

2
hack/verify-licenses.sh
View File

@ -27,7 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
source "${KUBE_ROOT}/hack/lib/util.sh" source "${KUBE_ROOT}/hack/lib/util.sh"
# This sets up the environment, like GOCACHE, which keeps the worktree cleaner. # 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 kube::util::ensure-temp-dir
ARTIFACTS="${ARTIFACTS:-${PWD}/_artifacts}" ARTIFACTS="${ARTIFACTS:-${PWD}/_artifacts}"

2
hack/verify-no-vendor-cycles.sh
View File

@ -25,7 +25,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::new::setup_env kube::golang::setup_env
kube::golang::verify_go_version kube::golang::verify_go_version
staging_repos=() staging_repos=()

2
hack/verify-openapi-spec.sh
View File

@ -26,7 +26,7 @@ set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::new::setup_env kube::golang::setup_env
kube::etcd::install kube::etcd::install
make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver

2
hack/verify-typecheck.sh
View File

@ -25,7 +25,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"
kube::golang::new::setup_env kube::golang::setup_env
kube::golang::verify_go_version kube::golang::verify_go_version
ret=0 ret=0

2
test/instrumentation/stability-utils.sh
View File

@ -26,7 +26,7 @@ stability_check_setup() {
kube::golang::verify_go_version kube::golang::verify_go_version
kube::util::ensure-temp-dir kube::util::ensure-temp-dir
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"
kube::golang::new::setup_env kube::golang::setup_env
} }
function find_files_to_check() { function find_files_to_check() {

2
test/integration/ipamperf/test-performance.sh
View File

@ -70,7 +70,7 @@ done
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../../../ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../../../
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::new::setup_env kube::golang::setup_env
DIR_BASENAME=$(dirname "${BASH_SOURCE[0]}") DIR_BASENAME=$(dirname "${BASH_SOURCE[0]}")
pushd "${DIR_BASENAME}" pushd "${DIR_BASENAME}"