From 80710de8571d40c5f3440f9df588f264123cf4df Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Mon, 26 Aug 2019 22:39:05 +0200 Subject: [PATCH] UPSTREAM: : openshift: Run 'make goimports' over cluster-autoscaler/cloudprovider/openshiftmachineapi --- .../openshiftmachineapi/machineapi_controller_test.go | 2 +- .../openshiftmachineapi/machineapi_nodegroup_test.go | 2 +- .../openshiftmachineapi/machineapi_provider_test.go | 2 +- .../cloudprovider/openshiftmachineapi/machineapi_utils_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster-autoscaler/cloudprovider/openshiftmachineapi/machineapi_controller_test.go b/cluster-autoscaler/cloudprovider/openshiftmachineapi/machineapi_controller_test.go index c0847ed02487..22c6b98a580e 100644 --- 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 index 53b300018885..bb285e9985ab 100644 --- 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 index d78aabc76ab6..3c040579c464 100644 --- 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 index 5d1096d85660..931576ef10d5 100644 --- 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 (