Merge pull request kubernetes-sigs#233 from vikaschoudhary16/revendor…

…-cluster-api Revendor cluster api
wking · Jul 9, 2019 · 715ad9e · 715ad9e
2 parents e4f5fa9 + ac16c8e
commit 715ad9e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 34 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Makefile b/Makefile
@@ -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

diff --git a/vendor/github.com/openshift/cluster-api/Gopkg.lock b/vendor/github.com/openshift/cluster-api/Gopkg.lock
diff --git a/vendor/github.com/openshift/cluster-api/Gopkg.toml b/vendor/github.com/openshift/cluster-api/Gopkg.toml
diff --git a/vendor/github.com/openshift/cluster-api/pkg/controller/add_node.go b/vendor/github.com/openshift/cluster-api/pkg/controller/add_node.go