github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Recompute KUBE_VERSION after rebuild in the dev environment.

Browse Source
This commit is contained in:
Madhusudan.C.S 2016-07-22 17:38:18 -07:00
parent 2efdc24b7f
commit dbdc91fc79
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
federation/build.sh
View File

@ -25,6 +25,9 @@
# will deploy the components using # will deploy the components using
# localhost:5000/anushku/hyperkube-amd64:1.3.0-dev image. # localhost:5000/anushku/hyperkube-amd64:1.3.0-dev image.
# Everything in this script is expected to be executed from the $KUBE_ROOT
# directory.
# TODO(madhusudancs): Separate the dev functions from the deployment # TODO(madhusudancs): Separate the dev functions from the deployment
# functions. A lot of code here is to make this work in dev environments. # functions. A lot of code here is to make this work in dev environments.
# The script that we ship to the users as part of a release should be # The script that we ship to the users as part of a release should be
@ -56,7 +59,10 @@ readonly KUBE_ANYWHERE_FEDERATION_CHARTS_VERSION="v0.9.0"
KUBE_PROJECT="madhusudancs-k8s" KUBE_PROJECT="madhusudancs-k8s"
KUBE_REGISTRY="${KUBE_REGISTRY:-gcr.io/${KUBE_PROJECT}}" KUBE_REGISTRY="${KUBE_REGISTRY:-gcr.io/${KUBE_PROJECT}}"
KUBE_VERSION="${KUBE_VERSION:-$(kube::release::semantic_image_tag_version)}"
# In dev environments this value must be recomputed after build. See
# the build() function.
KUBE_VERSION="${KUBE_VERSION:-}"
function cleanup { function cleanup {
@ -95,6 +101,15 @@ function build() {
kube::build::build_image kube::build::build_image
kube::build::run_build_command make WHAT="cmd/kubectl cmd/hyperkube" kube::build::run_build_command make WHAT="cmd/kubectl cmd/hyperkube"
# Recompute KUBE_VERSION because it might have changed after rebuild.
KUBE_VERSION="${KUBE_VERSION:-$(kube::release::semantic_image_tag_version)}"
# Also append the dirty tree SHA to keep the versions unique across
# builds.
if [[ "${KUBE_VERSION}" == *-dirty ]]; then
KUBE_VERSION+=".$(dirty_sha)"
fi
BASEIMAGE="ubuntu:16.04" \ BASEIMAGE="ubuntu:16.04" \
REGISTRY="${KUBE_REGISTRY}" \ REGISTRY="${KUBE_REGISTRY}" \
VERSION="${KUBE_VERSION}" \ VERSION="${KUBE_VERSION}" \
@ -135,12 +150,8 @@ function federation_action() {
} }
function gen_or_update_config() { function gen_or_update_config() {
if [[ "${KUBE_VERSION}" == *-dirty ]]; then
KUBE_VERSION+=".$(dirty_sha)"
fi
mkdir -p "${FEDERATION_OUTPUT_ROOT}" mkdir -p "${FEDERATION_OUTPUT_ROOT}"
cp "config.default.json" "${FEDERATION_OUTPUT_ROOT}/config.json" cp "federation/config.default.json" "${FEDERATION_OUTPUT_ROOT}/config.json"
update_config \ update_config \
'[.[] | .phase1.gce.project |= "'"${KUBE_PROJECT}"'"]' \ '[.[] | .phase1.gce.project |= "'"${KUBE_PROJECT}"'"]' \
@ -160,13 +171,16 @@ EOF
} }
if [[ "${ACTION}" == "gen" || "${ACTION}" == "deploy" ]]; then if [[ "${ACTION}" == "gen" || "${ACTION}" == "deploy" ]]; then
gen_or_update_config
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"
build build
push push
pull_installer pull_installer
# Update config after build and push, but before turning up the clusters
# to ensure the config has the right image version tags.
gen_or_update_config
kube_action kube_action
federation_action federation_action
else else