From 5ccbc4e76c0e028342feff650026aed3942a578b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20B=C3=A4hler?= Date: Thu, 28 Mar 2024 20:39:07 +0100 Subject: [PATCH] chore(e2e): swap to VolumeResourceRequirements --- e2e/preventing_pv_cross_tenant_mount_test.go | 4 ++-- e2e/storage_class_test.go | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/e2e/preventing_pv_cross_tenant_mount_test.go b/e2e/preventing_pv_cross_tenant_mount_test.go index 2e6d163a3..a12ee5b38 100644 --- a/e2e/preventing_pv_cross_tenant_mount_test.go +++ b/e2e/preventing_pv_cross_tenant_mount_test.go @@ -79,7 +79,7 @@ var _ = Describe("preventing PersistentVolume cross-tenant mount", func() { AccessModes: []corev1.PersistentVolumeAccessMode{ corev1.ReadWriteOnce, }, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, @@ -183,7 +183,7 @@ var _ = Describe("preventing PersistentVolume cross-tenant mount", func() { AccessModes: []corev1.PersistentVolumeAccessMode{ corev1.ReadWriteOnce, }, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceStorage: resource.MustParse("1Gi"), }, diff --git a/e2e/storage_class_test.go b/e2e/storage_class_test.go index c98b34feb..55bfee593 100644 --- a/e2e/storage_class_test.go +++ b/e2e/storage_class_test.go @@ -151,7 +151,7 @@ var _ = Describe("when Tenant handles Storage classes", func() { }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("3Gi"), }, @@ -171,7 +171,7 @@ var _ = Describe("when Tenant handles Storage classes", func() { }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("3Gi"), }, @@ -203,7 +203,7 @@ var _ = Describe("when Tenant handles Storage classes", func() { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: &storageName, AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("3Gi"), }, @@ -239,7 +239,7 @@ var _ = Describe("when Tenant handles Storage classes", func() { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: ptr.To(c), AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("3Gi"), }, @@ -261,7 +261,7 @@ var _ = Describe("when Tenant handles Storage classes", func() { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: &allowedClass, AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("3Gi"), }, @@ -295,7 +295,7 @@ var _ = Describe("when Tenant handles Storage classes", func() { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: &storageName, AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("3Gi"), }, @@ -321,7 +321,7 @@ var _ = Describe("when Tenant handles Storage classes", func() { }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("3Gi"), }, @@ -349,7 +349,7 @@ var _ = Describe("when Tenant handles Storage classes", func() { }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("3Gi"), }, @@ -381,7 +381,7 @@ var _ = Describe("when Tenant handles Storage classes", func() { }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("3Gi"), }, @@ -412,7 +412,7 @@ var _ = Describe("when Tenant handles Storage classes", func() { }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: map[corev1.ResourceName]resource.Quantity{ corev1.ResourceStorage: resource.MustParse("3Gi"), },