airship
/
promenade
Code Issues Proposed changes

Remove proxy configuration for Armada wrapper 

This is no longer needed, because Armada cares for using the proxy to
fetch charts.

Change-Id: Ie79bdf33b8c66dc9f7d9c3db06b0d34271c827f4
This commit is contained in:
Mark Burnett 2018-04-25 10:48:06 -05:00
parent 01d0b17d8e
commit 22936ac4eb
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
promenade/templates/roles/genesis/usr/local/bin/armada
View File

@ -2,11 +2,6 @@
set -e
{%- if config['KubernetesNetwork:proxy.url'] is defined %}
HTTP_PROXY=${HTTP_PROXY:-{{ config['KubernetesNetwork:proxy.url'] }}}
NO_PROXY=${NO_PROXY:-{{ config.get(kind='KubernetesNetwork') | fill_no_proxy }}}
{%- endif %}
EXTRA_ARGS=
if [ "x$ARMADA_CHART_PATH_OVERRIDE" != "x" ]; then
@ -18,13 +13,5 @@ exec docker run --rm -i \
-v /etc/genesis/armada-cli/auth:/armada/.kube \
-v /etc/genesis/armada/assets:/etc/genesis/armada/assets \
$EXTRA_ARGS \
{%- if config['KubernetesNetwork:proxy.url'] is defined %}
-e http_proxy=$HTTP_PROXY \
-e HTTP_PROXY=$HTTP_PROXY \
-e https_proxy=$HTTP_PROXY \
-e HTTPS_PROXY=$HTTP_PROXY \
-e no_proxy=$NO_PROXY \
-e NO_PROXY=$NO_PROXY \
{%- endif %}
{{ config['Genesis:images.armada'] }} \
$*