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

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

Merge pull request #40168 from madhusudancs/fed-image-tag-intermediate
ea5f41e7 · Kubernetes Submit Queue · GitHub · 4f8f6006 · 41468fb3 · ea5f41e7
Commit ea5f41e7 authored Jan 20, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

federation-up.sh federation/cluster/federation-up.sh +5 -1

No files found.
--- a/federation/cluster/federation-up.sh
+++ b/federation/cluster/federation-up.sh
@@ -82,6 +82,10 @@ if [[ "${USE_KUBEFED}" == "true" ]]; then
  init
  create_cluster_secrets
 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
 fi