UPSTREAM: <carry>: openshift: Run 'make goimports' over cluster-autos…

…caler/cloudprovider/openshiftmachineapi
openshift · Oct 28, 2019 · 80710de · 80710de
1 parent 8d95ce2
commit 80710de
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/cluster-autoscaler/cloudprovider/openshiftmachineapi/machineapi_controller_test.go b/cluster-autoscaler/cloudprovider/openshiftmachineapi/machineapi_controller_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	fakeclusterapi "github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset/fake"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"

diff --git a/cluster-autoscaler/cloudprovider/openshiftmachineapi/machineapi_nodegroup_test.go b/cluster-autoscaler/cloudprovider/openshiftmachineapi/machineapi_nodegroup_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
 	"k8s.io/utils/pointer"
 )

diff --git a/cluster-autoscaler/cloudprovider/openshiftmachineapi/machineapi_provider_test.go b/cluster-autoscaler/cloudprovider/openshiftmachineapi/machineapi_provider_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
 )
 

diff --git a/cluster-autoscaler/cloudprovider/openshiftmachineapi/machineapi_utils_test.go b/cluster-autoscaler/cloudprovider/openshiftmachineapi/machineapi_utils_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (