Update example-provider Dockerfile

Signed-off-by: Vince Prignano <[email protected]>

Author: vincepri

pkg/provider/example/container/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.12.5 as builder
+FROM golang:1.12.6 as builder
 
 ARG ARCH
 
@@ -22,9 +22,14 @@ WORKDIR $GOPATH/src/sigs.k8s.io/cluster-api
 COPY pkg/    pkg/
 COPY vendor/ vendor/
 COPY cmd/    cmd/
+COPY api/ api/
+COPY controllers/ controllers/
+COPY vendor/ vendor/
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -a -ldflags '-extldflags "-static"' -o ./cmd/example-provider/manager sigs.k8s.io/cluster-api/cmd/example-provider
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} \
+    go build -a -ldflags '-extldflags "-static"' \
+    -o ./cmd/example-provider/manager sigs.k8s.io/cluster-api/cmd/example-provider
 
 # Copy the controller-manager into a thin image
 FROM gcr.io/distroless/static:latest

test/integration/cluster/cluster_test.go

@@ -28,13 +28,12 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/clientcmd"
-	"sigs.k8s.io/cluster-api/api/v1alpha2"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 func init() {
-	v1alpha2.AddToScheme(scheme.Scheme)
+	clusterv1.AddToScheme(scheme.Scheme)
 }
 
 var clusterSpec = &clusterv1.ClusterSpec{
@@ -79,7 +78,7 @@ var _ = Describe("Cluster-Controller", func() {
 		testNamespace = ns.ObjectMeta.Name
 
 		// Create a new client
-		apiclient, err = client.New(config, client.Options{})
+		apiclient, err = client.New(config, client.Options{Scheme: scheme.Scheme})
 		Expect(err).ShouldNot(HaveOccurred())
 	})