Add helm_version to vars.md

docs/vars.md

@@ -16,7 +16,7 @@ Some variables of note include:
 
 * *calico_version* - Specify version of Calico to use
 * *calico_cni_version* - Specify version of Calico CNI plugin to use
-* *docker_version* - Specify version of Docker to used (should be quoted
+* *docker_version* - Specify version of Docker to use (should be quoted
   string)
 * *etcd_version* - Specify version of ETCD to use
 * *ipip* - Enables Calico ipip encapsulation by default
@@ -26,6 +26,7 @@ Some variables of note include:
 * *kube_network_plugin* - Sets k8s network plugin (default Calico)
 * *kube_proxy_mode* - Changes k8s proxy mode to iptables mode
 * *kube_version* - Specify a given Kubernetes hyperkube version
+* *helm_version* - Specify version of helm to use
 * *searchdomains* - Array of DNS domains to search when looking up hostnames
 * *nameservers* - Array of nameservers to use for DNS lookup
 

roles/download/defaults/main.yml

@@ -93,7 +93,7 @@ kibana_version: "v4.6.1"
 kibana_image_repo: "gcr.io/google_containers/kibana"
 kibana_image_tag: "{{ kibana_version }}"
 
-helm_version: "v2.2.2"
+helm_version: "v2.5.0"
 helm_image_repo: "lachlanevenson/k8s-helm"
 helm_image_tag: "{{ helm_version }}"
 tiller_version: "{{ helm_version }}"

roles/kubernetes-apps/helm/templates/helm-container.j2

@@ -2,9 +2,15 @@
 {{ docker_bin_dir }}/docker run --rm \
   --net=host \
   --name=helm \
-  {% if http_proxy %}-e HTTP_PROXY={{ http_proxy }} \{% endif %}
+  {% if http_proxy %}
-  {% if https_proxy %}-e HTTPS_PROXY={{ https_proxy }} \{% endif %}
+  -e HTTP_PROXY={{ http_proxy }} \
-  {% if no_proxy %}-e NO_PROXY={{ no_proxy }} \{% endif %}
+  {% endif %}
+  {% if https_proxy %}
+  -e HTTPS_PROXY={{ https_proxy }} \
+  {% endif %}
+  {% if no_proxy %}
+  -e NO_PROXY={{ no_proxy }} \
+  {% endif %}
   -v /etc/ssl:/etc/ssl:ro \
   -v {{ helm_home_dir }}:{{ helm_home_dir }}:rw \
   {% for dir in ssl_ca_dirs -%}