Merge pull request #74764 from msau42/fix-repd-e2e

test/e2e/storage/regional_pd.go

@@ -27,7 +27,7 @@ import (
 	"encoding/json"
 
 	appsv1 "k8s.io/api/apps/v1"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	storage "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -49,6 +49,7 @@ const (
 	pvDeletionTimeout       = 3 * time.Minute
 	statefulSetReadyTimeout = 3 * time.Minute
 	taintKeyPrefix          = "zoneTaint_"
+	repdMinSize             = "200Gi"
 )
 
 var _ = utils.SIGDescribe("Regional PD", func() {
@@ -106,8 +107,8 @@ func testVolumeProvisioning(c clientset.Interface, ns string) {
 				"zones":            strings.Join(cloudZones, ","),
 				"replication-type": "regional-pd",
 			},
-			ClaimSize:    "1.5Gi",
-			ExpectedSize: "2Gi",
+			ClaimSize:    repdMinSize,
+			ExpectedSize: repdMinSize,
 			PvCheck: func(claim *v1.PersistentVolumeClaim, volume *v1.PersistentVolume) {
 				var err error
 				err = checkGCEPD(volume, "pd-standard")
@@ -126,8 +127,8 @@ func testVolumeProvisioning(c clientset.Interface, ns string) {
 				"type":             "pd-standard",
 				"replication-type": "regional-pd",
 			},
-			ClaimSize:    "1.5Gi",
-			ExpectedSize: "2Gi",
+			ClaimSize:    repdMinSize,
+			ExpectedSize: repdMinSize,
 			PvCheck: func(claim *v1.PersistentVolumeClaim, volume *v1.PersistentVolume) {
 				var err error
 				err = checkGCEPD(volume, "pd-standard")
@@ -309,7 +310,7 @@ func testRegionalDelayedBinding(c clientset.Interface, ns string, pvcCount int)
 			"type":             "pd-standard",
 			"replication-type": "regional-pd",
 		},
-		ClaimSize:    "2Gi",
+		ClaimSize:    repdMinSize,
 		DelayBinding: true,
 	}
 
@@ -342,8 +343,8 @@ func testRegionalAllowedTopologies(c clientset.Interface, ns string) {
 			"type":             "pd-standard",
 			"replication-type": "regional-pd",
 		},
-		ClaimSize:    "2Gi",
-		ExpectedSize: "2Gi",
+		ClaimSize:    repdMinSize,
+		ExpectedSize: repdMinSize,
 	}
 
 	suffix := "topo-regional"
@@ -367,7 +368,7 @@ func testRegionalAllowedTopologiesWithDelayedBinding(c clientset.Interface, ns s
 			"type":             "pd-standard",
 			"replication-type": "regional-pd",
 		},
-		ClaimSize:    "2Gi",
+		ClaimSize:    repdMinSize,
 		DelayBinding: true,
 	}