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

Merge pull request #3862 from brendandburns/e2e

Browse Source 
Fix update.sh given the renaming of the network container.
This commit is contained in:
Brendan Burns 2015-01-27 22:19:42 -08:00
commit 586c7c80b2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/e2e-suite/update.sh
View File

@ -60,7 +60,7 @@ function validate() {
# This template is unit-tested in kubec{tl|fg}, so if you change it, update the unit test. # This template is unit-tested in kubec{tl|fg}, so if you change it, update the unit test.
# #
# 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 (exists . \"currentState\" \"info\" \"${CONTROLLER_NAME}\" \"state\" \"running\") (exists . \"currentState\" \"info\" \"net\" \"state\" \"running\")}}" template_string="{{and (exists . \"currentState\" \"info\" \"${CONTROLLER_NAME}\" \"state\" \"running\") (exists . \"currentState\" \"info\" \"POD\" \"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,7 +76,7 @@ function validate() {
continue continue
fi fi
echo " $id is created and both net and update-demo containers are running: $current_status" echo " $id is created and both POD 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