scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40168 from madhusudancs/fed-image-tag-intermediate

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40168, 40165, 39158, 39966, 40190)

Read the VERSIONS file for the FEDERATION_IMAGE_TAG value. 

This is particularly important in the local builds where there is no $KUBERNETES_RELEASE defined.

cc @kubernetes/sig-federation-misc @shashidharatd
This commit is contained in:
Kubernetes Submit Queue
2017-01-20 08:28:46 -08:00
committed by GitHub
parent 4f8f6006cf 41468fb312
commit ea5f41e776
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,6 +82,10 @@ if [[ "${USE_KUBEFED}" == "true" ]]; then
init init
create_cluster_secrets create_cluster_secrets
else else
export FEDERATION_IMAGE_TAG="$(echo ${KUBERNETES_RELEASE:-} | tr + _)" # Read the version back from the versions file if no version is given.
readonly kube_version="$(cat ${KUBE_ROOT}/_output/federation/versions | python -c '\
import json, sys;\
print json.load(sys.stdin)["KUBE_VERSION"]')"
export FEDERATION_IMAGE_TAG="$(echo ${KUBERNETES_RELEASE:-${kube_version}} | tr + _)"
create-federation-api-objects create-federation-api-objects
fi fi