diff --git a/tests/e2e/dynamic_provisioning.go b/tests/e2e/dynamic_provisioning.go index 9b1063a9eb..349886a11c 100644 --- a/tests/e2e/dynamic_provisioning.go +++ b/tests/e2e/dynamic_provisioning.go @@ -47,7 +47,7 @@ var _ = Describe("[ebs-csi-e2e] [single-az] Dynamic Provisioning", func() { ns *v1.Namespace ebsDriver driver.PVTestDriver volumeTypes = awscloud.ValidVolumeTypes - fsTypes = []string{ebscsidriver.FSTypeXfs} + fsTypes = []string{ebscsidriver.FSTypeExt4} // Поменял xfs на ext4 из-за https://jira.croc.ru/browse/C2DEVEL-13229?focusedCommentId=6268126 ) BeforeEach(func() { @@ -452,7 +452,7 @@ var _ = Describe("[ebs-csi-e2e] [single-az] Snapshot", func() { BeforeEach(func() { cs = f.ClientSet var err error - snapshotrcs, err = restClient(testsuites.SnapshotAPIGroup, testsuites.APIVersionv1beta1) + snapshotrcs, err = restClient(testsuites.SnapshotAPIGroup, testsuites.APIVersionv1) if err != nil { Fail(fmt.Sprintf("could not get rest clientset: %v", err)) } diff --git a/tests/e2e/pre_provsioning.go b/tests/e2e/pre_provsioning.go index ed805364ba..2a41863dde 100644 --- a/tests/e2e/pre_provsioning.go +++ b/tests/e2e/pre_provsioning.go @@ -99,7 +99,7 @@ var _ = Describe("[ebs-csi-e2e] [single-az] Pre-Provisioned", func() { } volumeID = disk.VolumeID diskSize = fmt.Sprintf("%dGi", defaultDiskSize) - snapshotrcs, err = restClient(testsuites.SnapshotAPIGroup, testsuites.APIVersionv1beta1) + snapshotrcs, err = restClient(testsuites.SnapshotAPIGroup, testsuites.APIVersionv1) if err != nil { Fail(fmt.Sprintf("could not get rest clientset: %v", err)) } @@ -158,7 +158,8 @@ var _ = Describe("[ebs-csi-e2e] [single-az] Pre-Provisioned", func() { Cmd: "echo 'hello world' >> /mnt/test-1/data && grep 'hello world' /mnt/test-1/data && sync", Volumes: []testsuites.VolumeDetails{ { - ClaimSize: diskSize, + VolumeType: defaultVoluemType, // без этой строки ebs-plugin ругался: Unknown VolumeType + ClaimSize: diskSize, VolumeMount: testsuites.VolumeMountDetails{ NameGenerate: "test-volume-", MountPathGenerate: "/mnt/test-", diff --git a/tests/e2e/testsuites/specs.go b/tests/e2e/testsuites/specs.go index a25a2574ec..d268a99c7c 100644 --- a/tests/e2e/testsuites/specs.go +++ b/tests/e2e/testsuites/specs.go @@ -61,8 +61,8 @@ const ( const ( VolumeSnapshotKind = "VolumeSnapshot" VolumeSnapshotContentKind = "VolumeSnapshotContent" - SnapshotAPIVersion = "snapshot.storage.k8s.io/v1beta1" - APIVersionv1beta1 = "v1beta1" + SnapshotAPIVersion = "snapshot.storage.k8s.io/v1" + APIVersionv1 = "v1" ) var (