github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40702 from madhusudancs/federation-kubefed.sh-2

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40691, 40551, 40683, 40700, 40702)

Replace + with _ in the image tag version since + is not a valid image tag character.

We already push the image to the registry by replacing `+` with `_` in the
preceding build and push stages. This change is just propagating the same
to the deploy stage.

cc @kubernetes/sig-federation-pr-reviews @nikhiljindal @shashidharatd
This commit is contained in:
Kubernetes Submit Queue 2017-01-30 19:14:45 -08:00 committed by GitHub
commit 31d21191fe
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
federation/cluster/federation-up.sh
View File

@ -40,11 +40,13 @@ HOST_CLUSTER_CONTEXT="${FEDERATION_HOST_CLUSTER_CONTEXT:-${1}}"
# Initializes the control plane.
# TODO(madhusudancs): Move this to federation/develop.sh.
function init() {
: "${KUBERNETES_RELEASE?KUBERNETES_RELEASE environment variable must be set}"
kube::log::status "Deploying federation control plane for ${FEDERATION_NAME} in cluster ${HOST_CLUSTER_CONTEXT}"
local -r project="${KUBE_PROJECT:-${PROJECT:-}}"
local -r kube_registry="${KUBE_REGISTRY:-gcr.io/${project}}"
local -r kube_version="${KUBERNETES_RELEASE:-}"
local -r kube_version="${KUBERNETES_RELEASE//+/_}"
"${KUBE_ROOT}/federation/develop/kubefed.sh" init \
"${FEDERATION_NAME}" \