github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-28 21:13:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41994 from spiffxp/no-ls-etcd

Browse Source 
Automatic merge from submit-queue

allow `hack/lib/etcd.sh` to print version mismatch error message

**What this PR does / why we need it**:  `third_party/etcd` isn't guaranteed to be present, this was causing the `hack/lib/etcd.sh` script to fail on `ls` prior to printing out the error message about
etcd version mismatch

**Which issue this PR fixes**: fixes #41989

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-02-26 12:56:36 -08:00 committed by GitHub
commit de4217164b
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/lib/etcd.sh
View File

@ -40,7 +40,6 @@ kube::etcd::validate() {
export PATH=$KUBE_ROOT/third_party/etcd:$PATH export PATH=$KUBE_ROOT/third_party/etcd:$PATH
hash etcd hash etcd
echo $PATH echo $PATH
ls $KUBE_ROOT/third_party/etcd
version=$(etcd --version | head -n 1 | cut -d " " -f 3) version=$(etcd --version | head -n 1 | cut -d " " -f 3)
if [[ "${version}" < "${ETCD_VERSION}" ]]; then if [[ "${version}" < "${ETCD_VERSION}" ]]; then
kube::log::usage "etcd version ${ETCD_VERSION} or greater required." kube::log::usage "etcd version ${ETCD_VERSION} or greater required."