openstack/openstack-helm
Code Issues Proposed changes

Gate: Fix kubeadm-aio image

Browse Source 
This PS resores the kubeadm-aio image to a functioning state, by
updating the requests package.

Change-Id: I706a8ca5661a8e773386c8d82c049e2a9a04e94e
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2018-10-16 15:52:28 -05:00
parent 6e092c908c
commit a4111037b0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/images/kubeadm-aio/Dockerfile
View File

@ -77,14 +77,15 @@ RUN set -ex ;\
gawk ;\ gawk ;\
pip --no-cache-dir install --upgrade pip ;\ pip --no-cache-dir install --upgrade pip ;\
hash -r ;\ hash -r ;\
pip --no-cache-dir install setuptools ;\ pip --no-cache-dir install --upgrade setuptools ;\
pip --no-cache-dir install kubernetes ;\
# NOTE(srwilkers): Pinning ansible to 2.5.5, as pip installs 2.6 by default. # NOTE(srwilkers): Pinning ansible to 2.5.5, as pip installs 2.6 by default.
# 2.6 introduces a new command flag (init) for the docker_container module # 2.6 introduces a new command flag (init) for the docker_container module
# that is incompatible with what we have currently. 2.5.5 ensures we match # that is incompatible with what we have currently. 2.5.5 ensures we match
# what's deployed in the gates # what's deployed in the gates
pip --no-cache-dir install "ansible==2.5.5" ;\ pip --no-cache-dir install --upgrade \
requests \
kubernetes \
"ansible==2.5.5" ;\
for BINARY in kubectl kubeadm; do \ for BINARY in kubectl kubeadm; do \
curl -sSL -o /usr/bin/${BINARY} \ curl -sSL -o /usr/bin/${BINARY} \
${GOOGLE_KUBERNETES_REPO_URL}/${BINARY} ;\ ${GOOGLE_KUBERNETES_REPO_URL}/${BINARY} ;\