From 88165b02ba180a22b75bb0e03d5fea2040cb1b47 Mon Sep 17 00:00:00 2001
From: Mauricio Poppe <mauriciopoppe@google.com>
Date: Tue, 18 May 2021 19:32:28 +0000
Subject: [PATCH] remove v1beta1 volume provisioning test

---
 test/e2e/storage/volume_provisioning.go | 53 -------------------------
 1 file changed, 53 deletions(-)

diff --git a/test/e2e/storage/volume_provisioning.go b/test/e2e/storage/volume_provisioning.go
index ac0eacf3f84..e5511139856 100644
--- a/test/e2e/storage/volume_provisioning.go
+++ b/test/e2e/storage/volume_provisioning.go
@@ -33,7 +33,6 @@ import (
 	v1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	storagev1 "k8s.io/api/storage/v1"
-	storagev1beta1 "k8s.io/api/storage/v1beta1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -342,7 +341,6 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() {
 				},
 			}
 
-			var betaTest *testsuites.StorageClassTest
 			for i, t := range tests {
 				// Beware of closure, use local variables instead of those from
 				// outer scope
@@ -353,9 +351,6 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() {
 					continue
 				}
 
-				// Remember the last supported test for subsequent test of beta API
-				betaTest = &test
-
 				ginkgo.By("Testing " + test.Name)
 				suffix := fmt.Sprintf("%d", i)
 				test.Client = c
@@ -373,31 +368,6 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() {
 
 				test.TestDynamicProvisioning()
 			}
-
-			// Run the last test with storage.k8s.io/v1beta1 on pvc
-			if betaTest != nil {
-				ginkgo.By("Testing " + betaTest.Name + " with beta volume provisioning")
-				betaClass := newBetaStorageClass(*betaTest, "beta")
-				// create beta class manually
-				betaClass, err := c.StorageV1beta1().StorageClasses().Create(context.TODO(), betaClass, metav1.CreateOptions{})
-				framework.ExpectNoError(err)
-				defer deleteStorageClass(c, betaClass.Name)
-
-				// fetch V1beta1 StorageClass as V1 object for the test
-				class, err := c.StorageV1().StorageClasses().Get(context.TODO(), betaClass.Name, metav1.GetOptions{})
-				framework.ExpectNoError(err)
-
-				betaTest.Client = c
-				betaTest.Class = class
-				betaTest.Claim = e2epv.MakePersistentVolumeClaim(e2epv.PersistentVolumeClaimConfig{
-					ClaimSize:        betaTest.ClaimSize,
-					StorageClassName: &class.Name,
-					VolumeMode:       &betaTest.VolumeMode,
-				}, ns)
-				betaTest.Claim.Spec.StorageClassName = &(class.Name)
-
-				(*betaTest).TestDynamicProvisioning()
-			}
 		})
 
 		ginkgo.It("should provision storage with non-default reclaim policy Retain", func() {
@@ -992,29 +962,6 @@ func getStorageClass(
 	}
 }
 
-// TODO: remove when storage.k8s.io/v1beta1 is removed.
-func newBetaStorageClass(t testsuites.StorageClassTest, suffix string) *storagev1beta1.StorageClass {
-	pluginName := t.Provisioner
-
-	if pluginName == "" {
-		pluginName = getDefaultPluginName()
-	}
-	if suffix == "" {
-		suffix = "default"
-	}
-
-	return &storagev1beta1.StorageClass{
-		TypeMeta: metav1.TypeMeta{
-			Kind: "StorageClass",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			GenerateName: suffix + "-",
-		},
-		Provisioner: pluginName,
-		Parameters:  t.Parameters,
-	}
-}
-
 func startGlusterDpServerPod(c clientset.Interface, ns string) *v1.Pod {
 	podClient := c.CoreV1().Pods(ns)