openshift · openshift-merge-robot · Feb 4, 2019 · Feb 1, 2019 · Feb 1, 2019 · Feb 1, 2019
diff --git a/0001-Delete-annotated-machines-first-when-scaling-down.patch b/0001-Delete-annotated-machines-first-when-scaling-down.patch
diff --git a/0001-Upstream-677-Init-klog-in-manager-properly.patch b/0001-Upstream-677-Init-klog-in-manager-properly.patch
diff --git a/0001-Validate-machineset-before-reconciliation.patch b/0001-Validate-machineset-before-reconciliation.patch
diff --git a/0001-use-Update-instead-of-Status.Update-as-CustomResourc.patch b/0001-use-Update-instead-of-Status.Update-as-CustomResourc.patch
diff --git a/0002-Sort-machines-before-syncing.patch b/0002-Sort-machines-before-syncing.patch
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-api-provider-libvirt
 COPY . .
 RUN go build -o machine-controller-manager ./cmd/manager
-RUN go build -o manager ./vendor/sigs.k8s.io/cluster-api/cmd/manager
+RUN go build -o manager ./vendor/github.com/openshift/cluster-api/cmd/manager
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 RUN INSTALL_PKGS=" \

diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
@@ -2,7 +2,7 @@ FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-api-provider-libvirt
 COPY . .
 RUN go build -o machine-controller-manager ./cmd/manager
-RUN go build -o manager ./vendor/sigs.k8s.io/cluster-api/cmd/manager
+RUN go build -o manager ./vendor/github.com/openshift/cluster-api/cmd/manager
 
 FROM registry.svc.ci.openshift.org/ocp/4.0:base
 RUN INSTALL_PKGS=" \

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -19,13 +19,13 @@ required = [
   go-tests = true
 
 [[constraint]]
-  name = "sigs.k8s.io/cluster-api"
-  #revision = "0734939e05aeb64ab198e3feeee8b4e90ee5cbb2"
-  branch = "master"
+  name = "github.com/openshift/cluster-api"
+  # This is temporoary while we finish the pivot to OpenShift types.
+  revision = "91fca585a85b163ddfd119fd09c128c9feadddca"
 
 [[constraint]]
   name = "github.com/openshift/cluster-api-actuator-pkg"
-  revision = "6983d93876009e8c004dfe7868c1dece4a9d1137"
+  revision = "71b571e0ba46fae812da42733f926c1df654f666"
 
 [[constraint]]
   name = "github.com/davecgh/go-spew"