github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 04:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #121493 from BenTheElder/etcd-current

Browse Source 
automatically setup etcd when running {verify,update}-openapi-spec.sh
This commit is contained in:
Kubernetes Prow Robot 2023-12-13 21:26:54 +01:00 committed by GitHub
commit 6d58ef4a7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hack/lib/etcd.sh
View File

@ -144,7 +144,6 @@ kube::etcd::cleanup() {
} }
kube::etcd::install() { kube::etcd::install() {
(
local os local os
local arch local arch
@ -155,6 +154,9 @@ kube::etcd::install() {
if [[ $(readlink etcd) == etcd-v${ETCD_VERSION}-${os}-* ]]; then if [[ $(readlink etcd) == etcd-v${ETCD_VERSION}-${os}-* ]]; then
kube::log::info "etcd v${ETCD_VERSION} already installed. To use:" kube::log::info "etcd v${ETCD_VERSION} already installed. To use:"
kube::log::info "export PATH=\"$(pwd)/etcd:\${PATH}\"" kube::log::info "export PATH=\"$(pwd)/etcd:\${PATH}\""
# export into current process
PATH="$(pwd)/etcd:${PATH}"
export PATH
return #already installed return #already installed
fi fi
@ -177,5 +179,7 @@ kube::etcd::install() {
fi fi
kube::log::info "etcd v${ETCD_VERSION} installed. To use:" kube::log::info "etcd v${ETCD_VERSION} installed. To use:"
kube::log::info "export PATH=\"$(pwd)/etcd:\${PATH}\"" kube::log::info "export PATH=\"$(pwd)/etcd:\${PATH}\""
) # export into current process
PATH="$(pwd)/etcd:${PATH}"
export PATH
} }

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

@ -28,6 +28,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::util::require-jq kube::util::require-jq
kube::golang::setup_env kube::golang::setup_env
kube::etcd::install
make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver
@ -46,8 +47,6 @@ function cleanup()
trap cleanup EXIT SIGINT trap cleanup EXIT SIGINT
kube::golang::setup_env
TMP_DIR=${TMP_DIR:-$(kube::realpath "$(mktemp -d -t "$(basename "$0").XXXXXX")")} TMP_DIR=${TMP_DIR:-$(kube::realpath "$(mktemp -d -t "$(basename "$0").XXXXXX")")}
ETCD_HOST=${ETCD_HOST:-127.0.0.1} ETCD_HOST=${ETCD_HOST:-127.0.0.1}
ETCD_PORT=${ETCD_PORT:-2379} ETCD_PORT=${ETCD_PORT:-2379}