github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make hack/install-etcd.sh use hack/lib/etcd.sh

pull/6/head
Jeff Grafton 2016-02-25 19:26:02 -08:00
parent df234d83cd
commit 7adaf80cc7
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hack/install-etcd.sh
View File

@ -14,15 +14,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Convenience script to download and install etcd in third_party.
# Mostly just used by CI.
set -o errexit set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh"
ETCD_VERSION=${ETCD_VERSION:-v2.2.1} kube::etcd::install
cd "${KUBE_ROOT}/third_party"
curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
| tar xzf -
ln -fns etcd-${ETCD_VERSION}-linux-amd64 etcd

17
hack/lib/etcd.sh
View File

@ -16,6 +16,8 @@
# A set of helpers for starting/running etcd for tests # A set of helpers for starting/running etcd for tests
ETCD_VERSION=${ETCD_VERSION:-2.2.1}
kube::etcd::start() { kube::etcd::start() {
local host=${ETCD_HOST:-127.0.0.1} local host=${ETCD_HOST:-127.0.0.1}
local port=${ETCD_PORT:-4001} local port=${ETCD_PORT:-4001}
@ -32,8 +34,9 @@ kube::etcd::start() {
fi fi
version=$(etcd -version | cut -d " " -f 3) version=$(etcd -version | cut -d " " -f 3)
if [[ "${version}" < "2.0.0" ]]; then if [[ "${version}" < "${ETCD_VERSION}" ]]; then
kube::log::usage "etcd version 2.0.0 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/."
exit 1 exit 1
fi fi
@ -61,3 +64,13 @@ kube::etcd::cleanup() {
kube::etcd::stop kube::etcd::stop
kube::etcd::clean_etcd_dir kube::etcd::clean_etcd_dir
} }
kube::etcd::install() {
(
cd "${KUBE_ROOT}/third_party"
curl -fsSL https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-amd64.tar.gz | tar xzf -
ln -fns "etcd-v${ETCD_VERSION}-linux-amd64" etcd
kube::log::info "etcd v${ETCD_VERSION} installed. To use:"
kube::log::info "export PATH=\${PATH}:$(pwd)/etcd"
)
}