Refactor import paths (#78)

micnncim · Sep 20, 2020 · c15f4b2 · c15f4b2
1 parent c37718a
commit c15f4b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pkg/cmd/cmd.go b/pkg/cmd/cmd.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/api/meta"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
@@ -304,7 +304,7 @@ func (o *Options) Run(ctx context.Context, f cmdutil.Factory) error {
 			return nil
 		}
 
-		accessor, err := meta.Accessor(resp)
+		accessor, err := apimeta.Accessor(resp)
 		if err != nil {
 			// we don't have UID, but we didn't fail the delete, next best thing is just skipping the UID
 			o.Infof("%v\n", err)

diff --git a/pkg/resource/persistentvolume_test.go b/pkg/resource/persistentvolume_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
+	apiresource "k8s.io/apimachinery/pkg/api/resource"
 )
 
 func TestCheckVolumeSatisfyClaim(t *testing.T) {
@@ -32,7 +32,7 @@ func TestCheckVolumeSatisfyClaim(t *testing.T) {
 				volume: &corev1.PersistentVolume{
 					Spec: corev1.PersistentVolumeSpec{
 						Capacity: corev1.ResourceList{
-							corev1.ResourceName(corev1.ResourceStorage): resource.MustParse(fakeResourceQtyHigh),
+							corev1.ResourceName(corev1.ResourceStorage): apiresource.MustParse(fakeResourceQtyHigh),
 						},
 						StorageClassName: fakeStorageClass1,
 						VolumeMode:       &fakeVolumeMode,
@@ -46,7 +46,7 @@ func TestCheckVolumeSatisfyClaim(t *testing.T) {
 					Spec: corev1.PersistentVolumeClaimSpec{
 						Resources: corev1.ResourceRequirements{
 							Requests: corev1.ResourceList{
-								corev1.ResourceName(corev1.ResourceStorage): resource.MustParse(fakeResourceQtyLow),
+								corev1.ResourceName(corev1.ResourceStorage): apiresource.MustParse(fakeResourceQtyLow),
 							},
 						},
 						StorageClassName: &fakeStorageClass1,
@@ -65,7 +65,7 @@ func TestCheckVolumeSatisfyClaim(t *testing.T) {
 				volume: &corev1.PersistentVolume{
 					Spec: corev1.PersistentVolumeSpec{
 						Capacity: corev1.ResourceList{
-							corev1.ResourceName(corev1.ResourceStorage): resource.MustParse(fakeResourceQtyHigh),
+							corev1.ResourceName(corev1.ResourceStorage): apiresource.MustParse(fakeResourceQtyHigh),
 						},
 						StorageClassName: fakeStorageClass1,
 						VolumeMode:       &fakeVolumeMode,
@@ -79,7 +79,7 @@ func TestCheckVolumeSatisfyClaim(t *testing.T) {
 					Spec: corev1.PersistentVolumeClaimSpec{
 						Resources: corev1.ResourceRequirements{
 							Requests: corev1.ResourceList{
-								corev1.ResourceName(corev1.ResourceStorage): resource.MustParse(fakeResourceQtyLow),
+								corev1.ResourceName(corev1.ResourceStorage): apiresource.MustParse(fakeResourceQtyLow),
 							},
 						},
 						StorageClassName: &fakeStorageClass2,