From c7366c57adfda0794b9d8db159deb6f44b3e3e0f Mon Sep 17 00:00:00 2001 From: Roy Golan Date: Thu, 23 Jan 2020 15:14:43 +0200 Subject: [PATCH] Add ovirt's cluster api provider schemas to UniversalDecoder Signed-off-by: Roy Golan --- pkg/asset/machines/master.go | 6 ++++-- pkg/asset/machines/worker.go | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/asset/machines/master.go b/pkg/asset/machines/master.go index 346fa1aa62f..8af2094a038 100644 --- a/pkg/asset/machines/master.go +++ b/pkg/asset/machines/master.go @@ -13,7 +13,8 @@ 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" + ovirtproviderapi "github.com/openshift/cluster-api-provider-ovirt/pkg/apis" + ovirtprovider "github.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1" machineapi "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1" vsphereapi "github.com/openshift/machine-api-operator/pkg/apis/vsphereprovider" vsphereprovider "github.com/openshift/machine-api-operator/pkg/apis/vsphereprovider/v1alpha1" @@ -434,7 +435,7 @@ func (m *Master) Machines() ([]machineapi.Machine, error) { gcpapi.AddToScheme(scheme) libvirtapi.AddToScheme(scheme) openstackapi.AddToScheme(scheme) - ovirtprovider.AddToScheme(scheme) + ovirtproviderapi.AddToScheme(scheme) vsphereapi.AddToScheme(scheme) decoder := serializer.NewCodecFactory(scheme).UniversalDecoder( awsprovider.SchemeGroupVersion, @@ -444,6 +445,7 @@ func (m *Master) Machines() ([]machineapi.Machine, error) { libvirtprovider.SchemeGroupVersion, openstackprovider.SchemeGroupVersion, vsphereprovider.SchemeGroupVersion, + ovirtprovider.SchemeGroupVersion, ) machines := []machineapi.Machine{} diff --git a/pkg/asset/machines/worker.go b/pkg/asset/machines/worker.go index 9a67ec006d4..6af1cc74cce 100644 --- a/pkg/asset/machines/worker.go +++ b/pkg/asset/machines/worker.go @@ -13,7 +13,8 @@ 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" + ovirtproviderapi "github.com/openshift/cluster-api-provider-ovirt/pkg/apis" + ovirtprovider "github.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1" machineapi "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1" mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" "github.com/pkg/errors" @@ -411,7 +412,7 @@ func (w *Worker) MachineSets() ([]machineapi.MachineSet, error) { gcpapi.AddToScheme(scheme) libvirtapi.AddToScheme(scheme) openstackapi.AddToScheme(scheme) - ovirtprovider.AddToScheme(scheme) + ovirtproviderapi.AddToScheme(scheme) decoder := serializer.NewCodecFactory(scheme).UniversalDecoder( awsprovider.SchemeGroupVersion, azureprovider.SchemeGroupVersion, @@ -419,6 +420,7 @@ func (w *Worker) MachineSets() ([]machineapi.MachineSet, error) { gcpprovider.SchemeGroupVersion, libvirtprovider.SchemeGroupVersion, openstackprovider.SchemeGroupVersion, + ovirtprovider.SchemeGroupVersion, ) machineSets := []machineapi.MachineSet{}