automatically setup etcd when running verify/update openapi-spec.sh

1. automatically add etcd to current PATH when calling kube::etcd::install

2. call kube::etcd::install from update-openapi-spec

3. don't call kube::golang::setup_env twice
This commit is contained in:
Benjamin Elder
2023-10-24 14:10:06 -07:00
parent 03ba7efb85
commit 3c530eea2d
2 changed files with 36 additions and 33 deletions

View File

@@ -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}