Merge "[FIX] Add etcdctl Client to etcd Utility container"

This commit is contained in:
Zuul 2020-08-03 16:03:41 +00:00 committed by Gerrit Code Review
commit 80c0a35be0

View File

@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0'
ARG ETCDCTL_VERSION=3.4.2
ARG ETCDCTL_VERSION=v3.4.2
ARG KUBE_VERSION=1.17.3
ENV GOOGLE_URL=https://storage.googleapis.com/etcd
@ -36,6 +36,8 @@ RUN set -xe \
oslo.rootwrap==5.8.0 \
python-openstackclient==3.18.1 \
python-swiftclient \
&& curl --silent -L "${DOWNLOAD_URL}/${ETCDCTL_VERSION}/etcd-${ETCDCTL_VERSION}-linux-amd64.tar.gz" \
| tar -zC /usr/local/bin --strip-components=1 --wildcards -x "*/etcdctl" \
&& curl --silent -L https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \
| tar -zC /usr/bin --strip-components=3 --wildcards -x "*/*/*/kubectl" \
&& apt-get clean -y \