openstack/kolla
Code Issues Proposed changes

Allow customisation of k8s binary locations

Browse Source 
Allow operators to customise the location k8s binaries are pulled from
in kubernetes-entrypoint & kubetoolbox

Change-Id: I8bab3fe7dfb9ac23dcfbfd2c709cfddaaab40534
This commit is contained in:
Paul Bourke 2017-02-20 14:46:18 +00:00
parent 796e92035c
commit 8dd0f553a2
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/kubernetes-entrypoint/Dockerfile.j2
View File

@ -3,8 +3,10 @@ MAINTAINER {{ maintainer }}
{% block kubernetes_entrypoint_header %}{% endblock %}
{% block kubernetes_entrypoint_install_binary %}
RUN curl -Lo /usr/local/bin/kubernetes-entrypoint https://github.com/stackanetes/kubernetes-entrypoint/releases/download/v0.1.1/kubernetes-entrypoint \
&& chmod 755 /usr/local/bin/kubernetes-entrypoint
{% endblock %}
{% block kubernetes_entrypoint_footer %}{% endblock %}
{% block footer %}{% endblock %}

2
docker/kubetoolbox/Dockerfile.j2
View File

@ -13,8 +13,10 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(kubetoolbox_packages | customizable("packages")) }}
{% block kubetoolbox_install_kube_binary %}
RUN curl -o /usr/bin/kubectl http://storage.googleapis.com/kubernetes-release/release/v1.4.0/bin/linux/amd64/kubectl \
&& chmod 755 /usr/bin/kubectl
{% endblock %}
{% block kubetoolbox_footer %}{% endblock %}
{% block footer %}{% endblock %}