github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Recompute registry name and version tag in the federation up script.

Browse Source
This commit is contained in:
Madhusudan.C.S 2016-12-22 12:23:30 +05:30
parent 6cbec8e64e
commit 0c81f60ba0
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,10 +32,6 @@ source "${KUBE_ROOT}/cluster/common.sh"
# For $KUBE_PLATFORM, $KUBE_ARCH, $KUBE_BUILD_STAGE, # For $KUBE_PLATFORM, $KUBE_ARCH, $KUBE_BUILD_STAGE,
# $FEDERATION_PUSH_REPO_BASE and $FEDERATION_NAMESPACE. # $FEDERATION_PUSH_REPO_BASE and $FEDERATION_NAMESPACE.
source "${KUBE_ROOT}/federation/cluster/common.sh" source "${KUBE_ROOT}/federation/cluster/common.sh"
# For `get_version` function and $KUBE_REGISTRY.
# TODO(madhusudancs): Remove this when the code here is moved
# to federation/develop.sh
source "${KUBE_ROOT}/federation/develop/develop.sh"
FEDERATION_NAME="${FEDERATION_NAME:-e2e-federation}" FEDERATION_NAME="${FEDERATION_NAME:-e2e-federation}"
FEDERATION_KUBE_CONTEXT="${FEDERATION_KUBE_CONTEXT:-e2e-federation}" FEDERATION_KUBE_CONTEXT="${FEDERATION_KUBE_CONTEXT:-e2e-federation}"
@ -50,13 +46,15 @@ kubectl="${CLIENT_BIN_DIR}/kubectl"
function init() { function init() {
kube::log::status "Deploying federation control plane for ${FEDERATION_NAME} in cluster ${HOST_CLUSTER_CONTEXT}" kube::log::status "Deploying federation control plane for ${FEDERATION_NAME} in cluster ${HOST_CLUSTER_CONTEXT}"
local -r kube_version="$(get_version)" local -r project="${KUBE_PROJECT:-${PROJECT:-}}"
local -r kube_registry="${KUBE_REGISTRY:-gcr.io/${project}}"
local -r kube_version="${KUBERNETES_RELEASE:-}"
${kubefed} init \ ${kubefed} init \
"${FEDERATION_NAME}" \ "${FEDERATION_NAME}" \
--host-cluster-context="${HOST_CLUSTER_CONTEXT}" \ --host-cluster-context="${HOST_CLUSTER_CONTEXT}" \
--dns-zone-name="${DNS_ZONE_NAME}" \ --dns-zone-name="${DNS_ZONE_NAME}" \
--image="${KUBE_REGISTRY}/hyperkube-amd64:${kube_version}" --image="${kube_registry}/hyperkube-amd64:${kube_version}"
} }
# create_cluster_secrets creates the secrets containing the kubeconfigs # create_cluster_secrets creates the secrets containing the kubeconfigs
@ -84,6 +82,6 @@ if [[ "${USE_KUBEFED}" == "true" ]]; then
init init
create_cluster_secrets create_cluster_secrets
else else
export FEDERATION_IMAGE_TAG="$(get_version)" export FEDERATION_IMAGE_TAG="$(echo ${KUBERNETES_RELEASE:-} | tr + _)"
create-federation-api-objects create-federation-api-objects
fi fi