diff --git a/tests/e2e-kubernetes/manifests.yaml b/tests/e2e-kubernetes/manifests.yaml index 233c5bb0c2..a1edb9f754 100644 --- a/tests/e2e-kubernetes/manifests.yaml +++ b/tests/e2e-kubernetes/manifests.yaml @@ -18,6 +18,8 @@ ShortName: ebs StorageClass: FromFile: storageclass.yaml +VolumeAttributesClass: + FromFile: volumeattributesclass.yaml SnapshotClass: FromName: true DriverInfo: diff --git a/tests/e2e-kubernetes/storageclass.yaml b/tests/e2e-kubernetes/storageclass.yaml index dd5f76abdb..332da571ab 100644 --- a/tests/e2e-kubernetes/storageclass.yaml +++ b/tests/e2e-kubernetes/storageclass.yaml @@ -12,9 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# StorageClass for Kubernetes external tests. -# See https://github.com/kubernetes/kubernetes/tree/master/test/e2e/storage/external - kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: diff --git a/tests/e2e-kubernetes/volumeattributesclass.yaml b/tests/e2e-kubernetes/volumeattributesclass.yaml new file mode 100644 index 0000000000..311e1de5c3 --- /dev/null +++ b/tests/e2e-kubernetes/volumeattributesclass.yaml @@ -0,0 +1,21 @@ +# Copyright 2024 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the 'License'); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an 'AS IS' BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +apiVersion: storage.k8s.io/v1beta1 +kind: VolumeAttributesClass +metadata: + name: gp2-class +driverName: ebs.csi.aws.com +parameters: + type: gp2 diff --git a/tests/e2e/modify_volume.go b/tests/e2e/modify_volume.go index b3fb0ec3b8..e37159e986 100644 --- a/tests/e2e/modify_volume.go +++ b/tests/e2e/modify_volume.go @@ -15,8 +15,6 @@ limitations under the License. package e2e import ( - "os" - awscloud "github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/cloud" ebscsidriver "github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/driver" "github.com/kubernetes-sigs/aws-ebs-csi-driver/tests/e2e/driver" @@ -150,13 +148,9 @@ var _ = Describe("[ebs-csi-e2e] [single-az] [modify-volume] Modifying a PVC", fu } modifyVolumeTest.Run(cs, ns, ebsDriver, testsuites.VolumeModifierForK8s) }) - // HACK: Only run VAC tests if TEST_VAC is set - these tests are being skipped in CI because Kubernetes 1.31 is available - // This check can safely be removed after the single-az test is moved to Kubernetes 1.31 or later - if os.Getenv("TEST_VAC") != "" { - It("will modify associated PV and EBS Volume via external-resizer", func() { - modifyVolumeTest.Run(cs, ns, ebsDriver, testsuites.ExternalResizer) - }) - } + It("will modify associated PV and EBS Volume via external-resizer", func() { + modifyVolumeTest.Run(cs, ns, ebsDriver, testsuites.ExternalResizer) + }) }) } })