Updating machine-api dependencies to openshift/api

Kenny Woodson · Kenny Woodson · commit 4be58a6368f7 · 2021-11-11T11:05:48.000-05:00
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	configv1 "github.com/openshift/api/config/v1"
-	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
+	machinev1 "github.com/openshift/api/machine/v1beta1"
 	"github.com/openshift/machine-api-operator/pkg/metrics"
 	"k8s.io/klog/klogr"
 	"k8s.io/klog/v2"
diff --git a/pkg/apis/openstackproviderconfig/v1alpha1/register.go b/pkg/apis/openstackproviderconfig/v1alpha1/register.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/json"
 	"sigs.k8s.io/yaml"
 
-	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
+	machinev1 "github.com/openshift/api/machine/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
diff --git a/pkg/cloud/openstack/clients/machineservice.go b/pkg/cloud/openstack/clients/machineservice.go
@@ -54,8 +54,8 @@ import (
 	azutils "github.com/gophercloud/utils/openstack/compute/v2/availabilityzones"
 	flavorutils "github.com/gophercloud/utils/openstack/compute/v2/flavors"
 	imageutils "github.com/gophercloud/utils/openstack/imageservice/v2/images"
+	machinev1 "github.com/openshift/api/machine/v1beta1"
 	configclient "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
-	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
 	"github.com/openshift/machine-api-operator/pkg/util"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
diff --git a/pkg/cloud/openstack/clients/utils.go b/pkg/cloud/openstack/clients/utils.go
@@ -10,7 +10,7 @@ import (
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack"
 	"github.com/gophercloud/utils/openstack/clientconfig"
-	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
+	machinev1 "github.com/openshift/api/machine/v1beta1"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
diff --git a/pkg/cloud/openstack/deployer.go b/pkg/cloud/openstack/deployer.go
@@ -23,7 +23,7 @@ import (
 	"os/exec"
 	"strings"
 
-	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
+	machinev1 "github.com/openshift/api/machine/v1beta1"
 
 	"k8s.io/klog/v2"
 	openstackconfigv1 "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
diff --git a/pkg/cloud/openstack/machine/actuator.go b/pkg/cloud/openstack/machine/actuator.go
@@ -33,7 +33,7 @@ import (
 	gophercloudopenstack "github.com/gophercloud/gophercloud/openstack"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/subnets"
-	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
+	machinev1 "github.com/openshift/api/machine/v1beta1"
 	apierrors "github.com/openshift/machine-api-operator/pkg/controller/machine"
 	"github.com/openshift/machine-api-operator/pkg/util"
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/cloud/openstack/machine/instancestatus.go b/pkg/cloud/openstack/machine/instancestatus.go
@@ -23,7 +23,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime/serializer/json"
 
-	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
+	machinev1 "github.com/openshift/api/machine/v1beta1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/client"
diff --git a/pkg/cloud/openstack/machine/machineScript.go b/pkg/cloud/openstack/machine/machineScript.go
@@ -20,7 +20,7 @@ import (
 	"bytes"
 	"text/template"
 
-	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
+	machinev1 "github.com/openshift/api/machine/v1beta1"
 	openstackconfigv1 "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
 )
 
diff --git a/pkg/cloud/openstack/machine/machineScript_test.go b/pkg/cloud/openstack/machine/machineScript_test.go
@@ -3,7 +3,7 @@ package machine
 import (
 	"testing"
 
-	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
+	machinev1 "github.com/openshift/api/machine/v1beta1"
 	"sigs.k8s.io/yaml"
 )
 
diff --git a/pkg/cloud/openstack/machineset/controller.go b/pkg/cloud/openstack/machineset/controller.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
-	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
+	machinev1 "github.com/openshift/api/machine/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
diff --git a/pkg/cloud/openstack/machineset/controller_suite_test.go b/pkg/cloud/openstack/machineset/controller_suite_test.go
@@ -8,7 +8,7 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
+	machinev1 "github.com/openshift/api/machine/v1beta1"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
diff --git a/pkg/cloud/openstack/machineset/controller_test.go b/pkg/cloud/openstack/machineset/controller_test.go
@@ -13,7 +13,7 @@ import (
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 	gtypes "github.com/onsi/gomega/types"
-	machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
+	machinev1 "github.com/openshift/api/machine/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`"k8s.io/apimachinery/pkg/util/json"`
`25`	`25`	`"sigs.k8s.io/yaml"`
`26`	`26`
`27`		`- machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"`
	`27`	`+ machinev1 "github.com/openshift/api/machine/v1beta1"`
`28`	`28`	`"sigs.k8s.io/controller-runtime/pkg/scheme"`
`29`	`29`	`)`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"bytes"`
`21`	`21`	`"text/template"`
`22`	`22`
`23`		`- machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"`
	`23`	`+ machinev1 "github.com/openshift/api/machine/v1beta1"`
`24`	`24`	`openstackconfigv1 "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"`
`25`	`25`	`)`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package machine`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"`
	`6`	`+ machinev1 "github.com/openshift/api/machine/v1beta1"`
`7`	`7`	`"sigs.k8s.io/yaml"`
`8`	`8`	`)`
`9`	`9`