Use kubectl get foo/name not get foo name

bazelbuild · Oct 18, 2018 · 7a594f5 · 7a594f5
1 parent 590f3b4
commit 7a594f5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/examples/hellogrpc/e2e-test.sh b/examples/hellogrpc/e2e-test.sh
@@ -24,8 +24,8 @@ if [[ -z "${1:-}" ]]; then
 fi
 
 get_lb_ip() {
-    kubectl --namespace=${USER} get service hello-grpc-staging \
-	-o jsonpath='{.status.loadBalancer.ingress[0].ip}'
+    kubectl --namespace=${USER} get service/hello-grpc-staging \
+      -o jsonpath='{.status.loadBalancer.ingress[0].ip}'
 }
 
 # Ensure there is an ip address for hell-grpc-staging:50051
@@ -71,8 +71,8 @@ while [[ -n "${1:-}" ]]; do
   LANGUAGE="$1"
   shift
 
-  create
   trap "delete" EXIT
+  create
   sleep 25
   check_msg ""
 

diff --git a/examples/hellohttp/e2e-test.sh b/examples/hellohttp/e2e-test.sh
@@ -24,8 +24,8 @@ if [[ -z "${1:-}" ]]; then
 fi
 
 get_lb_ip() {
-    kubectl --namespace=${USER} get service hello-http-staging \
-	-o jsonpath='{.status.loadBalancer.ingress[0].ip}'
+    kubectl --namespace=${USER} get service/hello-http-staging \
+      -o jsonpath='{.status.loadBalancer.ingress[0].ip}'
 }
 
 # Ensure there is an ip address for hello-http-staging:8080
@@ -54,15 +54,14 @@ delete() {
 }
 
 check_bad_substitution() {
-    echo Checking a bad substitution
-    if ! bazel run examples/hellohttp:error-on-run;
-    then
-	echo "Success, substitution failed."
-	return
-    else
-	echo "Bad substitution should fail!"
-	exit 1
-    fi
+  echo Checking a bad substitution
+  if ! bazel run examples/hellohttp:error-on-run; then
+    echo "Success, substitution failed."
+    return 0
+  else
+    echo "Bad substitution should fail!"
+    exit 1
+  fi
 }
 
 check_no_images_resolution() {
@@ -83,7 +82,7 @@ while [[ -n "${1:-}" ]]; do
   LANGUAGE="$1"
   shift
 
-  apply
+  apply # apply will handle already created
   trap "delete" EXIT
   sleep 25
   check_msg ""

diff --git a/examples/todocontroller/e2e-test.sh b/examples/todocontroller/e2e-test.sh
@@ -18,8 +18,8 @@ set -e
 LANGUAGE="$1"
 
 function get_lb_ip() {
-    kubectl --namespace=${USER} get service hello-grpc-staging \
-	-o jsonpath='{.status.loadBalancer.ingress[0].ip}'
+    kubectl --namespace=${USER} get service/hello-grpc-staging \
+      -o jsonpath='{.status.loadBalancer.ingress[0].ip}'
 }
 
 function create() {
@@ -76,8 +76,8 @@ function check_reverse_delete_k8s_objects() {
 check_reverse_delete_k8s_object
 check_reverse_delete_k8s_objects
 
-create
 trap "delete" EXIT
+create
 sleep 25
 check_msg