mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-07 03:03:59 +00:00
Merge pull request #121493 from BenTheElder/etcd-current
automatically setup etcd when running {verify,update}-openapi-spec.sh
This commit is contained in:
commit
6d58ef4a7b
@ -144,7 +144,6 @@ kube::etcd::cleanup() {
|
||||
}
|
||||
|
||||
kube::etcd::install() {
|
||||
(
|
||||
local os
|
||||
local arch
|
||||
|
||||
@ -155,6 +154,9 @@ kube::etcd::install() {
|
||||
if [[ $(readlink etcd) == etcd-v${ETCD_VERSION}-${os}-* ]]; then
|
||||
kube::log::info "etcd v${ETCD_VERSION} already installed. To use:"
|
||||
kube::log::info "export PATH=\"$(pwd)/etcd:\${PATH}\""
|
||||
# export into current process
|
||||
PATH="$(pwd)/etcd:${PATH}"
|
||||
export PATH
|
||||
return #already installed
|
||||
fi
|
||||
|
||||
@ -177,5 +179,7 @@ kube::etcd::install() {
|
||||
fi
|
||||
kube::log::info "etcd v${ETCD_VERSION} installed. To use:"
|
||||
kube::log::info "export PATH=\"$(pwd)/etcd:\${PATH}\""
|
||||
)
|
||||
# export into current process
|
||||
PATH="$(pwd)/etcd:${PATH}"
|
||||
export PATH
|
||||
}
|
||||
|
@ -28,6 +28,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
|
||||
|
||||
kube::util::require-jq
|
||||
kube::golang::setup_env
|
||||
kube::etcd::install
|
||||
|
||||
make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver
|
||||
|
||||
@ -46,8 +47,6 @@ function cleanup()
|
||||
|
||||
trap cleanup EXIT SIGINT
|
||||
|
||||
kube::golang::setup_env
|
||||
|
||||
TMP_DIR=${TMP_DIR:-$(kube::realpath "$(mktemp -d -t "$(basename "$0").XXXXXX")")}
|
||||
ETCD_HOST=${ETCD_HOST:-127.0.0.1}
|
||||
ETCD_PORT=${ETCD_PORT:-2379}
|
||||
|
Loading…
Reference in New Issue
Block a user