Merge pull request #5139 from ddysher/node-more-describe

Add more information to node describe

hack/lib/test.sh

@@ -50,3 +50,32 @@ kube::test::get_object_assert() {
       return 1
   fi
 }
+
+kube::test::describe_object_assert() {
+  local resource=$1
+  local object=$2
+  local matches=${@:3}
+
+  result=$(eval kubectl describe "${kube_flags[@]}" $resource $object)
+
+  for match in ${matches}; do
+    if [[ ! $(echo "$result" | grep ${match}) ]]; then
+      echo ${bold}${red}
+      echo "FAIL!"
+      echo "Describe $resource $object"
+      echo "  Expected Match: $match"
+      echo "  Not found in:"
+      echo "$result"
+      echo ${reset}${red}
+      caller
+      echo ${reset}
+      return 1
+    fi
+  done
+
+  echo -n ${green}
+  echo "Successful describe $resource $object:"
+  echo "$result"
+  echo -n ${reset}
+  return 0
+}

hack/test-cmd.sh

@@ -104,7 +104,7 @@ CTLRMGR_PID=$!
 kube::util::wait_for_url "http://127.0.0.1:${CTLRMGR_PORT}/healthz" "controller-manager: "
 kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/api/v1beta1/minions/127.0.0.1" "apiserver(minions): " 0.2 25
 
-# expose kubectl directly for readability
+# Expose kubectl directly for readability
 PATH="${KUBE_OUTPUT_HOSTBIN}":$PATH
 
 kube_api_versions=(
@@ -139,7 +139,7 @@ for version in "${kube_api_versions[@]}"; do
     rc_replicas_field="spec.replicas"
   fi
 
-  # passing no arguments to create is an error
+  # Passing no arguments to create is an error
   ! kubectl create
 
   ###########################
@@ -502,6 +502,8 @@ __EOF__
 
   kube::test::get_object_assert nodes "{{range.items}}{{.$id_field}}:{{end}}" '127.0.0.1:'
 
+  kube::test::describe_object_assert nodes "127.0.0.1" "Name:" "Conditions:" "Addresses:" "Capacity:" "Pods:"
+
   ###########
   # Minions #
   ###########
@@ -513,6 +515,8 @@ __EOF__
 
     # TODO: I should be a MinionList instead of List
     kube::test::get_object_assert minions '{{.kind}}' 'List'
+
+    kube::test::describe_object_assert minions "127.0.0.1" "Name:" "Conditions:" "Addresses:" "Capacity:" "Pods:"
   fi
 
   kube::test::clear_all