Skip to content

K
k3s
Commit c814bab9 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #44396 from wongma7/etcd-version

Automatic merge from submit-queue Do etcd semver validation using posix only this is a follow-up to https://github.com/kubernetes/kubernetes/pull/44352, can't use sort -V because not everybody has that ```release-note NONE ```
parents 7a20c565 04241a67
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
hack/lib/etcd.sh
View file @ c814bab9
...@@ -36,12 +36,12 @@ kube::etcd::validate() { ...@@ -36,12 +36,12 @@ kube::etcd::validate() {
# validate installed version is at least equal to minimum # validate installed version is at least equal to minimum
version=$(etcd --version | tail -n +1 | head -n 1 | cut -d " " -f 3) version=$(etcd --version | tail -n +1 | head -n 1 | cut -d " " -f 3)
if [[ "`echo -e "${version}\n${ETCD_VERSION}" | sort -rV | head -n 1`" != "$version" ]]; then if [[ $(kube::etcd::version $ETCD_VERSION) -gt $(kube::etcd::version $version) ]]; then
export PATH=$KUBE_ROOT/third_party/etcd:$PATH export PATH=$KUBE_ROOT/third_party/etcd:$PATH
hash etcd hash etcd
echo $PATH echo $PATH
version=$(etcd --version | head -n 1 | cut -d " " -f 3) version=$(etcd --version | head -n 1 | cut -d " " -f 3)
if [[ "`echo -e "${version}\n${ETCD_VERSION}" | sort -rV | head -n 1`" != "$version" ]]; then if [[ $(kube::etcd::version $ETCD_VERSION) -gt $(kube::etcd::version $version) ]]; then
kube::log::usage "etcd version ${ETCD_VERSION} or greater required." 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/." kube::log::info "You can use 'hack/install-etcd.sh' to install a copy in third_party/."
exit 1 exit 1
...@@ -49,6 +49,10 @@ kube::etcd::validate() { ...@@ -49,6 +49,10 @@ kube::etcd::validate() {
fi fi
} }
kube::etcd::version() {
printf '%s\n' "${@}" | awk -F . '{ printf("%d%03d%03d\n", $1, $2, $3) }'
}
kube::etcd::start() { kube::etcd::start() {
# validate before running # validate before running
kube::etcd::validate kube::etcd::validate
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment