github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28700 from colemickens/azure-kube-up-fix-env-var

Browse Source 
Automatic merge from submit-queue

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
This commit is contained in:
k8s-merge-robot 2016-08-02 12:18:43 -07:00 committed by GitHub
commit 81ab15ce44
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cluster/azure/util.sh
View File

@ -165,9 +165,9 @@ EOF
} }
function get-common-params() { function get-common-params() {
declare -a AZKUBE_AUTH_PARAMS declare -ag AZKUBE_AUTH_PARAMS
declare -a AZKUBE_DOCKER_PARAMS declare -ag AZKUBE_DOCKER_PARAMS
declare -a AZKUBE_RESOURCE_GROUP_PARAM declare -ag AZKUBE_RESOURCE_GROUP_PARAM
case "${AZURE_AUTH_METHOD}" in case "${AZURE_AUTH_METHOD}" in
"client_secret") "client_secret")
@ -180,17 +180,13 @@ function get-common-params() {
if [[ ! -z "${AZURE_HTTPS_PROXY:-}" ]]; then 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 fi
if [[ ! -z "${AZURE_RESOURCE_GROUP_PARAM:-}" ]]; then if [[ ! -z "${AZURE_RESOURCE_GROUP:-}" ]]; then
echo "Forcing use of resource group ${AZURE_RESOURCE_GROUP_PARAM}" echo "Forcing use of resource group ${AZURE_RESOURCE_GROUP}"
resource_group_params+=("--resource-group=${AZURE_RESOURCE_GROUP_PARAM}") AZKUBE_RESOURCE_GROUP_PARAM+=("--resource-group=${AZURE_RESOURCE_GROUP}")
fi fi
export AZKUBE_AUTH_PARAMS
export AZKUBE_DOCKER_PARAMS
export AZKUBE_RESOURCE_GROUP_PARAM
} }
function azure-deploy(){ function azure-deploy(){