Merge pull request #2806 from ddysher/exit-integration

hack/local-up-cluster.sh

@@ -150,6 +150,6 @@ cleanup()
     exit 0
 }
 
-trap cleanup EXIT SIGINT
+trap cleanup EXIT
 
 while true; do read x; done

hack/test-integration.sh

@@ -33,7 +33,7 @@ cleanup() {
 "${KUBE_ROOT}/hack/build-go.sh" "$@" cmd/integration
 
 # Run cleanup to stop etcd on interrupt or other kill signal.
-trap cleanup HUP INT QUIT TERM
+trap cleanup EXIT
 
 kube::etcd::start