fix update.sh

This commit is contained in:
Daniel Smith 2014-12-23 22:18:00 +00:00
parent 7f46d420dd
commit eff054515a

View File

@ -51,21 +51,16 @@ function validate() {
for id in "${pod_id_list[@]+${pod_id_list[@]}}"; do for id in "${pod_id_list[@]+${pod_id_list[@]}}"; do
local template_string current_status current_image host_ip local template_string current_status current_image host_ip
# NB: This template string is a little subtle. # NB: kubectl & kubecfg add the "exists" function to the standard template functions.
# # This lets us check to see if the "running" entry exists for each of the containers
# Notes: # we care about. Exists will never return an error and it's safe to check a chain of
# # things, any one of which may not exist. In the below template, all of info,
# The 'and' operator will return blank if any of the inputs are non- # containername, and running might be nil, so the normal index function isn't very
# nil/false. If they are all set, then it'll return the last one. # helpful.
# # This template is unit-tested in kubec{tl|fg}, so if you change it, update the unit test.
# The container is name has a dash in it and so we can't use the simple
# syntax. Instead we need to quote that and use the 'index' operator.
#
# The value here is a structure with just a Time member. This is
# currently always set to a zero time.
# #
# You can read about the syntax here: http://golang.org/pkg/text/template/ # You can read about the syntax here: http://golang.org/pkg/text/template/
template_string="{{and ((index .currentState.info \"${CONTROLLER_NAME}\").state.running.startedAt) .currentState.info.net.state.running.startedAt}}" template_string="{{and (exists . \"currentState\" \"info\" \"${CONTROLLER_NAME}\" \"state\" \"running\") (exists . \"currentState\" \"info\" \"net\" \"state\" \"running\")}}"
current_status=$($KUBECFG -template="${template_string}" get "pods/$id") || { current_status=$($KUBECFG -template="${template_string}" get "pods/$id") || {
if [[ $current_status =~ "pod \"${id}\" not found" ]]; then if [[ $current_status =~ "pod \"${id}\" not found" ]]; then
echo " $id no longer exists" echo " $id no longer exists"
@ -76,11 +71,13 @@ function validate() {
exit -1 exit -1
fi fi
} }
if [[ "$current_status" == "<no value>" ]]; then if [[ "$current_status" == "false" ]]; then
echo " $id is created but not running ${current_status}" echo " $id is created but not running."
continue continue
fi fi
echo " $id is created and both net and update-demo containers are running: $current_status"
template_string="{{(index .currentState.info \"${CONTROLLER_NAME}\").image}}" template_string="{{(index .currentState.info \"${CONTROLLER_NAME}\").image}}"
current_image=$($KUBECFG -template="${template_string}" get "pods/$id") || true current_image=$($KUBECFG -template="${template_string}" get "pods/$id") || true
if [[ "$current_image" != "${DOCKER_HUB_USER}/update-demo:${container_image_version}" ]]; then if [[ "$current_image" != "${DOCKER_HUB_USER}/update-demo:${container_image_version}" ]]; then