Skip to content

K
k3s
Commit 81ab15ce authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

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

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
parents cadee467 8b1bd664
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 11 deletions
cluster/azure/util.sh
View file @ 81ab15ce
...@@ -165,9 +165,9 @@ EOF ...@@ -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() { ...@@ -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(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment