From 1dcda2762c7ac1080d5cd21ccca30171c91c76a3 Mon Sep 17 00:00:00 2001 From: deads2k Date: Tue, 21 Apr 2015 13:41:55 -0400 Subject: [PATCH] sample template messed up with v1beta3 --- examples/sample-app/README.md | 2 +- hack/test-end-to-end.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/sample-app/README.md b/examples/sample-app/README.md index db1f64968c96..c4274395fe10 100644 --- a/examples/sample-app/README.md +++ b/examples/sample-app/README.md @@ -183,7 +183,7 @@ This section covers how to perform all the steps of building, deploying, and upd 8. Confirm the registry is accessible (you may need to run this more than once): - $ curl `osc get service docker-registry --template="{{ .portalIP }}:{{ .port }}"` + $ curl `osc get service docker-registry --template="{{ .spec.portalIP }}:{{ with index .spec.ports 0 }}{{ .port }}{{ end }}"` You should see: diff --git a/hack/test-end-to-end.sh b/hack/test-end-to-end.sh index ffaf5a64b883..8817f75d0d72 100755 --- a/hack/test-end-to-end.sh +++ b/hack/test-end-to-end.sh @@ -271,7 +271,7 @@ echo "[INFO] Waiting for Docker registry pod to start" wait_for_command '[[ "$(osc get endpoints docker-registry --output-version=v1beta1 -t "{{ if .endpoints }}{{ len .endpoints }}{{ else }}0{{ end }}" || echo "0")" != "0" ]]' $((5*TIME_MIN)) # services can end up on any IP. Make sure we get the IP we need for the docker registry -DOCKER_REGISTRY=$(osc get --output-version=v1beta1 --template="{{ .portalIP }}:{{ .port }}" service docker-registry) +DOCKER_REGISTRY=$(osc get --output-version=v1beta3 --template="{{ .spec.portalIP }}:{{ with index .spec.ports 0 }}{{ .port }}{{ end }}" service docker-registry) echo "[INFO] Verifying the docker-registry is up at ${DOCKER_REGISTRY}" wait_for_url_timed "http://${DOCKER_REGISTRY}" "[INFO] Docker registry says: " $((2*TIME_MIN))