Use the deployment make targets in the e2e test script.

Invoke with:
$ PATH=$PATH:/dir/for/haproxy TEST=local DEPLOY=kubectl ./test/e2e.sh

The PATH to find haproxy allows tests that require it to run (otherwise
they are skipped).

We currently deploy with kubectl rather than helm due to naming
differences.

test/e2e.sh

 #! /bin/bash -ex
 
-function undeploy_and_clear {
+function undeploy_all {
     cd ${MYPATH}/../deploy
-    ./undeploy.sh
-    ./clear.sh
+    make undeploy
 }
 
 MYPATH="$( cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 ; pwd -P )"
 source ${MYPATH}/utils.sh
-trap undeploy_and_clear EXIT
+trap undeploy_all EXIT
 
 export TESTOPTS=-v
 
-echo Test initial deployment, and Varnish Ingress deployment
+echo Test deployment of controller and Varnish-as-Ingress
 cd ${MYPATH}/../deploy/
-./init.sh
-./deploy.sh
-./verify.sh
+make deploy verify
 
 echo "Hello, world!" example
 cd ${MYPATH}/../examples/hello/