Merge pull request #2908 from rgolangh/master

ovirt: Update to latest cluster-api-provider
openshift · Jan 14, 2020 · 9e23231 · 9e23231
2 parents 91d6918 + fc559fb
commit 9e23231
Show file tree

Hide file tree

Showing 11 changed files with 477 additions and 13 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -138,8 +138,8 @@ required = [
   source = "https://github.com/openshift/baremetal-operator"
 
 [[constraint]]
-  name = "github.com/ovirt/cluster-api-provider-ovirt"
-  revision ="f7b0ebc7f9ae17c0d5d5b4f5795a1b70972a5570"
+  name = "github.com/openshift/cluster-api-provider-ovirt"
+  revision ="0966db28bce37ca97ada41c69f48ffa7c4d02493"
 
 [[constraint]]
   name = "github.com/ovirt/go-ovirt"

diff --git a/pkg/asset/machines/master.go b/pkg/asset/machines/master.go
@@ -13,9 +13,9 @@ import (
 	gcpprovider "github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1"
 	libvirtapi "github.com/openshift/cluster-api-provider-libvirt/pkg/apis"
 	libvirtprovider "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
+	ovirtprovider "github.com/openshift/cluster-api-provider-ovirt/pkg/apis"
 	machineapi "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
-	ovirtprovider "github.com/ovirt/cluster-api-provider-ovirt/pkg/apis"
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"

diff --git a/pkg/asset/machines/ovirt/machines.go b/pkg/asset/machines/ovirt/machines.go
@@ -12,7 +12,7 @@ import (
 	"github.com/openshift/installer/pkg/types"
 	"github.com/openshift/installer/pkg/types/ovirt"
 
-	ovirtprovider "github.com/ovirt/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1"
+	ovirtprovider "github.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1"
 )
 
 // Machines returns a list of machines for a machinepool.

diff --git a/pkg/asset/machines/worker.go b/pkg/asset/machines/worker.go
@@ -13,9 +13,9 @@ import (
 	gcpprovider "github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1"
 	libvirtapi "github.com/openshift/cluster-api-provider-libvirt/pkg/apis"
 	libvirtprovider "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
+	ovirtprovider "github.com/openshift/cluster-api-provider-ovirt/pkg/apis"
 	machineapi "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
-	ovirtprovider "github.com/ovirt/cluster-api-provider-ovirt/pkg/apis"
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"

diff --git a/vendor/github.com/openshift/cluster-api-provider-ovirt/LICENSE b/vendor/github.com/openshift/cluster-api-provider-ovirt/LICENSE
diff --git a/...uster-api-provider-ovirt/pkg/apis/apis.go → ...uster-api-provider-ovirt/pkg/apis/apis.go b/...uster-api-provider-ovirt/pkg/apis/apis.go → ...uster-api-provider-ovirt/pkg/apis/apis.go
diff --git a/vendor/github.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1/doc.go b/vendor/github.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1/doc.go
diff --git a/...ithub.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1/register.go b/...ithub.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1/register.go
diff --git a/...r/github.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1/types.go b/...r/github.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1/types.go