diff --git a/pkg/util/kube/pvc_pv_test.go b/pkg/util/kube/pvc_pv_test.go index 55c31774d9..175be1281d 100644 --- a/pkg/util/kube/pvc_pv_test.go +++ b/pkg/util/kube/pvc_pv_test.go @@ -1133,27 +1133,27 @@ func TestGetPVForPVC(t *testing.T) { Name: "test-csi-pvc", Namespace: "default", }, - Spec: v1.PersistentVolumeClaimSpec{ + Spec: corev1api.PersistentVolumeClaimSpec{ AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}, - Resources: v1.VolumeResourceRequirements{ - Requests: v1.ResourceList{}, + Resources: corev1api.VolumeResourceRequirements{ + Requests: corev1api.ResourceList{}, }, StorageClassName: &csiStorageClass, VolumeName: "test-csi-7d28e566-ade7-4ed6-9e15-2e44d2fbcc08", }, - Status: v1.PersistentVolumeClaimStatus{ - Phase: v1.ClaimBound, + Status: corev1api.PersistentVolumeClaimStatus{ + Phase: corev1api.ClaimBound, AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}, - Capacity: v1.ResourceList{}, + Capacity: corev1api.ResourceList{}, }, } matchingPV := &v1.PersistentVolume{ ObjectMeta: metav1.ObjectMeta{ Name: "test-csi-7d28e566-ade7-4ed6-9e15-2e44d2fbcc08", }, - Spec: v1.PersistentVolumeSpec{ + Spec: corev1api.PersistentVolumeSpec{ AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}, - Capacity: v1.ResourceList{}, + Capacity: corev1api.ResourceList{}, ClaimRef: &v1.ObjectReference{ Kind: "PersistentVolumeClaim", Name: "test-csi-pvc", @@ -1161,7 +1161,7 @@ func TestGetPVForPVC(t *testing.T) { ResourceVersion: "1027", UID: "7d28e566-ade7-4ed6-9e15-2e44d2fbcc08", }, - PersistentVolumeSource: v1.PersistentVolumeSource{ + PersistentVolumeSource: corev1api.PersistentVolumeSource{ CSI: &v1.CSIPersistentVolumeSource{ Driver: "hostpath.csi.k8s.io", FSType: "ext4", @@ -1171,11 +1171,11 @@ func TestGetPVForPVC(t *testing.T) { VolumeHandle: "e61f2b48-527a-11ea-b54f-cab6317018f1", }, }, - PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete, + PersistentVolumeReclaimPolicy: corev1api.PersistentVolumeReclaimDelete, StorageClassName: csiStorageClass, }, - Status: v1.PersistentVolumeStatus{ - Phase: v1.VolumeBound, + Status: corev1api.PersistentVolumeStatus{ + Phase: corev1api.VolumeBound, }, } @@ -1184,14 +1184,14 @@ func TestGetPVForPVC(t *testing.T) { Name: "no-vol-pvc", Namespace: "default", }, - Spec: v1.PersistentVolumeClaimSpec{ + Spec: corev1api.PersistentVolumeClaimSpec{ AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}, - Resources: v1.VolumeResourceRequirements{ - Requests: v1.ResourceList{}, + Resources: corev1api.VolumeResourceRequirements{ + Requests: corev1api.ResourceList{}, }, StorageClassName: &csiStorageClass, }, - Status: v1.PersistentVolumeClaimStatus{}, + Status: corev1api.PersistentVolumeClaimStatus{}, } unboundPVC := &v1.PersistentVolumeClaim{ @@ -1199,18 +1199,18 @@ func TestGetPVForPVC(t *testing.T) { Name: "unbound-pvc", Namespace: "default", }, - Spec: v1.PersistentVolumeClaimSpec{ + Spec: corev1api.PersistentVolumeClaimSpec{ AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}, - Resources: v1.VolumeResourceRequirements{ - Requests: v1.ResourceList{}, + Resources: corev1api.VolumeResourceRequirements{ + Requests: corev1api.ResourceList{}, }, StorageClassName: &csiStorageClass, VolumeName: "test-csi-7d28e566-ade7-4ed6-9e15-2e44d2fbcc08", }, - Status: v1.PersistentVolumeClaimStatus{ - Phase: v1.ClaimPending, + Status: corev1api.PersistentVolumeClaimStatus{ + Phase: corev1api.ClaimPending, AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}, - Capacity: v1.ResourceList{}, + Capacity: corev1api.ResourceList{}, }, } @@ -1320,18 +1320,18 @@ func TestGetPVCForPodVolume(t *testing.T) { Name: "sample-pvc", Namespace: "sample-ns", }, - Spec: v1.PersistentVolumeClaimSpec{ + Spec: corev1api.PersistentVolumeClaimSpec{ AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}, - Resources: v1.VolumeResourceRequirements{ - Requests: v1.ResourceList{}, + Resources: corev1api.VolumeResourceRequirements{ + Requests: corev1api.ResourceList{}, }, StorageClassName: &csiStorageClass, VolumeName: "test-csi-7d28e566-ade7-4ed6-9e15-2e44d2fbcc08", }, - Status: v1.PersistentVolumeClaimStatus{ - Phase: v1.ClaimBound, + Status: corev1api.PersistentVolumeClaimStatus{ + Phase: corev1api.ClaimBound, AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}, - Capacity: v1.ResourceList{}, + Capacity: corev1api.ResourceList{}, }, }