Merge pull request #105 from lavalamp/improve_e2e

Add a new e2e test; fix some bugs/usability problems

cluster/cloudcfg.sh

@@ -24,6 +24,6 @@ if [ ! -x $CLOUDCFG ]; then
   exit 1
 fi
 
-detect-master
+detect-master > /dev/null
 
 $CLOUDCFG -h https://${KUBE_MASTER_IP} $@

cluster/config-test.sh

@@ -16,7 +16,7 @@
 ZONE=us-central1-b
 MASTER_SIZE=g1-small
 MINION_SIZE=g1-small
-NUM_MINIONS=3
+NUM_MINIONS=2
 # gcloud/gcutil will expand this to the latest supported image.
 IMAGE=backports-debian-7-wheezy
 NETWORK=default

hack/e2e-suite/guestbook.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# Copyright 2014 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Assumes a running Kubernetes test cluster; verifies that the guestbook example
+# works. Assumes that we're being called by hack/e2e-test.sh (we use some env
+# vars it sets up).
+
+set -e
+
+HAVE_JQ=$(which jq)
+if [[ -z ${HAVE_JQ} ]]; then
+  echo "Please install jq, e.g.: 'sudo apt-get install jq' or, "
+  echo "if you're on a mac with homebrew, 'brew install jq'."
+  exit 1
+fi
+
+source "${KUBE_REPO_ROOT}/cluster/util.sh"
+GUESTBOOK="${KUBE_REPO_ROOT}/examples/guestbook"
+
+# Launch the guestbook example
+$CLOUDCFG -c "${GUESTBOOK}/redis-master.json" create /pods
+$CLOUDCFG -c "${GUESTBOOK}/redis-master-service.json" create /services
+$CLOUDCFG -c "${GUESTBOOK}/redis-slave-controller.json" create /replicationControllers
+
+sleep 5
+
+POD_LIST_1=$($CLOUDCFG -json list pods | jq ".items[].id")
+echo "Pods running: ${POD_LIST_1}"
+
+$CLOUDCFG stop redisSlaveController
+# Needed until issue #103 gets fixed
+sleep 25
+$CLOUDCFG rm redisSlaveController
+$CLOUDCFG delete services/redismaster
+$CLOUDCFG delete pods/redis-master-2
+
+POD_LIST_2=$($CLOUDCFG -json list pods | jq ".items[].id")
+echo "Pods running after shutdown: ${POD_LIST_2}"
+
+exit 0

hack/e2e-test.sh

@@ -17,6 +17,11 @@
 # Starts a Kubernetes cluster, runs the e2e test suite, and shuts it
 # down.
 
+# For debugging of this test's components, it's helpful to leave the test
+# cluster running.
+ALREADY_UP=${1:-0}
+LEAVE_UP=${2:-0}
+
 # Exit on error
 set -e
 
@@ -27,26 +32,29 @@ export CLOUDCFG="${KUBE_REPO_ROOT}/cluster/cloudcfg.sh"
 
 source "${KUBE_REPO_ROOT}/cluster/util.sh"
 
-# Build a release
+if [[ ${ALREADY_UP} -ne 1 ]]; then
-$(dirname $0)/../release/release.sh
+  # Build a release
+  $(dirname $0)/../release/release.sh
 
-# Now bring a test cluster up with that release.
+  # Now bring a test cluster up with that release.
-$(dirname $0)/../cluster/kube-up.sh
+  $(dirname $0)/../cluster/kube-up.sh
+fi
 
 # Detect the project into $PROJECT if it isn't set
 detect-project
 
 set +e
 
-# Open up port 80 & 8080 so common containers on minions can be reached
+if [[ ${ALREADY_UP} -ne 1 ]]; then
-gcutil addfirewall \
+  # Open up port 80 & 8080 so common containers on minions can be reached
-  --norespect_terminal_width \
+  gcutil addfirewall \
-  --project ${PROJECT} \
+    --norespect_terminal_width \
-  --target_tags ${MINION_TAG} \
+    --project ${PROJECT} \
-  --allowed tcp:80 \
+    --target_tags ${MINION_TAG} \
-  --allowed tcp:8080 \
+    --allowed tcp:80,tcp:8080 \
-  --network ${NETWORK} \
+    --network ${NETWORK} \
-  ${MINION_TAG}-http-alt
+    ${MINION_TAG}-http-alt
+fi
 
 # Auto shutdown cluster when we exit
 function shutdown-test-cluster () {
@@ -58,17 +66,25 @@ function shutdown-test-cluster () {
     ${MINION_TAG}-http-alt &
   $(dirname $0)/../cluster/kube-down.sh > /dev/null &
 }
-trap shutdown-test-cluster EXIT
+
+if [[ ${LEAVE_UP} -ne 1 ]]; then
+  trap shutdown-test-cluster EXIT
+fi
 
 any_failed=0
-for test_file in "$(dirname $0)/e2e-suite/*.sh"; do
+for test_file in $(ls $(dirname $0)/e2e-suite/); do
-  $test_file
+  "$(dirname $0)/e2e-suite/${test_file}"
-  if [[ -z $? ]]; then
+  result="$?"
-    echo "${test_file}: passed!"
+  if [[ "${result}" -eq "0" ]]; then
+    echo "${test_file} returned ${result}; passed!"
   else
-    echo "${test_file}: FAILED!"
+    echo "${test_file} returned ${result}; FAIL!"
     any_failed=1
   fi
 done
 
+if [[ ${any_failed} -ne 0 ]]; then
+  echo "At least one test failed."
+fi
+
 exit ${any_failed}

pkg/client/client.go

@@ -90,14 +90,14 @@ func (client Client) rawRequest(method, path string, requestBody io.Reader, targ
 	if err != nil {
 		return nil, err
 	}
-	if response.StatusCode != 200 {
-		return nil, fmt.Errorf("request [%s %s] failed (%d) %s", method, client.makeURL(path), response.StatusCode, response.Status)
-	}
 	defer response.Body.Close()
 	body, err := ioutil.ReadAll(response.Body)
 	if err != nil {
 		return body, err
 	}
+	if response.StatusCode != 200 {
+		return nil, fmt.Errorf("request [%s %s] failed (%d) %s: %s", method, client.makeURL(path), response.StatusCode, response.Status, string(body))
+	}
 	if target != nil {
 		err = json.Unmarshal(body, target)
 	}

pkg/cloudcfg/resource_printer.go

@@ -190,15 +190,22 @@ func (h *HumanReadablePrinter) extractObject(data, kind string) (interface{}, er
 func (h *HumanReadablePrinter) Print(data string, output io.Writer) error {
 	w := tabwriter.NewWriter(output, 20, 5, 3, ' ', 0)
 	defer w.Flush()
-	var obj interface{}
+	var mapObj map[string]interface{}
-	if err := json.Unmarshal([]byte(data), &obj); err != nil {
+	if err := json.Unmarshal([]byte(data), &mapObj); err != nil {
 		return err
 	}
 
-	if _, contains := obj.(map[string]interface{})["kind"]; !contains {
+	// Don't complain about empty objects returned by DELETE commands.
+	if len(mapObj) == 0 {
+		fmt.Fprint(w, "<empty>")
+		return nil
+	}
+
+	if _, contains := mapObj["kind"]; !contains {
 		return fmt.Errorf("unexpected object with no 'kind' field: %s", data)
 	}
-	kind := (obj.(map[string]interface{})["kind"]).(string)
+
+	kind := (mapObj["kind"]).(string)
 	obj, err := h.extractObject(data, kind)
 	if err != nil {
 		return err