diff --git a/Makefile b/Makefile
index 8457fe80090..69c7c88c97c 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,8 @@ test-integration: ## Run integration tests
 .PHONY: test-e2e
 test-e2e: ## Run e2e tests
 	PULL_POLICY=IfNotPresent $(MAKE) docker-build
-	go test -v -tags=e2e -timeout=1h ./test/e2e/... -args --managerImage $(CONTROLLER_IMG)-$(ARCH):$(TAG)
+	MANAGER_IMAGE=$(CONTROLLER_IMG)-$(ARCH):$(TAG) \
+	go test ./test/e2e -v -tags=e2e -ginkgo.v -ginkgo.trace -count=1 -timeout=30m
 
 $(KUBECTL) $(KUBE_APISERVER) $(ETCD): ## install test asset kubectl, kube-apiserver, etcd
 	source ./scripts/fetch_ext_bins.sh && fetch_tools
diff --git a/go.mod b/go.mod
index d6e08b4bc93..cf0b8601ce1 100644
--- a/go.mod
+++ b/go.mod
@@ -12,10 +12,12 @@ require (
 	github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d // indirect
 	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
 	github.com/golang/mock v1.2.0
+	github.com/google/uuid v1.1.1 // indirect
 	github.com/hashicorp/golang-lru v0.5.1 // indirect
 	github.com/json-iterator/go v1.1.7 // indirect
 	github.com/onsi/ginkgo v1.10.1
 	github.com/onsi/gomega v1.7.0
+	github.com/pelletier/go-toml v1.6.0
 	github.com/pkg/errors v0.8.1
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/testify v1.4.0 // indirect
@@ -24,16 +26,19 @@ require (
 	golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7
 	golang.org/x/net v0.0.0-20190909003024-a7b16738d86b
 	golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5 // indirect
-	golang.org/x/text v0.3.2 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
 	k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
-	k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
+	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
 	k8s.io/klog v1.0.0
 	k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf // indirect
 	k8s.io/utils v0.0.0-20190809000727-6c36bc71fc4a
 	sigs.k8s.io/cluster-api v0.2.7
+	sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm v0.1.1
 	sigs.k8s.io/controller-runtime v0.3.0
 )
 
-replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.2.0+incompatible
+replace (
+	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.2.0+incompatible
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
+)
diff --git a/go.sum b/go.sum
index d28a64d1ab0..f9848c9b983 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,4 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/Azure/azure-sdk-for-go v34.2.0+incompatible h1:nOMcbdfRmT5VX7Az7AJ4LRi5cpBOOfr+mF7QpoetwyI=
@@ -5,11 +6,9 @@ github.com/Azure/azure-sdk-for-go v34.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9mo
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Azure/go-autorest v13.2.0+incompatible h1:jK9tnWNPzdvf5gTuueYWLCfIvAhg15iZ2f6+qkD43s8=
 github.com/Azure/go-autorest v13.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
-github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest v0.9.2 h1:6AWuh3uWrsZJcNoCHrCF/+g4aKPCU39kaMO6/qrnK/4=
 github.com/Azure/go-autorest/autorest v0.9.2/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU=
 github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
 github.com/Azure/go-autorest/autorest/adal v0.6.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
 github.com/Azure/go-autorest/autorest/adal v0.7.0 h1:PUMxSVw3tEImG0JTRqbxjXLKCSoPk7DartDELqlOuiI=
@@ -18,12 +17,10 @@ github.com/Azure/go-autorest/autorest/azure/auth v0.4.0 h1:18ld/uw9Rr7VkNie7a7RM
 github.com/Azure/go-autorest/autorest/azure/auth v0.4.0/go.mod h1:Oo5cRhLvZteXzI2itUm5ziqsoIxRkzrt3t61FeZaS18=
 github.com/Azure/go-autorest/autorest/azure/cli v0.3.0 h1:5PAqnv+CSTwW9mlZWZAizmzrazFWEgZykEZXpr2hDtY=
 github.com/Azure/go-autorest/autorest/azure/cli v0.3.0/go.mod h1:rNYMNAefZMRowqCV0cVhr/YDW5dD7afFq9nXAXL4ykE=
-github.com/Azure/go-autorest/autorest/date v0.1.0 h1:YGrhWfrgtFs84+h0o46rJrlmsZtyZRg470CqAXTZaGM=
 github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
 github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM=
 github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
 github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0 h1:Ww5g4zThfD/6cLb4z6xxgeyDa7QDkizMkJKe0ysZXp0=
 github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
 github.com/Azure/go-autorest/autorest/mocks v0.3.0 h1:qJumjCaCudz+OcqE9/XtEPfvtOjOmKaui4EOpFI6zZc=
 github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
@@ -36,6 +33,8 @@ github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6L
 github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k=
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
@@ -59,7 +58,6 @@ github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda h1:NyywMz59neOoVRFDz+ccfKWxn784fiHMDnZSy6T+JXY=
 github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
@@ -113,11 +111,13 @@ github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 h1:u4bArs140e9+AfE52mFHOXVFnOSBJBRlzTHrOPLOIhE=
 github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -137,17 +137,21 @@ github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.0.0 h1:b4Gk+7WdP/d3HZH8EJsZpvV7EtDOgaZLtnaNGIu1adA=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk=
 github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
 github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4=
-github.com/gophercloud/gophercloud v0.3.0 h1:6sjpKIpVwRIIwmcEGp+WwNovNsem+c+2vm6oxshRpL8=
 github.com/gophercloud/gophercloud v0.3.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20170330212424-2500245aa611/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
+github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -161,13 +165,13 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/jonboulle/clockwork v0.0.0-20141017032234-72f9bd7c4e0c/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
@@ -205,8 +209,10 @@ github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
+github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
+github.com/pelletier/go-toml v1.6.0 h1:aetoXYr0Tv7xRU/V4B4IZJ2QcbtMUFoNb3ORp7TzIK4=
+github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
@@ -215,28 +221,33 @@ github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
+github.com/prometheus/client_golang v0.9.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
+github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -248,12 +259,14 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -261,14 +274,17 @@ go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8
 go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.9.1 h1:XCJQEf3W6eZaVwhRBof6ImoYGJSITeKWsyeh3HFu/5o=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -282,17 +298,22 @@ golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190909003024-a7b16738d86b h1:XfVGCX+0T4WOStkaOsJRllbsiImhB2jgVBGc9L0lPGc=
 golang.org/x/net v0.0.0-20190909003024-a7b16738d86b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -301,7 +322,10 @@ golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190621203818-d432491b9138/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5 h1:SW/0nsKCUaozCUtZTakri5laocGx/5bkDSSLrFUsa5s=
 golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -327,6 +351,7 @@ gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3m
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
 gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -334,6 +359,7 @@ google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6/go.mod h1:JiN7NxoA
 google.golang.org/grpc v1.13.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -350,18 +376,26 @@ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
 k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2 h1:bkwe5LsuANqyOwsBng5Qc4S91D2Tv0JHctAztt3YTQs=
 k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2/go.mod h1:AOxZTnaXR/xiarlQL0JUfwQPxjmKDvVYoRp58cA7lUo=
+k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
 k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604 h1:Kl/sh+wWzYK2hWFZtwvuFECup1SbE2kXfMnhGZsoO5M=
 k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604/go.mod h1:7H8sjDlWQu89yWB3FhZfsLyRCRLuoXoCoY5qtwW1q6I=
+k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
 k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d h1:7Kns6qqhMAQWvGkxYOLSLRZ5hJO0/5pcE5lPGP2fxUw=
 k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d/go.mod h1:3jediapYqJ2w1BFw7lAZPCx7scubsTfosqHkhXCWJKw=
+k8s.io/apiserver v0.0.0-20190409021813-1ec86e4da56c/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w=
 k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1/go.mod h1:4FuDU+iKPjdsdQSN3GsEKZLB/feQsj1y9dhhBDVV2Ns=
 k8s.io/client-go v0.0.0-20190918200256-06eb1244587a h1:huOvPq1vO7dkuw9rZPYsLGpFmyGvy6L8q6mDItgkdQ4=
 k8s.io/client-go v0.0.0-20190918200256-06eb1244587a/go.mod h1:3YAcTbI2ArBRmhHns5vlHRX8YQqvkVYpz+U/N5i1mVU=
+k8s.io/cluster-bootstrap v0.0.0-20190516232516-d7d78ab2cfe7 h1:5wvjieVoU4oovHlkeD256q2M2YYi2P01zk6wxSR2zk0=
+k8s.io/cluster-bootstrap v0.0.0-20190516232516-d7d78ab2cfe7/go.mod h1:iBSm2nwo3OaiuW8VDvc3ySDXK5SKfUrxwPvBloKG7zg=
 k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I=
-k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778 h1:YicOHTLJZz/TIpJcqhVYJI2LyuM7VMkYiiG6FZfJmzY=
+k8s.io/component-base v0.0.0-20190409021516-bd2732e5c3f7/go.mod h1:DMaomcf3j3MM2j1FsvlLVVlc7wA2jPytEur3cP9zRxQ=
 k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778/go.mod h1:DFWQCXgXVLiWtzFaS17KxHdlUeUymP7FLxZSkmL9/jU=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
@@ -372,7 +406,10 @@ k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
+k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=
 k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
+k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208/go.mod h1:nfDlWeOsu3pUf4yWGL+ERqohP4YsZcBJXWMK+gkzOA4=
 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ=
 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
 k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
@@ -384,12 +421,17 @@ modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
 modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
 modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
+sigs.k8s.io/cluster-api v0.2.0/go.mod h1:PQFa4RZOESzjF7B8pNOWJSVgUzdAdPbSmuFDz301sgI=
 sigs.k8s.io/cluster-api v0.2.7 h1:WjhtuvyjnMgo62kKlVizhI/nYs4DJxHNf+ZMSk/uUsM=
 sigs.k8s.io/cluster-api v0.2.7/go.mod h1:Agc72Ra5LMOkQQ2v/Ywv1KUemaYAwvkQ+G59Ym5H8e4=
+sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm v0.1.1 h1:IS0mO5nw4pGkADoR85z+Ms1wsnCx7DY/9u1xTV1I7+k=
+sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm v0.1.1/go.mod h1:byI3XeFBqFgCVi2FhI/ZbrLuM03buKFipy82S1Lsups=
+sigs.k8s.io/controller-runtime v0.2.0/go.mod h1:ZHqrRDZi3f6BzONcvlUxkqCKgwasGk5FZrnSv9TVZF4=
 sigs.k8s.io/controller-runtime v0.3.0 h1:ZtdgqJXVHsIytjdmDuk0QjagnzyLq9FjojXRqIp+dU4=
 sigs.k8s.io/controller-runtime v0.3.0/go.mod h1:Cw6PkEg0Sa7dAYovGT4R0tRkGhHXpYijwNxYhAnAZZk=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/testing_frameworks v0.1.1 h1:cP2l8fkA3O9vekpy5Ks8mmA0NW/F7yBdXf8brkWhVrs=
 sigs.k8s.io/testing_frameworks v0.1.1/go.mod h1:VVBKrHmJ6Ekkfz284YKhQePcdycOzNH9qL6ht1zEr/U=
 sigs.k8s.io/testing_frameworks v0.1.2-0.20190130140139-57f07443c2d4 h1:GtDhkj3cF4A4IW+A9LScsuxvJqA9DE7G7PGH1f8B07U=
 sigs.k8s.io/testing_frameworks v0.1.2-0.20190130140139-57f07443c2d4/go.mod h1:VVBKrHmJ6Ekkfz284YKhQePcdycOzNH9qL6ht1zEr/U=
diff --git a/go.vendor b/go.vendor
deleted file mode 100644
index 2686febc4fb..00000000000
--- a/go.vendor
+++ /dev/null
@@ -1 +0,0 @@
-sigs.k8s.io/cluster-api
diff --git a/hack/ensure-kind.sh b/hack/ensure-kind.sh
index 94722a0f4af..44611a27732 100755
--- a/hack/ensure-kind.sh
+++ b/hack/ensure-kind.sh
@@ -19,7 +19,7 @@ set -o nounset
 set -o pipefail
 
 GOPATH_BIN="$(go env GOPATH)/bin/"
-MINIMUM_KIND_VERSION=v0.4.0
+MINIMUM_KIND_VERSION=v0.5.1
 
 # Ensure the kind tool exists and is a viable version, or installs it
 verify_kind_version() {
diff --git a/hack/ensure-kustomize.sh b/hack/ensure-kustomize.sh
new file mode 100644
index 00000000000..1c3d0ab67ca
--- /dev/null
+++ b/hack/ensure-kustomize.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+# Copyright 2019 The Kubernetes Authors.
+#
+# 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.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+GOPATH_BIN="$(go env GOPATH)/bin/"
+MINIMUM_KUSTOMIZE_VERSION=3.1.0
+
+# Ensure the kustomize tool exists and is a viable version, or installs it
+verify_kustomize_version() {
+
+  # If kustomize is not available on the path, get it
+  if ! [ -x "$(command -v kustomize)" ]; then
+    if [[ "${OSTYPE}" == "linux-gnu" ]]; then
+      echo 'kustomize not found, installing'
+      if ! [ -d "${GOPATH_BIN}" ]; then
+        mkdir -p "${GOPATH_BIN}"
+      fi
+      curl -sLo "${GOPATH_BIN}/kustomize" https://github.com/kubernetes-sigs/kustomize/releases/download/v${MINIMUM_KUSTOMIZE_VERSION}/kustomize_${MINIMUM_KUSTOMIZE_VERSION}_linux_amd64
+      chmod +x "${GOPATH_BIN}/kustomize"
+    else
+      echo "Missing required binary in path: kustomize"
+      return 2
+    fi
+  fi
+
+  local kustomize_version
+  kustomize_version=$(kustomize version)
+  if [[ "${MINIMUM_KUSTOMIZE_VERSION}" != $(echo -e "${MINIMUM_KUSTOMIZE_VERSION}\n${kustomize_version}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) ]]; then
+    cat <<EOF
+Detected kustomize version: ${kustomize_version}.
+Requires ${MINIMUM_KUSTOMIZE_VERSION} or greater.
+Please install ${MINIMUM_KUSTOMIZE_VERSION} or later.
+EOF
+    return 2
+  fi
+}
+
+verify_kustomize_version
\ No newline at end of file
diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh
index 6dcd07d68ca..d5263c09be2 100755
--- a/scripts/ci-e2e.sh
+++ b/scripts/ci-e2e.sh
@@ -14,10 +14,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+###############################################################################
+
+# This script is executed by presubmit `pull-cluster-api-provider-azure-e2e`
+# To run locally, set AZURE_CLIENT_ID, AZURE_CLIENT_SECRET, AZURE_SUBSCRIPTION_ID, AZURE_TENANT_ID
+
 set -o nounset
 set -o pipefail
 
-# This script is part of the e2e effort. Current plan is to:
-# - Merge dummy ci-e2e script
-# - Create a prow presubmit that calls the dummy script
-# - Fill in the ci-e2e along with the e2e PR
\ No newline at end of file
+REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+cd "${REPO_ROOT}" || exit 1
+
+# shellcheck source=../hack/ensure-go.sh
+source "${REPO_ROOT}/hack/ensure-go.sh"
+# shellcheck source=../hack/ensure-kind.sh
+source "${REPO_ROOT}/hack/ensure-kind.sh"
+# shellcheck source=../hack/ensure-kubectl.sh
+source "${REPO_ROOT}/hack/ensure-kubectl.sh"
+# shellcheck source=../hack/ensure-kustomize.sh
+source "${REPO_ROOT}/hack/ensure-kustomize.sh"
+
+export REGISTRY=e2e
+
+make test-e2e
+test_status="${?}"
+
+# TODO last chance to clean up resources if prow job leaves something behind
+
+exit "${test_status}"
diff --git a/test/e2e/auth/creds.go b/test/e2e/auth/creds.go
new file mode 100644
index 00000000000..4d322e09517
--- /dev/null
+++ b/test/e2e/auth/creds.go
@@ -0,0 +1,66 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+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.
+*/
+
+package auth
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+
+	"github.com/pelletier/go-toml"
+)
+
+// Config stores the auth info
+type Config struct {
+	Creds
+}
+
+// Creds stores the auth info
+type Creds struct {
+	ClientID           string
+	ClientSecret       string
+	TenantID           string
+	SubscriptionID     string
+	StorageAccountName string
+	StorageAccountKey  string
+}
+
+// LoadFromFile loads auth info from the input file path
+// This was mostly copied from the test-infra repo
+func LoadFromFile(credsFile string) (Creds, error) {
+	fmt.Printf("Loading credentials from file %v\n", credsFile)
+	content, err := ioutil.ReadFile(credsFile)
+	if err != nil {
+		return Creds{}, fmt.Errorf("error reading credentials file %v %v", credsFile, err)
+	}
+	config := Config{}
+	if err = toml.Unmarshal(content, &config); err != nil {
+		return Creds{}, fmt.Errorf("error parsing credentials file %v %v", credsFile, err)
+	}
+	return config.Creds, nil
+}
+
+// LoadFromEnvironment loads auth info from the environment
+func LoadFromEnvironment() (Creds, error) {
+	fmt.Print("Loading credentials from environment\n")
+	return Creds{
+		TenantID:       os.Getenv("AZURE_TENANT_ID"),
+		SubscriptionID: os.Getenv("AZURE_SUBSCRIPTION_ID"),
+		ClientID:       os.Getenv("AZURE_CLIENT_ID"),
+		ClientSecret:   os.Getenv("AZURE_CLIENT_SECRET"),
+	}, nil
+}
diff --git a/test/e2e/azure_suite_test.go b/test/e2e/azure_suite_test.go
new file mode 100644
index 00000000000..67330279037
--- /dev/null
+++ b/test/e2e/azure_suite_test.go
@@ -0,0 +1,191 @@
+// +build e2e
+
+/*
+Copyright 2019 The Kubernetes Authors.
+
+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.
+*/
+
+package e2e_test
+
+import (
+	"bufio"
+	"context"
+	"fmt"
+	"os"
+	"path"
+	"path/filepath"
+	"testing"
+	"time"
+
+	. "github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/config"
+	"github.com/onsi/ginkgo/reporters"
+	. "github.com/onsi/gomega"
+
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	bootstrapv1 "sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm/api/v1alpha2"
+	infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha2"
+	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/auth"
+	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/framework"
+	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/framework/management/kind"
+	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/generators"
+	capiv1 "sigs.k8s.io/cluster-api/api/v1alpha2"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+func TestE2E(t *testing.T) {
+	artifactPath, _ := os.LookupEnv("ARTIFACTS")
+	junitXML := fmt.Sprintf("junit.e2e_suite.%d.xml", config.GinkgoConfig.ParallelNode)
+	junitPath := path.Join(artifactPath, junitXML)
+	junitReporter := reporters.NewJUnitReporter(junitPath)
+
+	RegisterFailHandler(Fail)
+	RunSpecsWithDefaultAndCustomReporters(t, "CAPZ e2e suite", []Reporter{junitReporter})
+}
+
+var (
+	ctx   = context.Background()
+	creds auth.Creds
+	mgmt  *kind.Cluster
+
+	// TODO Parameterize some of these variables
+	location       = "westus2"
+	vmSize         = "Standard_B2ms"
+	namespace      = "default"
+	k8sVersion     = "v1.16.2"
+	imageOffer     = "capi"
+	imagePublisher = "cncf-upstream"
+	imageSKU       = "k8s-1dot16-ubuntu-1804"
+	imageVersion   = "latest"
+)
+
+var _ = BeforeSuite(func() {
+	var err error
+
+	By("Loading Azure credentials")
+	if credsFile, found := os.LookupEnv("AZURE_CREDENTIALS"); found {
+		creds, err = auth.LoadFromFile(credsFile)
+	} else {
+		creds, err = auth.LoadFromEnvironment()
+	}
+	Expect(err).NotTo(HaveOccurred())
+	Expect(creds).NotTo(BeNil())
+	Expect(creds.TenantID).NotTo(BeEmpty())
+	Expect(creds.SubscriptionID).NotTo(BeEmpty())
+	Expect(creds.ClientID).NotTo(BeEmpty())
+	Expect(creds.ClientSecret).NotTo(BeEmpty())
+
+	By("Creating management cluster")
+	scheme := runtime.NewScheme()
+	Expect(appsv1.AddToScheme(scheme)).To(Succeed())
+	Expect(corev1.AddToScheme(scheme)).To(Succeed())
+	Expect(capiv1.AddToScheme(scheme)).To(Succeed())
+	Expect(bootstrapv1.AddToScheme(scheme)).To(Succeed())
+	Expect(infrav1.AddToScheme(scheme)).To(Succeed())
+
+	managerImage, found := os.LookupEnv("MANAGER_IMAGE")
+	Expect(found).To(BeTrue(), fmt.Sprint("MANAGER_IMAGE not set"))
+
+	mgmt, err = kind.NewCluster(ctx, "mgmt", scheme, managerImage)
+	Expect(err).NotTo(HaveOccurred())
+	Expect(mgmt).NotTo(BeNil())
+
+	// TODO Figure out how to keep these versions in sync across the code base
+	capi := &generators.ClusterAPI{Version: "v0.2.7"}
+	cabpk := &generators.Bootstrap{Version: "v0.1.5"}
+	infra := &generators.Infra{Creds: creds}
+
+	framework.InstallComponents(ctx, mgmt, capi, cabpk, infra)
+
+	// DO NOT stream "capi-controller-manager" logs as it prints out azure.json
+	// go func() {
+	// 	defer GinkgoRecover()
+	// 	watchDeployment(mgmt, "cabpk-system", "cabpk-controller-manager")
+	// }()
+	// go func() {
+	// 	defer GinkgoRecover()
+	// 	watchDeployment(mgmt, "capz-system", "capz-controller-manager")
+	// }()
+})
+
+var _ = AfterSuite(func() {
+	By("Tearing down management cluster")
+	Expect(mgmt.Teardown(ctx)).NotTo(HaveOccurred())
+})
+
+func watchDeployment(mgmt *kind.Cluster, namespace, name string) {
+	artifactPath, _ := os.LookupEnv("ARTIFACTS")
+	logDir := path.Join(artifactPath, "logs")
+
+	c, err := mgmt.GetClient()
+	Expect(err).NotTo(HaveOccurred())
+
+	waitDeployment(c, namespace, name)
+
+	deployment := &appsv1.Deployment{}
+	deploymentKey := client.ObjectKey{Namespace: namespace, Name: name}
+	Expect(c.Get(ctx, deploymentKey, deployment)).To(Succeed())
+
+	selector, err := metav1.LabelSelectorAsMap(deployment.Spec.Selector)
+	Expect(err).NotTo(HaveOccurred())
+
+	pods := &corev1.PodList{}
+	Expect(c.List(ctx, pods, client.InNamespace(namespace), client.MatchingLabels(selector))).To(Succeed())
+
+	for _, pod := range pods.Items {
+		for _, container := range deployment.Spec.Template.Spec.Containers {
+			if container.Name != "manager" {
+				continue
+			}
+			logFile := path.Join(logDir, name, pod.Name, container.Name+".log")
+			Expect(os.MkdirAll(filepath.Dir(logFile), 0755)).To(Succeed())
+
+			clientSet, err := mgmt.Clientset()
+			Expect(err).NotTo(HaveOccurred())
+
+			opts := &corev1.PodLogOptions{Container: container.Name, Follow: true}
+			logsStream, err := clientSet.CoreV1().Pods(namespace).GetLogs(pod.Name, opts).Stream()
+			Expect(err).NotTo(HaveOccurred())
+			defer logsStream.Close()
+
+			f, err := os.OpenFile(logFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+			Expect(err).NotTo(HaveOccurred())
+			defer f.Close()
+
+			out := bufio.NewWriter(f)
+			defer out.Flush()
+
+			_, err = out.ReadFrom(logsStream)
+			if err != nil && err.Error() != "unexpected EOF" {
+				Expect(err).NotTo(HaveOccurred())
+			}
+		}
+	}
+}
+
+func waitDeployment(c client.Client, namespace, name string) {
+	Eventually(func() (int32, error) {
+		deployment := &appsv1.Deployment{}
+		deploymentKey := client.ObjectKey{Namespace: namespace, Name: name}
+		if err := c.Get(context.TODO(), deploymentKey, deployment); err != nil {
+			return 0, err
+		}
+		return deployment.Status.ReadyReplicas, nil
+	}, 5*time.Minute, 15*time.Second,
+		fmt.Sprintf("Deployment %s/%s could not reach the ready state", namespace, name),
+	).ShouldNot(BeZero())
+}
diff --git a/test/e2e/azure_test.go b/test/e2e/azure_test.go
index bfcd65a1929..318e268cfff 100644
--- a/test/e2e/azure_test.go
+++ b/test/e2e/azure_test.go
@@ -1,3 +1,5 @@
+// +build e2e
+
 /*
 Copyright 2019 The Kubernetes Authors.
 
@@ -16,228 +18,275 @@ limitations under the License.
 
 package e2e_test
 
-// import (
-// 	"context"
-// 	"fmt"
-// 	"time"
-
-// 	. "github.com/onsi/ginkgo"
-// 	. "github.com/onsi/gomega"
-// 	. "github.com/onsi/gomega/gstruct"
-// 	"github.com/onsi/gomega/types"
-
-// 	corev1 "k8s.io/api/core/v1"
-// 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-// 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-// 	apimachinerytypes "k8s.io/apimachinery/pkg/types"
-// 	"k8s.io/client-go/kubernetes"
-// 	capz "sigs.k8s.io/cluster-api-provider-azure/apis/v1alpha2"
-// 	capi "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
-// 	"sigs.k8s.io/cluster-api/pkg/util"
-// 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
-// )
-
-// const (
-// 	workerClusterK8sVersion = "v1.15.3"
-// )
-
-// var _ = Describe("functional tests", func() {
-// 	var (
-// 		namespace   string
-// 		clusterName string
-// 	)
-// 	BeforeEach(func() {
-// 		namespace = "test-" + util.RandomString(6)
-// 		fmt.Fprintf(GinkgoWriter, "creating namespace %q\n", namespace)
-// 		createNamespace(kindCluster.KubeClient(), namespace)
-// 		clusterName = "test-" + util.RandomString(6)
-// 	})
-
-// 	Describe("workload cluster lifecycle", func() {
-// 		It("It should be creatable and deletable", func() {
-// 			By("Creating a Cluster resource")
-// 			fmt.Fprintf(GinkgoWriter, "Creating Cluster named %q\n", clusterName)
-// 			Expect(kindClient.Create(context.TODO(), makeCluster(clusterName))).To(BeNil())
-
-// 			fmt.Fprintf(GinkgoWriter, "Ensuring cluster infrastructure is ready\n")
-// 			Eventually(
-// 				func() (map[string]string, error) {
-// 					cluster := &capi.Cluster{}
-// 					if err := kindClient.Get(context.TODO(), apimachinerytypes.NamespacedName{Namespace: namespace, Name: clusterName}, cluster); err != nil {
-// 						return nil, err
-// 					}
-// 					return cluster.Annotations, nil
-// 				},
-// 				10*time.Minute, 15*time.Second,
-// 			).Should(HaveKeyWithValue(capz.AnnotationClusterInfrastructureReady, capz.ValueReady))
-
-// 			By("Creating the first control plane Machine resource")
-// 			machineName := "cp-1"
-// 			fmt.Fprintf(GinkgoWriter, "Creating Machine named %q for Cluster %q\n", machineName, clusterName)
-// 			Expect(kindClient.Create(context.TODO(), makeMachine(machineName, clusterName, "controlplane", workerClusterK8sVersion))).To(BeNil())
-
-// 			fmt.Fprintf(GinkgoWriter, "Ensuring first control plane Machine is ready\n")
-// 			Eventually(
-// 				func() (*capz.AzureMachineProviderStatus, error) {
-// 					machine := &capi.Machine{}
-// 					if err := kindClient.Get(context.TODO(), apimachinerytypes.NamespacedName{Namespace: namespace, Name: machineName}, machine); err != nil {
-// 						return nil, err
-// 					}
-// 					if machine.Status.ProviderStatus == nil {
-// 						return &capz.AzureMachineProviderStatus{
-// 							VMState: &capz.VMStateCreating,
-// 						}, nil
-// 					}
-// 					return capz.MachineStatusFromProviderStatus(machine.Status.ProviderStatus)
-// 				},
-// 				10*time.Minute, 15*time.Second,
-// 			).Should(beHealthy())
-
-// 			fmt.Fprintf(GinkgoWriter, "Ensuring first control plane Machine NodeRef is set\n")
-// 			Eventually(
-// 				func() (*corev1.ObjectReference, error) {
-// 					machine := &capi.Machine{}
-// 					if err := kindClient.Get(context.TODO(), apimachinerytypes.NamespacedName{Namespace: namespace, Name: machineName}, machine); err != nil {
-// 						return nil, err
-// 					}
-// 					return machine.Status.NodeRef, nil
-
-// 				},
-// 				10*time.Minute, 15*time.Second,
-// 			).ShouldNot(BeNil())
-
-// 			fmt.Fprintf(GinkgoWriter, "Ensuring Cluster reports the Control Plane is ready\n")
-// 			Eventually(
-// 				func() (map[string]string, error) {
-// 					cluster := &capi.Cluster{}
-// 					if err := kindClient.Get(context.TODO(), apimachinerytypes.NamespacedName{Namespace: namespace, Name: clusterName}, cluster); err != nil {
-// 						return nil, err
-// 					}
-// 					return cluster.Annotations, nil
-// 				},
-// 				10*time.Minute, 15*time.Second,
-// 			).Should(HaveKeyWithValue(capz.AnnotationControlPlaneReady, capz.ValueReady))
-
-// 			// TODO: Retrieve Cluster kubeconfig
-// 			// TODO: Deploy Addons
-// 			// TODO: Validate Node Ready
-// 			// TODO: Deploy additional Control Plane Nodes
-// 			// TODO: Deploy a MachineDeployment
-// 			// TODO: Scale MachineDeployment up
-// 			// TODO: Scale MachineDeployment down
-
-// 			By("Deleting cluster")
-// 			fmt.Fprintf(GinkgoWriter, "Deleting Cluster named %q\n", clusterName)
-// 			Expect(kindClient.Delete(context.TODO(), &capi.Cluster{
-// 				ObjectMeta: metav1.ObjectMeta{
-// 					Namespace: namespace,
-// 					Name:      clusterName,
-// 				},
-// 			}, noOptionsDelete())).To(BeNil())
-
-// 			Eventually(
-// 				func() *capi.Cluster {
-// 					cluster := &capi.Cluster{}
-// 					if err := kindClient.Get(context.TODO(), apimachinerytypes.NamespacedName{Namespace: namespace, Name: clusterName}, cluster); err != nil {
-// 						if apierrors.IsNotFound(err) {
-// 							return nil
-// 						}
-// 						return &capi.Cluster{}
-// 					}
-// 					return cluster
-// 				},
-// 				20*time.Minute, 15*time.Second,
-// 			).Should(BeNil())
-// 		})
-// 	})
-// })
-
-// func noOptionsDelete() crclient.DeleteOptionFunc {
-// 	return func(opts *crclient.DeleteOptions) {}
-// }
-
-// func beHealthy() types.GomegaMatcher {
-// 	return PointTo(
-// 		MatchFields(IgnoreExtras, Fields{
-// 			"VMState": PointTo(Equal(capz.VMStateSucceeded)),
-// 		}),
-// 	)
-// }
-
-// func makeCluster(name string) *capi.Cluster {
-// 	providerSpecValue, err := capz.EncodeClusterSpec(&capz.AzureClusterProviderSpec{
-// 		// TODO: Determine bare minimum cluster spec to define here
-// 	})
-// 	Expect(err).To(BeNil())
-
-// 	cluster := &capi.Cluster{
-// 		ObjectMeta: metav1.ObjectMeta{
-// 			Name: name,
-// 		},
-// 		Spec: capi.ClusterSpec{
-// 			ClusterNetwork: capi.ClusterNetworkingConfig{
-// 				Services: capi.NetworkRanges{
-// 					CIDRBlocks: []string{"10.96.0.0/12"},
-// 				},
-// 				Pods: capi.NetworkRanges{
-// 					CIDRBlocks: []string{"192.168.0.0/16"},
-// 				},
-// 				ServiceDomain: "cluster.local",
-// 			},
-// 			ProviderSpec: capi.ProviderSpec{
-// 				Value: providerSpecValue,
-// 			},
-// 		},
-// 	}
-
-// 	return cluster
-// }
-
-// func makeMachine(name, clusterName, role, k8sVersion string) *capi.Machine {
-// 	var instanceRole string
-// 	machineVersionInfo := capi.MachineVersionInfo{
-// 		Kubelet: k8sVersion,
-// 	}
-
-// 	switch role {
-// 	case "control-plane":
-// 		instanceRole = "control-plane.cluster-api-provider-azure.sigs.k8s.io"
-// 		machineVersionInfo.ControlPlane = k8sVersion
-// 	case "node":
-// 		instanceRole = "nodes.cluster-api-provider-azure.sigs.k8s.io"
-// 	}
-// 	Expect(instanceRole).ToNot(BeEmpty())
-
-// 	providerSpecValue, err := capz.EncodeMachineSpec(&capz.AzureMachineProviderSpec{
-// 		// TODO: Determine bare minimum machine spec to define here
-// 		VMSize: "Standard_B2ms",
-// 	})
-// 	Expect(err).To(BeNil())
-
-// 	machine := &capi.Machine{
-// 		ObjectMeta: metav1.ObjectMeta{
-// 			Name: name,
-// 			Labels: map[string]string{
-// 				capi.MachineClusterLabelName: clusterName,
-// 				"set":                        role,
-// 			},
-// 		},
-// 		Spec: capi.MachineSpec{
-// 			Versions: machineVersionInfo,
-// 			ProviderSpec: capi.ProviderSpec{
-// 				Value: providerSpecValue,
-// 			},
-// 		},
-// 	}
-
-// 	return machine
-// }
-
-// func createNamespace(client kubernetes.Interface, namespace string) {
-// 	_, err := client.CoreV1().Namespaces().Create(&corev1.Namespace{
-// 		ObjectMeta: metav1.ObjectMeta{
-// 			Name: namespace,
-// 		},
-// 	})
-// 	Expect(err).To(BeNil())
-// }
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"encoding/base64"
+	"fmt"
+	"time"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"github.com/pkg/errors"
+	"golang.org/x/crypto/ssh"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	bootstrapv1 "sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm/api/v1alpha2"
+	kubeadmv1beta1 "sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm/kubeadm/v1beta1"
+	infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha2"
+	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/framework"
+	capiv1 "sigs.k8s.io/cluster-api/api/v1alpha2"
+	"sigs.k8s.io/cluster-api/util"
+)
+
+var _ = Describe("CAPZ e2e tests", func() {
+	Describe("Cluster creation", func() {
+
+		clusterGen := &ClusterGenerator{}
+		nodeGen := &NodeGenerator{}
+
+		Context("Create one controlplane cluster", func() {
+			It("Should create a single node cluster and delete it before exiting", func() {
+				cluster, infraCluster := clusterGen.GenerateCluster(namespace)
+				node := nodeGen.GenerateNode(cluster.GetName())
+				OneNodeCluster(&OneNodeClusterInput{
+					Management:    mgmt,
+					Cluster:       cluster,
+					InfraCluster:  infraCluster,
+					Node:          node,
+					CreateTimeout: 60 * time.Minute,
+				})
+				framework.CleanUp(&framework.CleanUpInput{
+					Management: mgmt,
+					Cluster:    cluster,
+				})
+			})
+		})
+
+		// TODO: Deploy multiple Control Plane
+		// TODO: Deploy Addons
+		// TODO: Deploy MachineDeployments
+		// TODO: Scale up
+		// TODO: Scale down
+	})
+})
+
+type ClusterGenerator struct{}
+
+func (c *ClusterGenerator) GenerateCluster(namespace string) (*capiv1.Cluster, *infrav1.AzureCluster) {
+	name := "capz-" + util.RandomString(6)
+	vnetName := name + "-vnet"
+	infraCluster := &infrav1.AzureCluster{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: namespace,
+			Name:      name,
+		},
+		Spec: infrav1.AzureClusterSpec{
+			Location:      location,
+			ResourceGroup: name,
+			NetworkSpec: infrav1.NetworkSpec{
+				Vnet: infrav1.VnetSpec{Name: vnetName},
+			},
+		},
+	}
+	cluster := &capiv1.Cluster{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: namespace,
+			Name:      name,
+		},
+		Spec: capiv1.ClusterSpec{
+			ClusterNetwork: &capiv1.ClusterNetwork{
+				Pods: &capiv1.NetworkRanges{CIDRBlocks: []string{"192.168.0.0/16"}},
+			},
+			InfrastructureRef: &corev1.ObjectReference{
+				APIVersion: infrav1.GroupVersion.String(),
+				Kind:       framework.TypeToKind(infraCluster),
+				Namespace:  infraCluster.GetNamespace(),
+				Name:       infraCluster.GetName(),
+			},
+		},
+	}
+	return cluster, infraCluster
+}
+
+type NodeGenerator struct {
+	counter int
+}
+
+func (n *NodeGenerator) GenerateNode(clusterName string) framework.Node {
+	sshkey, err := sshkey()
+	Expect(err).NotTo(HaveOccurred())
+
+	firstControlPlane := n.counter == 0
+	name := fmt.Sprintf("%s-controlplane-%d", clusterName, n.counter)
+	n.counter++
+
+	infraMachine := &infrav1.AzureMachine{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: namespace,
+			Name:      name,
+		},
+		Spec: infrav1.AzureMachineSpec{
+			VMSize:       vmSize,
+			Location:     location,
+			SSHPublicKey: sshkey,
+			Image: &infrav1.Image{
+				Offer:     &imageOffer,
+				Publisher: &imagePublisher,
+				SKU:       &imageSKU,
+				Version:   &imageVersion,
+			},
+			OSDisk: infrav1.OSDisk{
+				DiskSizeGB: 30,
+				OSType:     "Linux",
+				ManagedDisk: infrav1.ManagedDisk{
+					StorageAccountType: "Premium_LRS",
+				},
+			},
+		},
+	}
+	bootstrapConfig := &bootstrapv1.KubeadmConfig{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: namespace,
+			Name:      name,
+		},
+		Spec: bootstrapv1.KubeadmConfigSpec{
+			Files: []bootstrapv1.File{
+				{
+					Owner:       "root:root",
+					Path:        "/etc/kubernetes/azure.json",
+					Permissions: "0644",
+					Content:     cloudConfig(clusterName),
+				},
+			},
+			InitConfiguration: &kubeadmv1beta1.InitConfiguration{},
+			JoinConfiguration: &kubeadmv1beta1.JoinConfiguration{},
+		},
+	}
+	registrationOptions := kubeadmv1beta1.NodeRegistrationOptions{
+		Name: "{{ ds.meta_data[\"local_hostname\"] }}",
+		KubeletExtraArgs: map[string]string{
+			"cloud-provider": "azure",
+			"cloud-config":   "/etc/kubernetes/azure.json",
+		},
+	}
+
+	if firstControlPlane {
+		cpInitConfiguration(bootstrapConfig, registrationOptions)
+	} else {
+		cpJoinConfiguration(bootstrapConfig, registrationOptions)
+	}
+
+	machine := &capiv1.Machine{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: namespace,
+			Name:      name,
+			Labels: map[string]string{
+				capiv1.MachineControlPlaneLabelName: "true",
+				capiv1.MachineClusterLabelName:      clusterName,
+			},
+		},
+		Spec: capiv1.MachineSpec{
+			Bootstrap: capiv1.Bootstrap{
+				ConfigRef: &corev1.ObjectReference{
+					APIVersion: bootstrapv1.GroupVersion.String(),
+					Kind:       framework.TypeToKind(bootstrapConfig),
+					Namespace:  bootstrapConfig.GetNamespace(),
+					Name:       bootstrapConfig.GetName(),
+				},
+			},
+			InfrastructureRef: corev1.ObjectReference{
+				APIVersion: infrav1.GroupVersion.String(),
+				Kind:       framework.TypeToKind(infraMachine),
+				Namespace:  infraMachine.GetNamespace(),
+				Name:       infraMachine.GetName(),
+			},
+			Version: &k8sVersion,
+		},
+	}
+	return framework.Node{
+		Machine:         machine,
+		InfraMachine:    infraMachine,
+		BootstrapConfig: bootstrapConfig,
+	}
+}
+
+func cloudConfig(cn string) string {
+	// TODO This is ugly
+	return fmt.Sprintf(`{
+    "cloud": "AzurePublicCloud",
+    "tenantId": "%s",
+    "subscriptionId": "%s",
+    "aadClientId": "%s",
+    "aadClientSecret": "%s",
+    "resourceGroup": "%s",
+    "securityGroupName": "%s-controlplane-nsg",
+    "location": "westus2",
+    "vmType": "standard",
+    "vnetName": "%s-vnet",
+    "vnetResourceGroup": "%s",
+    "subnetName": "%s-controlplane-subnet",
+    "routeTableName": "%s-node-routetable",
+    "userAssignedID": "%s",
+    "loadBalancerSku": "standard",
+    "maximumLoadBalancerRuleCount": 250,
+    "useManagedIdentityExtension": false,
+    "useInstanceMetadata": true
+}`, creds.TenantID, creds.SubscriptionID, creds.ClientID, creds.ClientSecret, cn, cn, cn, cn, cn, cn, cn)
+}
+
+func sshkey() (string, error) {
+	// TODO Load from AZURE_SSH_PUBLIC_KEY_FILE if set
+	prv, err := rsa.GenerateKey(rand.Reader, 2048)
+	if err != nil {
+		return "", errors.Wrap(err, "Failed to generate private key")
+	}
+	pub, err := ssh.NewPublicKey(&prv.PublicKey)
+	if err != nil {
+		return "", errors.Wrap(err, "Failed to generate public key")
+	}
+	return base64.StdEncoding.EncodeToString(ssh.MarshalAuthorizedKey(pub)), nil
+}
+
+func cpInitConfiguration(kubeadmConfig *bootstrapv1.KubeadmConfig, registrationOptions kubeadmv1beta1.NodeRegistrationOptions) {
+	kubeadmConfig.Spec.ClusterConfiguration = &kubeadmv1beta1.ClusterConfiguration{
+		APIServer: kubeadmv1beta1.APIServer{
+			ControlPlaneComponent: kubeadmv1beta1.ControlPlaneComponent{
+				ExtraArgs: map[string]string{
+					"cloud-provider": "azure",
+					"cloud-config":   "/etc/kubernetes/azure.json",
+				},
+				ExtraVolumes: []kubeadmv1beta1.HostPathMount{
+					{
+						Name:      "cloud-config",
+						HostPath:  "/etc/kubernetes/azure.json",
+						MountPath: "/etc/kubernetes/azure.json",
+						ReadOnly:  true,
+					},
+				},
+			},
+			TimeoutForControlPlane: &metav1.Duration{Duration: 20 * time.Minute},
+		},
+		ControllerManager: kubeadmv1beta1.ControlPlaneComponent{
+			ExtraArgs: map[string]string{
+				"allocate-node-cidrs": "false",
+				"cloud-provider":      "azure",
+				"cloud-config":        "/etc/kubernetes/azure.json",
+			},
+			ExtraVolumes: []kubeadmv1beta1.HostPathMount{
+				{
+					Name:      "cloud-config",
+					HostPath:  "/etc/kubernetes/azure.json",
+					MountPath: "/etc/kubernetes/azure.json",
+					ReadOnly:  true,
+				},
+			},
+		},
+	}
+	kubeadmConfig.Spec.InitConfiguration = &kubeadmv1beta1.InitConfiguration{NodeRegistration: registrationOptions}
+}
+
+func cpJoinConfiguration(kubeadmConfig *bootstrapv1.KubeadmConfig, registrationOptions kubeadmv1beta1.NodeRegistrationOptions) {
+	kubeadmConfig.Spec.JoinConfiguration = &kubeadmv1beta1.JoinConfiguration{NodeRegistration: registrationOptions, ControlPlane: nil}
+}
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
deleted file mode 100644
index 15a9825c778..00000000000
--- a/test/e2e/e2e_suite_test.go
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-Copyright 2019 The Kubernetes Authors.
-
-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.
-*/
-
-package e2e_test
-
-// import (
-// 	"bytes"
-// 	"context"
-// 	"flag"
-// 	"fmt"
-// 	"io/ioutil"
-// 	"testing"
-// 	"time"
-
-// 	. "github.com/onsi/ginkgo"
-// 	. "github.com/onsi/gomega"
-
-// 	appsv1 "k8s.io/api/apps/v1"
-// 	apimachinerytypes "k8s.io/apimachinery/pkg/types"
-// 	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/util/kind"
-// 	"sigs.k8s.io/cluster-api/pkg/util"
-// 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
-// )
-
-// func TestE2e(t *testing.T) {
-// 	if err := initLocation(); err != nil {
-// 		t.Fatal(err)
-// 	}
-// 	RegisterFailHandler(Fail)
-// 	RunSpecs(t, "e2e Suite")
-// }
-
-// const (
-// 	setupTimeout          = 10 * 60
-// 	capzProviderNamespace = "azure-provider-system"
-// 	capzStatefulSetName   = "azure-provider-controller-manager"
-// )
-
-// var (
-// 	// TODO: Do we want to do file-based auth? Not suggested. If we determine no, remove this deadcode
-// 	//credFile               = flag.String("credFile", "", "path to an Azure credentials file")
-// 	locationFile           = flag.String("locationFile", "", "The path to a text file containing the Azure location")
-// 	providerComponentsYAML = flag.String("providerComponentsYAML", "", "path to the provider components YAML for the cluster API")
-// 	managerImageTar        = flag.String("managerImageTar", "", "a script to load the manager Docker image into Docker")
-
-// 	kindCluster kind.Cluster
-// 	kindClient  crclient.Client
-// 	location    string
-// )
-
-// var _ = BeforeSuite(func() {
-// 	fmt.Fprintf(GinkgoWriter, "Setting up kind cluster\n")
-// 	kindCluster = kind.Cluster{
-// 		Name: "capz-test-" + util.RandomString(6),
-// 	}
-// 	kindCluster.Setup()
-// 	loadManagerImage(kindCluster)
-
-// 	fmt.Fprintf(GinkgoWriter, "Applying Provider Components to the kind cluster\n")
-// 	applyProviderComponents(kindCluster)
-// 	cfg := kindCluster.RestConfig()
-// 	var err error
-// 	kindClient, err = crclient.New(cfg, crclient.Options{})
-// 	Expect(err).To(BeNil())
-
-// 	fmt.Fprintf(GinkgoWriter, "Creating Azure prerequisites\n")
-// 	// TODO: Probably need to init auth session to Azure here
-
-// 	fmt.Fprintf(GinkgoWriter, "Ensuring ProviderComponents are deployed\n")
-// 	Eventually(
-// 		func() (int32, error) {
-// 			statefulSet := &appsv1.StatefulSet{}
-// 			if err := kindClient.Get(context.TODO(), apimachinerytypes.NamespacedName{Namespace: capzProviderNamespace, Name: capzStatefulSetName}, statefulSet); err != nil {
-// 				return 0, err
-// 			}
-// 			return statefulSet.Status.ReadyReplicas, nil
-// 		}, 5*time.Minute, 15*time.Second,
-// 	).ShouldNot(BeZero())
-
-// 	fmt.Fprintf(GinkgoWriter, "Running in Azure location: %s\n", location)
-// }, setupTimeout)
-
-// var _ = AfterSuite(func() {
-// 	fmt.Fprintf(GinkgoWriter, "Tearing down kind cluster\n")
-// 	kindCluster.Teardown()
-// })
-
-// // TODO: Determine if we need this
-// func initLocation() error {
-// 	if locationFile != nil && *locationFile != "" {
-// 		data, err := ioutil.ReadFile(*locationFile)
-// 		if err != nil {
-// 			return fmt.Errorf("error reading Azure location file: %v", err)
-// 		}
-// 		location = string(bytes.TrimSpace(data))
-// 		return nil
-// 	}
-
-// 	location = "eastus"
-// 	return nil
-// }
-
-// // TODO: Add function to handle auth to Azure
-
-// func loadManagerImage(kindCluster kind.Cluster) {
-// 	if managerImageTar != nil && *managerImageTar != "" {
-// 		kindCluster.LoadImageArchive(*managerImageTar)
-// 	}
-// }
-
-// func applyProviderComponents(kindCluster kind.Cluster) {
-// 	Expect(providerComponentsYAML).ToNot(BeNil())
-// 	Expect(*providerComponentsYAML).ToNot(BeEmpty())
-// 	kindCluster.ApplyYAML(*providerComponentsYAML)
-// }
diff --git a/test/e2e/framework/clean_up.go b/test/e2e/framework/clean_up.go
new file mode 100644
index 00000000000..7ab07b3264d
--- /dev/null
+++ b/test/e2e/framework/clean_up.go
@@ -0,0 +1,61 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+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.
+*/
+
+package framework
+
+import (
+	"context"
+	"time"
+
+	"github.com/onsi/ginkgo"
+	"github.com/onsi/gomega"
+
+	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/framework/management/kind"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha2"
+)
+
+// CleanUpInput are all the dependencies needed to clean up a Cluster API cluster.
+type CleanUpInput struct {
+	Management    *kind.Cluster
+	Cluster       *clusterv1.Cluster
+	DeleteTimeout time.Duration
+}
+
+func (c *CleanUpInput) setDefaults() {
+	if c.DeleteTimeout == 0*time.Second {
+		c.DeleteTimeout = 10 * time.Minute
+	}
+}
+
+// CleanUp deletes the cluster and waits for everything to be gone.
+func CleanUp(input *CleanUpInput) {
+	input.setDefaults()
+
+	mgmtClient, err := input.Management.GetClient()
+	gomega.Expect(err).NotTo(gomega.HaveOccurred(), "stack: %+v", err)
+
+	ginkgo.By("Deleting cluster")
+	ctx := context.Background()
+	gomega.Expect(mgmtClient.Delete(ctx, input.Cluster)).NotTo(gomega.HaveOccurred())
+
+	gomega.Eventually(func() []clusterv1.Cluster {
+		clusters := clusterv1.ClusterList{}
+		c, err := input.Management.GetClient()
+		gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		gomega.Expect(c.List(ctx, &clusters)).NotTo(gomega.HaveOccurred())
+		return clusters.Items
+	}, input.DeleteTimeout, 20*time.Second).Should(gomega.HaveLen(0))
+}
diff --git a/test/e2e/framework/convenience.go b/test/e2e/framework/convenience.go
new file mode 100644
index 00000000000..673fef5cfbb
--- /dev/null
+++ b/test/e2e/framework/convenience.go
@@ -0,0 +1,44 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+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.
+*/
+
+package framework
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/onsi/ginkgo"
+	"github.com/onsi/gomega"
+)
+
+// InstallComponents is a helper function that applies components, generally to a management cluster.
+func InstallComponents(ctx context.Context, mgmt Applier, components ...ComponentGenerator) {
+	ginkgo.Describe("Installing the provider components", func() {
+		for _, component := range components {
+			ginkgo.By(fmt.Sprintf("Installing %s", component.GetName()))
+			c, err := component.Manifests(ctx)
+			gomega.Expect(err).NotTo(gomega.HaveOccurred())
+			gomega.Expect(mgmt.Apply(ctx, c)).NotTo(gomega.HaveOccurred())
+		}
+	})
+}
+
+// WaitForAPIServiceAvailable will wait for an an APIService to be available.
+// For example, kubectl wait --for=condition=Available --timeout=300s apiservice v1beta1.webhook.cert-manager.io
+func WaitForAPIServiceAvailable(ctx context.Context, mgmt Waiter, serviceName string) {
+	err := mgmt.Wait(ctx, "--for", "condition=Available", "--timeout", "300s", "apiservice", serviceName)
+	gomega.Expect(err).NotTo(gomega.HaveOccurred(), "stack: %+v", err)
+}
diff --git a/test/e2e/framework/doc.go b/test/e2e/framework/doc.go
new file mode 100644
index 00000000000..78f408e1840
--- /dev/null
+++ b/test/e2e/framework/doc.go
@@ -0,0 +1,22 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+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.
+*/
+
+// Package framework is mostly copied from the CAPI repository
+// https://github.com/kubernetes-sigs/cluster-api/tree/master/test/framework
+// Right now, it is hard to use CAPI's test/framework module for two reasons:
+// - It has references to v1alpha3 types
+// - The module has a redirect to a local file system directory
+package framework
diff --git a/test/e2e/framework/exec/command.go b/test/e2e/framework/exec/command.go
new file mode 100644
index 00000000000..5f7aeaddde9
--- /dev/null
+++ b/test/e2e/framework/exec/command.go
@@ -0,0 +1,101 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+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.
+*/
+
+package exec
+
+import (
+	"context"
+	"io"
+	"io/ioutil"
+	"os/exec"
+
+	"github.com/pkg/errors"
+)
+
+// Command wraps exec.Command with specific functionality.
+// This differentiates itself from the standard library by always collecting stdout and stderr.
+// Command improves the UX of exec.Command for our specific use case.
+type Command struct {
+	Cmd   string
+	Args  []string
+	Stdin io.Reader
+}
+
+// Option is a functional option type that modifies a Command.
+type Option func(*Command)
+
+// NewCommand returns a configured Command.
+func NewCommand(opts ...Option) *Command {
+	cmd := &Command{
+		Stdin: nil,
+	}
+	for _, option := range opts {
+		option(cmd)
+	}
+	return cmd
+}
+
+// WithStdin sets up the command to read from this io.Reader.
+func WithStdin(stdin io.Reader) Option {
+	return func(cmd *Command) {
+		cmd.Stdin = stdin
+	}
+}
+
+// WithCommand defines the command to run such as `kubectl` or `kind`.
+func WithCommand(command string) Option {
+	return func(cmd *Command) {
+		cmd.Cmd = command
+	}
+}
+
+// WithArgs sets the arguments for the command such as `get pods -n kube-system` to the command `kubectl`.
+func WithArgs(args ...string) Option {
+	return func(cmd *Command) {
+		cmd.Args = args
+	}
+}
+
+// Run executes the command and returns stdout, stderr and the error if there is any.
+func (c *Command) Run(ctx context.Context) ([]byte, []byte, error) {
+	cmd := exec.CommandContext(ctx, c.Cmd, c.Args...)
+	if c.Stdin != nil {
+		cmd.Stdin = c.Stdin
+	}
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, nil, errors.WithStack(err)
+	}
+	stderr, err := cmd.StderrPipe()
+	if err != nil {
+		return nil, nil, errors.WithStack(err)
+	}
+	if err := cmd.Start(); err != nil {
+		return nil, nil, errors.WithStack(err)
+	}
+	output, err := ioutil.ReadAll(stdout)
+	if err != nil {
+		return nil, nil, errors.WithStack(err)
+	}
+	errout, err := ioutil.ReadAll(stderr)
+	if err != nil {
+		return nil, nil, errors.WithStack(err)
+	}
+	if err := cmd.Wait(); err != nil {
+		return output, errout, errors.WithStack(err)
+	}
+	return output, errout, nil
+}
diff --git a/test/e2e/framework/interfaces.go b/test/e2e/framework/interfaces.go
new file mode 100644
index 00000000000..c5136baa088
--- /dev/null
+++ b/test/e2e/framework/interfaces.go
@@ -0,0 +1,59 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+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.
+*/
+
+package framework
+
+import (
+	"context"
+
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+// ComponentGenerator is used to install components, generally any YAML bundle.
+type ComponentGenerator interface {
+	// GetName returns the name of the component.
+	GetName() string
+	// Manifests return the YAML bundle.
+	Manifests(context.Context) ([]byte, error)
+}
+
+// Applier is an interface around applying YAML to a cluster
+type Applier interface {
+	// Apply allows us to apply YAML to the cluster, `kubectl apply`
+	Apply(context.Context, []byte) error
+}
+
+// Waiter is an interface around waiting for something on a kubernetes cluster.
+type Waiter interface {
+	// Wait allows us to wait for something in the cluster, `kubectl wait`
+	Wait(context.Context, ...string) error
+}
+
+// ManagementCluster are all the features we need out of a kubernetes cluster to qualify as a management cluster.
+type ManagementCluster interface {
+	Applier
+	Waiter
+	// Teardown will completely clean up the ManagementCluster.
+	// This should be implemented as a synchronous function.
+	// Generally to be used in the AfterSuite function if a management cluster is shared between tests.
+	Teardown(context.Context) error
+	// GetName returns the name of the cluster.
+	GetName() string
+	// GetClient returns a client to the Management cluster.
+	GetClient() (client.Client, error)
+	// GetWorkdloadClient returns a client to the specified workload cluster.
+	GetWorkloadClient(ctx context.Context, namespace, name string) (client.Client, error)
+}
diff --git a/test/e2e/framework/management/kind/mgmt.go b/test/e2e/framework/management/kind/mgmt.go
new file mode 100644
index 00000000000..1bd252fde86
--- /dev/null
+++ b/test/e2e/framework/management/kind/mgmt.go
@@ -0,0 +1,246 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+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.
+*/
+
+package kind
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"io/ioutil"
+	"os"
+
+	"github.com/pkg/errors"
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/clientcmd"
+	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/framework/exec"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+// Shells out to `kind`, `kubectl`
+
+// Cluster represents a Kubernetes cluster used as a management cluster backed by kind.
+type Cluster struct {
+	Name                       string
+	KubeconfigPath             string
+	Client                     client.Client
+	Scheme                     *runtime.Scheme
+	WorkloadClusterKubeconfigs map[string]string
+	// TODO: Expose the RESTConfig and a way to create a RESTConfig for the workload clusters for static-client uses
+	//       (pod logs, exec and any other subresources)
+}
+
+// NewCluster sets up a new cluster to be used as the management cluster.
+func NewCluster(ctx context.Context, name string, scheme *runtime.Scheme, images ...string) (*Cluster, error) {
+	cmd := exec.NewCommand(
+		exec.WithCommand("kind"),
+		exec.WithArgs("create", "cluster", "--name", name),
+	)
+	return create(ctx, cmd, name, scheme, images...)
+}
+
+// NewClusterWithConfig creates a kind cluster using a kind-config file.
+func NewClusterWithConfig(ctx context.Context, name, configFile string, scheme *runtime.Scheme, images ...string) (*Cluster, error) {
+	cmd := exec.NewCommand(
+		exec.WithCommand("kind"),
+		exec.WithArgs("create", "cluster", "--name", name, "--config", configFile),
+	)
+	return create(ctx, cmd, name, scheme, images...)
+}
+
+func create(ctx context.Context, cmd *exec.Command, name string, scheme *runtime.Scheme, images ...string) (*Cluster, error) {
+	stdout, stderr, err := cmd.Run(ctx)
+	if err != nil {
+		fmt.Println(string(stdout))
+		fmt.Println(string(stderr))
+		return nil, err
+	}
+	kubeconfig, err := getKubeconfigPath(ctx, name)
+	if err != nil {
+		return nil, err
+	}
+
+	c := &Cluster{
+		Name:                       name,
+		KubeconfigPath:             kubeconfig,
+		Scheme:                     scheme,
+		WorkloadClusterKubeconfigs: make(map[string]string),
+	}
+	for _, image := range images {
+		fmt.Printf("Loading image %q on to the management cluster\n", image)
+		if err := c.LoadImage(ctx, image); err != nil {
+			return nil, err
+		}
+	}
+	return c, nil
+}
+
+// GetName returns the name of the cluster
+func (c *Cluster) GetName() string {
+	return c.Name
+}
+
+// LoadImage will put a local image onto the kind node
+func (c *Cluster) LoadImage(ctx context.Context, image string) error {
+	loadCmd := exec.NewCommand(
+		exec.WithCommand("kind"),
+		exec.WithArgs("load", "docker-image", image, "--name", c.Name),
+	)
+	stdout, stderr, err := loadCmd.Run(ctx)
+	if err != nil {
+		fmt.Println(string(stdout))
+		fmt.Println(string(stderr))
+		return err
+	}
+	return nil
+}
+
+// TODO: Considier a Kubectl function and then wrap it at the next level up.
+
+// Apply wraps `kubectl apply` and prints the output so we can see what gets applied to the cluster.
+func (c *Cluster) Apply(ctx context.Context, resources []byte) error {
+	rbytes := bytes.NewReader(resources)
+	applyCmd := exec.NewCommand(
+		exec.WithCommand("kubectl"),
+		exec.WithArgs("apply", "--kubeconfig", c.KubeconfigPath, "-f", "-"),
+		exec.WithStdin(rbytes),
+	)
+	stdout, stderr, err := applyCmd.Run(ctx)
+	if err != nil {
+		fmt.Println(string(stderr))
+		return err
+	}
+	fmt.Println(string(stdout))
+	return nil
+}
+
+// Wait wraps `kubectl wait`.
+func (c *Cluster) Wait(ctx context.Context, args ...string) error {
+	wargs := append([]string{"wait", "--kubeconfig", c.KubeconfigPath}, args...)
+	wait := exec.NewCommand(
+		exec.WithCommand("kubectl"),
+		exec.WithArgs(wargs...),
+	)
+	_, stderr, err := wait.Run(ctx)
+	if err != nil {
+		fmt.Println(string(stderr))
+		return err
+	}
+	return nil
+}
+
+// Teardown deletes all the tmp files and cleans up the kind cluster.
+func (c *Cluster) Teardown(ctx context.Context) error {
+	deleteCmd := exec.NewCommand(
+		exec.WithCommand("kind"),
+		exec.WithArgs("delete", "cluster", "--name", c.Name),
+	)
+	stdout, stderr, err := deleteCmd.Run(ctx)
+	if err != nil {
+		fmt.Println(string(stdout))
+		fmt.Println(string(stderr))
+		return err
+	}
+	for _, f := range c.WorkloadClusterKubeconfigs {
+		if err := os.RemoveAll(f); err != nil {
+			fmt.Println(err)
+		}
+	}
+	return nil
+}
+
+func getKubeconfigPath(ctx context.Context, name string) (string, error) {
+	getPathCmd := exec.NewCommand(
+		exec.WithCommand("kind"),
+		exec.WithArgs("get", "kubeconfig-path", "--name", name),
+	)
+	stdout, stderr, err := getPathCmd.Run(ctx)
+	if err != nil {
+		fmt.Println(string(stderr))
+		return "", err
+	}
+	return string(bytes.TrimSpace(stdout)), nil
+}
+
+// ClientFromRestConfig returns a controller-runtime client from a RESTConfig.
+func (c *Cluster) ClientFromRestConfig(restConfig *rest.Config) (client.Client, error) {
+	cl, err := client.New(restConfig, client.Options{Scheme: c.Scheme})
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+	c.Client = cl
+	return c.Client, nil
+}
+
+// GetClient returns a controller-rutnime client for the management cluster.
+func (c *Cluster) GetClient() (client.Client, error) {
+	restConfig, err := clientcmd.BuildConfigFromFlags("", c.KubeconfigPath)
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+	return c.ClientFromRestConfig(restConfig)
+}
+
+// GetWorkloadClient returns a controller-runtime client for the workload cluster.
+// TODO Use remote package once it returns a controller runtime client
+func (c *Cluster) GetWorkloadClient(ctx context.Context, namespace, name string) (client.Client, error) {
+	mgmtClient, err := c.GetClient()
+	if err != nil {
+		return nil, err
+	}
+	config := &v1.Secret{}
+	key := client.ObjectKey{
+		Name:      fmt.Sprintf("%s-kubeconfig", name),
+		Namespace: namespace,
+	}
+	if err := mgmtClient.Get(ctx, key, config); err != nil {
+		return nil, err
+	}
+
+	f, err := ioutil.TempFile("", "worker-kubeconfig")
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+	data := config.Data["value"]
+	if _, err := f.Write(data); err != nil {
+		return nil, errors.WithStack(err)
+	}
+	// TODO: remove the tmpfile and pass the secret in to clientcmd
+	c.WorkloadClusterKubeconfigs[namespace+"-"+name] = f.Name()
+
+	restConfig, err := clientcmd.BuildConfigFromFlags("", f.Name())
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
+	return c.ClientFromRestConfig(restConfig)
+}
+
+// Clientset returns a Clientset
+func (c *Cluster) Clientset() (*kubernetes.Clientset, error) {
+	cfg, err := clientcmd.BuildConfigFromFlags("", c.KubeconfigPath)
+	if err != nil {
+		return nil, err
+	}
+	cs, err := kubernetes.NewForConfig(cfg)
+	if err != nil {
+		return nil, err
+	}
+	return cs, nil
+}
diff --git a/test/e2e/framework/types.go b/test/e2e/framework/types.go
new file mode 100644
index 00000000000..edd406cac1a
--- /dev/null
+++ b/test/e2e/framework/types.go
@@ -0,0 +1,37 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+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.
+*/
+
+package framework
+
+import (
+	"reflect"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha2"
+)
+
+// Node contains all the pieces necessary to make a single node
+type Node struct {
+	Machine         *clusterv1.Machine
+	InfraMachine    runtime.Object
+	BootstrapConfig runtime.Object
+}
+
+// TypeToKind returns the Kind without the package prefix. Pass in a pointer to a struct
+// This will panic if used incorrectly.
+func TypeToKind(i interface{}) string {
+	return reflect.ValueOf(i).Elem().Type().Name()
+}
diff --git a/test/e2e/generators/cabpk.go b/test/e2e/generators/cabpk.go
new file mode 100644
index 00000000000..e86e4699548
--- /dev/null
+++ b/test/e2e/generators/cabpk.go
@@ -0,0 +1,53 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+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.
+*/
+
+package generators
+
+import (
+	"context"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+
+	"github.com/pkg/errors"
+)
+
+type Bootstrap struct {
+	Version string
+}
+
+// GetName returns the name of the components being generated.
+func (g *Bootstrap) GetName() string {
+	return fmt.Sprintf("Cluster API Bootstrap Provider Kubeadm %s", g.Version)
+}
+
+func (g *Bootstrap) releaseYAMLPath() string {
+	return fmt.Sprintf("https://github.com/kubernetes-sigs/cluster-api-bootstrap-provider-kubeadm/releases/download/%s/bootstrap-components.yaml", g.Version)
+}
+
+// Manifests return the generated components and any error if there is one.
+func (g *Bootstrap) Manifests(ctx context.Context) ([]byte, error) {
+	resp, err := http.Get(g.releaseYAMLPath())
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+	out, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+	defer resp.Body.Close()
+	return out, nil
+}
diff --git a/test/e2e/generators/capi.go b/test/e2e/generators/capi.go
new file mode 100644
index 00000000000..3187e55a05c
--- /dev/null
+++ b/test/e2e/generators/capi.go
@@ -0,0 +1,75 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+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.
+*/
+
+package generators
+
+import (
+	"context"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+
+	"github.com/pkg/errors"
+	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/framework/exec"
+)
+
+// Generator generates provider components for CAPI
+type ClusterAPI struct {
+	// GitRef defines the git ref. If set, the generator will use kustomize
+	GitRef string
+	// Version defines the release version. If GitRef is not set Version must be set and will not use kustomize
+	Version string
+}
+
+// GetName returns the name of the components being generated.
+func (g *ClusterAPI) GetName() string {
+	return fmt.Sprintf("Cluster API %s", g.Version)
+}
+
+func (g *ClusterAPI) kustomizePath(path string) string {
+	return fmt.Sprintf("https://github.com/kubernetes-sigs/cluster-api//config/%s?ref=%s", path, g.GitRef)
+}
+
+func (g *ClusterAPI) releaseYAMLPath() string {
+	return fmt.Sprintf("https://github.com/kubernetes-sigs/cluster-api/releases/download/%s/cluster-api-components.yaml", g.Version)
+}
+
+// Manifests return the generated components and any error if there is one.
+func (g *ClusterAPI) Manifests(ctx context.Context) ([]byte, error) {
+	// TODO: this is not very nice
+	if g.GitRef != "" {
+		kustomize := exec.NewCommand(
+			exec.WithCommand("kustomize"),
+			exec.WithArgs("build", g.kustomizePath("default")),
+		)
+		stdout, stderr, err := kustomize.Run(ctx)
+		if err != nil {
+			fmt.Println(string(stderr))
+			return nil, errors.WithStack(err)
+		}
+		return stdout, nil
+	}
+	resp, err := http.Get(g.releaseYAMLPath())
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+	out, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+	defer resp.Body.Close()
+	return out, nil
+}
diff --git a/test/e2e/generators/capz.go b/test/e2e/generators/capz.go
new file mode 100644
index 00000000000..7be4b921dc0
--- /dev/null
+++ b/test/e2e/generators/capz.go
@@ -0,0 +1,64 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+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.
+*/
+
+package generators
+
+import (
+	"context"
+	"encoding/base64"
+	"fmt"
+	"os"
+
+	"github.com/pkg/errors"
+	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/auth"
+	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/framework/exec"
+)
+
+type Infra struct {
+	Creds auth.Creds
+}
+
+// GetName returns the name of the components being generated.
+func (g *Infra) GetName() string {
+	return "Cluster API Provider Azure: file system"
+}
+
+func (g *Infra) kustomizePath(path string) string {
+	return "../../config/" + path
+}
+
+// Manifests return the generated components and any error if there is one.
+func (g *Infra) Manifests(ctx context.Context) ([]byte, error) {
+	kustomize := exec.NewCommand(
+		exec.WithCommand("kustomize"),
+		exec.WithArgs("build", g.kustomizePath("default")),
+	)
+	stdout, stderr, err := kustomize.Run(ctx)
+	if err != nil {
+		fmt.Println(string(stderr))
+		return nil, errors.WithStack(err)
+	}
+	return expandCredVariables(stdout, g.Creds), nil
+}
+
+func expandCredVariables(stdout []byte, creds auth.Creds) []byte {
+	os.Setenv("AZURE_CLIENT_ID_B64", base64.StdEncoding.EncodeToString([]byte(creds.ClientID)))
+	os.Setenv("AZURE_CLIENT_SECRET_B64", base64.StdEncoding.EncodeToString([]byte(creds.ClientSecret)))
+	os.Setenv("AZURE_SUBSCRIPTION_ID_B64", base64.StdEncoding.EncodeToString([]byte(creds.SubscriptionID)))
+	os.Setenv("AZURE_TENANT_ID_B64", base64.StdEncoding.EncodeToString([]byte(creds.TenantID)))
+	// TODO Figure out a better way of doing this
+	return []byte(os.ExpandEnv(string(stdout)))
+}
diff --git a/test/e2e/kustomization.yaml b/test/e2e/kustomization.yaml
deleted file mode 100644
index 3c160d7c31d..00000000000
--- a/test/e2e/kustomization.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2019 The Kubernetes Authors.
-#
-# 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.
-
-resources:
-  - provider-components.yaml
-
-patchesJson6902:
-  - target:
-      group: apps
-      version: v1
-      kind: StatefulSet
-      name: azure-provider-controller-manager
-    path: manager-version-patch.yaml
diff --git a/test/e2e/one_node_cluster_test.go b/test/e2e/one_node_cluster_test.go
new file mode 100644
index 00000000000..50e76452dbe
--- /dev/null
+++ b/test/e2e/one_node_cluster_test.go
@@ -0,0 +1,121 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+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.
+*/
+
+package e2e_test
+
+import (
+	"context"
+	"time"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	v1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/wait"
+	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/framework"
+	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/framework/management/kind"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha2"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+// OneNodeClusterInput are all the dependencies of the OneNodeCluster test.
+type OneNodeClusterInput struct {
+	Management    *kind.Cluster
+	Cluster       *clusterv1.Cluster
+	InfraCluster  runtime.Object
+	Node          framework.Node
+	CreateTimeout time.Duration
+}
+
+// SetDefaults defaults the struct fields if necessary.
+func (o *OneNodeClusterInput) SetDefaults() {
+	if o.CreateTimeout == 0*time.Second {
+		o.CreateTimeout = 60 * time.Minute
+	}
+}
+
+// OneNodeCluster creates a single control plane node.
+// Assertions:
+//   * The created cluster has exactly one node.
+//   * The created machines reach the 'running' state.
+func OneNodeCluster(input *OneNodeClusterInput) {
+	input.SetDefaults()
+	ctx := context.Background()
+	Expect(input.Management).ToNot(BeNil())
+
+	mgmtClient, err := input.Management.GetClient()
+	Expect(err).NotTo(HaveOccurred(), "stack: %+v", err)
+
+	By("Creating infra cluster resource")
+	Expect(mgmtClient.Create(ctx, input.InfraCluster)).NotTo(HaveOccurred())
+
+	By("Creating cluster resource that owns the infra cluster")
+	Expect(mgmtClient.Create(ctx, input.Cluster)).NotTo(HaveOccurred())
+
+	Eventually(func() string {
+		cluster := &clusterv1.Cluster{}
+		key := client.ObjectKey{
+			Namespace: input.Cluster.GetNamespace(),
+			Name:      input.Cluster.GetName(),
+		}
+		if err := mgmtClient.Get(ctx, key, cluster); err != nil {
+			return err.Error()
+		}
+		return cluster.Status.Phase
+	}, input.CreateTimeout, 10*time.Second).Should(Equal(string(clusterv1.ClusterPhaseProvisioned)))
+
+	By("Creating infra machine resource")
+	Expect(mgmtClient.Create(ctx, input.Node.InfraMachine)).NotTo(HaveOccurred())
+
+	By("Creating bootstrap config resource")
+	Expect(mgmtClient.Create(ctx, input.Node.BootstrapConfig)).NotTo(HaveOccurred())
+
+	By("Creating machine resource that owns infra machine and its bootstrap")
+	Expect(mgmtClient.Create(ctx, input.Node.Machine)).NotTo(HaveOccurred())
+
+	By("Waiting for nodes to reach the Running phase")
+	Eventually(func() string {
+		machine := &clusterv1.Machine{}
+		key := client.ObjectKey{
+			Namespace: input.Node.Machine.GetNamespace(),
+			Name:      input.Node.Machine.GetName(),
+		}
+		if err := mgmtClient.Get(ctx, key, machine); err != nil {
+			return err.Error()
+		}
+		return machine.Status.Phase
+	}, input.CreateTimeout, 20*time.Second).Should(Equal(string(clusterv1.MachinePhaseRunning)))
+
+	Eventually(func() []v1.Node {
+		nodes := v1.NodeList{}
+		err := wait.PollImmediate(10*time.Second, 5*time.Minute, func() (bool, error) {
+			_, err := input.Management.GetWorkloadClient(ctx, input.Cluster.Namespace, input.Cluster.Name)
+			switch {
+			case apierrors.IsNotFound(err):
+				return false, nil
+			default:
+				return true, nil
+			}
+		})
+		Expect(err).NotTo(HaveOccurred())
+		workloadClient, err := input.Management.GetWorkloadClient(ctx, input.Cluster.Namespace, input.Cluster.Name)
+		Expect(err).NotTo(HaveOccurred(), "Stack:\n%+v\n", err)
+		Expect(workloadClient.List(ctx, &nodes)).NotTo(HaveOccurred())
+		return nodes.Items
+	}, input.CreateTimeout, 10*time.Second).Should(HaveLen(1))
+}
diff --git a/test/e2e/util/kind/setup.go b/test/e2e/util/kind/setup.go
deleted file mode 100644
index 6b58a396264..00000000000
--- a/test/e2e/util/kind/setup.go
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-Copyright 2019 The Kubernetes Authors.
-
-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.
-*/
-
-package kind
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"strings"
-
-	"github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/config"
-	"github.com/onsi/gomega"
-
-	"k8s.io/client-go/kubernetes"
-	restclient "k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
-)
-
-func init() {
-	// Turn on verbose by default to get spec names
-	config.DefaultReporterConfig.Verbose = true
-
-	// Turn on EmitSpecProgress to get spec progress (especially on interrupt)
-	config.GinkgoConfig.EmitSpecProgress = true
-
-}
-
-var (
-	kindBinary    = flag.String("kindBinary", "kind", "path to the kind binary")
-	kubectlBinary = flag.String("kubectlBinary", "kubectl", "path to the kubectl binary")
-)
-
-// Cluster represents the running state of a KIND cluster.
-// An empty struct is enough to call Setup() on.
-type Cluster struct {
-	Name     string
-	tmpDir   string
-	kubepath string
-}
-
-// Setup creates a kind cluster and returns a path to the kubeconfig
-func (c *Cluster) Setup() {
-	var err error
-	c.tmpDir, err = ioutil.TempDir("", "kind-home")
-	gomega.Expect(err).To(gomega.BeNil())
-	fmt.Fprintf(ginkgo.GinkgoWriter, "creating Kind cluster named %q\n", c.Name)
-	c.run(exec.Command(*kindBinary, "create", "cluster", "--name", c.Name))
-	path := c.runWithOutput(exec.Command(*kindBinary, "get", "kubeconfig-path", "--name", c.Name))
-	c.kubepath = strings.TrimSpace(string(path))
-	fmt.Fprintf(ginkgo.GinkgoWriter, "kubeconfig path: %q. Can use the following to access the cluster:\n", c.kubepath)
-	fmt.Fprintf(ginkgo.GinkgoWriter, "export KUBECONFIG=%s\n", c.kubepath)
-}
-
-// Teardown attempts to delete the KIND cluster
-func (c *Cluster) Teardown() {
-	c.run(exec.Command(*kindBinary, "delete", "cluster", "--name", c.Name))
-	os.RemoveAll(c.tmpDir)
-}
-
-// LoadImageArchive loads the specified image archive into the kind cluster
-func (c *Cluster) LoadImageArchive(imageArchivePath string) {
-	fmt.Fprintf(
-		ginkgo.GinkgoWriter,
-		"loading image %q into Kind node\n",
-		imageArchivePath)
-	c.run(exec.Command(*kindBinary, "load", "image-archive", "--name", c.Name, imageArchivePath))
-}
-
-// ApplyYAML applies the provided manifest to the kind cluster
-func (c *Cluster) ApplyYAML(manifestPath string) {
-	c.run(exec.Command(
-		*kubectlBinary,
-		"create",
-		"--kubeconfig="+c.kubepath,
-		"-f", manifestPath,
-	))
-}
-
-// RestConfig returns a rest configuration pointed at the provisioned cluster
-func (c *Cluster) RestConfig() *restclient.Config {
-	cfg, err := clientcmd.BuildConfigFromFlags("", c.kubepath)
-	gomega.ExpectWithOffset(1, err).To(gomega.BeNil())
-	return cfg
-}
-
-// KubeClient returns a Kubernetes client pointing at the provisioned cluster
-func (c *Cluster) KubeClient() kubernetes.Interface {
-	cfg := c.RestConfig()
-	client, err := kubernetes.NewForConfig(cfg)
-	gomega.ExpectWithOffset(1, err).To(gomega.BeNil())
-	return client
-
-}
-
-func (c *Cluster) runWithOutput(cmd *exec.Cmd) []byte {
-	var stdout bytes.Buffer
-	cmd.Stdout = &stdout
-	c.run(cmd)
-	return stdout.Bytes()
-}
-
-func (c *Cluster) run(cmd *exec.Cmd) {
-	errPipe, err := cmd.StderrPipe()
-	gomega.ExpectWithOffset(1, err).To(gomega.BeNil())
-
-	cmd.Env = append(
-		cmd.Env,
-		// KIND positions the configuration file relative to HOME.
-		// To prevent clobbering an existing KIND installation, override this
-		// n.b. HOME isn't always set inside BAZEL
-		fmt.Sprintf("HOME=%s", c.tmpDir),
-		//needed for Docker. TODO(EKF) Should be properly hermetic
-		fmt.Sprintf("PATH=%s", os.Getenv("PATH")),
-	)
-
-	// Log output
-	go captureOutput(errPipe, "stderr")
-	if cmd.Stdout == nil {
-		outPipe, err := cmd.StdoutPipe()
-		gomega.ExpectWithOffset(1, err).To(gomega.BeNil())
-		go captureOutput(outPipe, "stdout")
-	}
-
-	gomega.ExpectWithOffset(1, cmd.Run()).To(gomega.BeNil())
-}
-
-func captureOutput(pipe io.ReadCloser, label string) {
-	buffer := &bytes.Buffer{}
-	defer pipe.Close()
-	for {
-		n, _ := buffer.ReadFrom(pipe)
-		if n == 0 {
-			return
-		}
-		fmt.Fprintf(ginkgo.GinkgoWriter, "[%s] %s\n", label, buffer.String())
-	}
-}
diff --git a/test/integration/metacluster_test.go b/test/integration/metacluster_test.go
index 223b58d1dda..f623eb89d0f 100644
--- a/test/integration/metacluster_test.go
+++ b/test/integration/metacluster_test.go
@@ -22,7 +22,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	"sigs.k8s.io/cluster-api/util"
 
-	"sigs.k8s.io/cluster-api-provider-azure/test/e2e/util/kind"
+	"sigs.k8s.io/cluster-api/test/helpers/kind"
 )
 
 const (