Merge pull request openshift#233 from vikaschoudhary16/revendor-cluster-api

Revendor cluster api

Author: openshift-merge-robot

Gopkg.lock

@@ -105,7 +105,7 @@ k8s-e2e: ## Run k8s specific e2e test
 		-ssh-key $${SSH_PK:-~/.ssh/id_rsa} \
 		-machine-controller-image $${ACTUATOR_IMAGE:-gcr.io/k8s-cluster-api/aws-machine-controller:0.0.1} \
 		-machine-manager-image $${ACTUATOR_IMAGE:-gcr.io/k8s-cluster-api/aws-machine-controller:0.0.1} \
-		-nodelink-controller-image $$(docker run registry.svc.ci.openshift.org/openshift/origin-release:v4.0 image machine-api-operator) \
+		-nodelink-controller-image $$(docker run registry.svc.ci.openshift.org/origin/release:4.2 image machine-api-operator) \
 		-cluster-id $${ENVIRONMENT_ID:-""} \
 		-ginkgo.v \
 		-args -v 5 -logtostderr true