From 8b1bd66479cd8048e2a3dc4d7d7c96e981d80833 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 7 Jul 2016 01:26:10 -0700 Subject: [PATCH] azure kube-up respects AZURE_RESOURCE_GROUP This fixes #28482. declare AZKUBE_ variables as global to workaround lack of bash support for exporting array variables --- cluster/azure/util.sh | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/cluster/azure/util.sh b/cluster/azure/util.sh index 462f68b9e77..f3ab2c0ecaa 100644 --- a/cluster/azure/util.sh +++ b/cluster/azure/util.sh @@ -165,9 +165,9 @@ EOF } function get-common-params() { - declare -a AZKUBE_AUTH_PARAMS - declare -a AZKUBE_DOCKER_PARAMS - declare -a AZKUBE_RESOURCE_GROUP_PARAM + declare -ag AZKUBE_AUTH_PARAMS + declare -ag AZKUBE_DOCKER_PARAMS + declare -ag AZKUBE_RESOURCE_GROUP_PARAM case "${AZURE_AUTH_METHOD}" in "client_secret") @@ -180,17 +180,13 @@ function get-common-params() { if [[ ! -z "${AZURE_HTTPS_PROXY:-}" ]]; then - docker_params+=("--net=host" "--env=https_proxy=${AZURE_HTTPS_PROXY}") + AZKUBE_DOCKER_PARAMS+=("--net=host" "--env=https_proxy=${AZURE_HTTPS_PROXY}") fi - if [[ ! -z "${AZURE_RESOURCE_GROUP_PARAM:-}" ]]; then - echo "Forcing use of resource group ${AZURE_RESOURCE_GROUP_PARAM}" - resource_group_params+=("--resource-group=${AZURE_RESOURCE_GROUP_PARAM}") + if [[ ! -z "${AZURE_RESOURCE_GROUP:-}" ]]; then + echo "Forcing use of resource group ${AZURE_RESOURCE_GROUP}" + AZKUBE_RESOURCE_GROUP_PARAM+=("--resource-group=${AZURE_RESOURCE_GROUP}") fi - - export AZKUBE_AUTH_PARAMS - export AZKUBE_DOCKER_PARAMS - export AZKUBE_RESOURCE_GROUP_PARAM } function azure-deploy(){