Merge pull request #3464 from smarterclayton/fix_invalid_json_in_services.sh

Fix e2e invalid JSON, ensure CLI communicates invalid JSON errors effectively

hack/e2e-suite/services.sh

@@ -87,9 +87,9 @@ function start_service() {
                                           "containerPort": 9376,
                                           "protocol": "TCP"
                                       }
-                                  ],
+                                  ]
                               }
-                          ],
+                          ]
                       }
                   },
                   "labels": {

hack/e2e.go

@@ -531,9 +531,9 @@ func kubecfgArgs() string {
 // kubectl command (begining with a space).
 func kubectlArgs() string {
 	if *checkVersionSkew {
-		return " --match-server-version"
+		return " --match-server-version --v=4"
 	}
-	return ""
+	return " --v=4"
 }
 
 func bashWrap(cmd string) string {

hack/test-cmd.sh

@@ -115,6 +115,9 @@ for version in "${kube_api_versions[@]}"; do
     [ "$(kubectl get minions -t $'{{ .apiVersion }}' "${kube_flags[@]}")" == "${version}" ]
   fi
 
+  # passing no arguments to create is an error
+  [ ! $(kubectl create) ]
+
   kube::log::status "Testing kubectl(${version}:pods)"
   kubectl get pods "${kube_flags[@]}"
   kubectl create -f examples/guestbook/redis-master.json "${kube_flags[@]}"
@@ -138,7 +141,17 @@ for version in "${kube_api_versions[@]}"; do
   output_service=$(kubectl get service frontend -o json --output-version=v1beta3 "${kube_flags[@]}")
   kubectl delete service frontend "${kube_flags[@]}"
   echo "${output_service}" | kubectl create -f - "${kube_flags[@]}"
+  kubectl create -f - "${kube_flags[@]}" << __EOF__
+      {
+          "kind": "Service",
+          "apiVersion": "v1beta1",
+          "id": "service-${version}-test",
+          "port": 80,
+          "protocol": "TCP"
+      }
+__EOF__
   kubectl get services "${kube_flags[@]}"
+  kubectl get services "service-${version}-test" "${kube_flags[@]}"
   kubectl delete service frontend "${kube_flags[@]}"
 
   kube::log::status "Testing kubectl(${version}:replicationcontrollers)"