github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set FEDERATION_PUSH_REPO_BASE only when it isn't set.

pull/6/head
Madhusudan.C.S 2016-06-10 00:22:14 -07:00
parent c9b1232a17
commit 498168b4da
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
federation/cluster/common.sh
View File

@ -27,6 +27,9 @@
# Provides the $KUBERNETES_PROVIDER variable and detect-project function # Provides the $KUBERNETES_PROVIDER variable and detect-project function
source "${KUBE_ROOT}/cluster/kube-util.sh" source "${KUBE_ROOT}/cluster/kube-util.sh"
# If $FEDERATION_PUSH_REPO_BASE isn't set set the GCR registry name based on the
# detected project name.
if [[ -z "${FEDERATION_PUSH_REPO_BASE}" ]]; then
# Populates $PROJECT # Populates $PROJECT
detect-project detect-project
if [[ ${PROJECT} == *':'* ]] if [[ ${PROJECT} == *':'* ]]
@ -34,9 +37,10 @@ then
echo "${PROJECT} contains ':' and can not be used as FEDERATION_PUSH_REPO_BASE. Please set FEDERATION_PUSH_REPO_BASE explicitly." echo "${PROJECT} contains ':' and can not be used as FEDERATION_PUSH_REPO_BASE. Please set FEDERATION_PUSH_REPO_BASE explicitly."
exit 1 exit 1
fi fi
FEDERATION_PUSH_REPO_BASE=gcr.io/${PROJECT}
fi
FEDERATION_IMAGE_REPO_BASE=${FEDERATION_IMAGE_REPO_BASE:-'gcr.io/google_containers'} FEDERATION_IMAGE_REPO_BASE=${FEDERATION_IMAGE_REPO_BASE:-'gcr.io/google_containers'}
FEDERATION_PUSH_REPO_BASE=${FEDERATION_PUSH_REPO_BASE:-gcr.io/${PROJECT}}
FEDERATION_NAMESPACE=${FEDERATION_NAMESPACE:-federation-e2e} FEDERATION_NAMESPACE=${FEDERATION_NAMESPACE:-federation-e2e}
KUBE_PLATFORM=${KUBE_PLATFORM:-linux} KUBE_PLATFORM=${KUBE_PLATFORM:-linux}