openstack
/
kolla
Code Issues Proposed changes

Update kubectl version at magnum-conductor container 

Download kubectl binary instead of download and unpack
kubernetes.tar.gz with all content inside.

Change-Id: I9cc036a922c1986539af4403b5c56091b607e8e7
Closes-Bug: #1609289
Signed-off-by: Eduardo Gonzalez <dabarren@gmail.com>
This commit is contained in:
Eduardo Gonzalez 2016-08-09 17:38:47 +02:00
parent 1c10f6b089
commit d4373ed4a6
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docker/magnum/magnum-conductor/Dockerfile.j2
View File

@ -5,21 +5,20 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set magnum_conductor_packages = [
'openstack-magnum-conductor',
'tar'
'openstack-magnum-conductor'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set magnum_conductor_packages = ['magnum-conductor'] %}
{% set magnum_conductor_packages = [
'magnum-conductor'
] %}
{% endif %}
RUN {{ macros.install_packages(magnum_conductor_packages | customizable("packages")) }}
# Install kubectl binary (ugh)
RUN cd /tmp \
&& curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz \
&& tar -xzvf /tmp/kubernetes.tar.gz \
&& cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl \
&& rm -rf /tmp/kubernetes
# Install kubectl binary
RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.2.0/bin/linux/amd64/kubectl \
&& chmod +x /usr/local/bin/kubectl
{% endif %}