Merge pull request #44352 from wongma7/etcd-version

Automatic merge from submit-queue (batch tested with PRs 43304, 41427, 43490, 44352) Fix etcd semver validation by using 'sort -V' The old check would erroneously say e.g. v3.0.6 is greater than v3.0.17 which is obviously false. So hack/local-up-cluster.sh would be allowed to run and things would break because etcd does not meet the minimum. sort -V validates it correctly. ```release-note NONE ```

Merge pull request #44352 from wongma7/etcd-version
c68ae58c · Kubernetes Submit Queue · GitHub · 785299ee · 36d244f0 · c68ae58c
Commit c68ae58c authored Apr 11, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 11, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

etcd.sh hack/lib/etcd.sh +2 -2

No files found.
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -36,12 +36,12 @@ kube::etcd::validate() {

  # validate installed version is at least equal to minimum
  version=$(etcd --version | tail -n +1 | head -n 1 | cut -d " " -f 3)
-  if [[ "${version}" < "${ETCD_VERSION}" ]]; then
+  if [[ "`echo -e "${version}\n${ETCD_VERSION}" | sort -rV | head -n 1`" != "$version" ]]; then
   export PATH=$KUBE_ROOT/third_party/etcd:$PATH
   hash etcd
   echo $PATH
   version=$(etcd --version | head -n 1 | cut -d " " -f 3)
-   if [[ "${version}" < "${ETCD_VERSION}" ]]; then
+   if [[ "`echo -e "${version}\n${ETCD_VERSION}" | sort -rV | head -n 1`" != "$version" ]]; then
    kube::log::usage "etcd version ${ETCD_VERSION} or greater required."
    kube::log::info "You can use 'hack/install-etcd.sh' to install a copy in third_party/."
    exit 1