diff --git a/test/e2e/storage/csi_mock_volume.go b/test/e2e/storage/csi_mock_volume.go index b6069d28fb2..1f57d7a51aa 100644 --- a/test/e2e/storage/csi_mock_volume.go +++ b/test/e2e/storage/csi_mock_volume.go @@ -27,7 +27,6 @@ import ( v1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" - storagev1beta1 "k8s.io/api/storage/v1beta1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -276,7 +275,7 @@ var _ = utils.SIGDescribe("CSI mock volume", func() { handle := getVolumeHandle(m.cs, claim) attachmentHash := sha256.Sum256([]byte(fmt.Sprintf("%s%s%s", handle, m.provisioner, m.config.ClientNodeName))) attachmentName := fmt.Sprintf("csi-%x", attachmentHash) - _, err = m.cs.StorageV1beta1().VolumeAttachments().Get(attachmentName, metav1.GetOptions{}) + _, err = m.cs.StorageV1().VolumeAttachments().Get(attachmentName, metav1.GetOptions{}) if err != nil { if errors.IsNotFound(err) { if !test.disableAttach { @@ -616,7 +615,7 @@ func checkCSINodeForLimits(nodeName string, driverName string, cs clientset.Inte var attachLimit int32 waitErr := wait.PollImmediate(10*time.Second, csiNodeLimitUpdateTimeout, func() (bool, error) { - csiNode, err := cs.StorageV1beta1().CSINodes().Get(nodeName, metav1.GetOptions{}) + csiNode, err := cs.StorageV1().CSINodes().Get(nodeName, metav1.GetOptions{}) if err != nil && !errors.IsNotFound(err) { return false, err } @@ -841,7 +840,7 @@ func getVolumeHandle(cs clientset.Interface, claim *v1.PersistentVolumeClaim) st return pv.Spec.CSI.VolumeHandle } -func getVolumeLimitFromCSINode(csiNode *storagev1beta1.CSINode, driverName string) int32 { +func getVolumeLimitFromCSINode(csiNode *storagev1.CSINode, driverName string) int32 { for _, d := range csiNode.Spec.Drivers { if d.Name != driverName { continue diff --git a/test/e2e/storage/drivers/csi.go b/test/e2e/storage/drivers/csi.go index 3907edf25e3..1a487487bdc 100644 --- a/test/e2e/storage/drivers/csi.go +++ b/test/e2e/storage/drivers/csi.go @@ -493,7 +493,7 @@ func waitForCSIDriverRegistrationOnNode(nodeName string, driverName string, cs c const csiNodeRegisterTimeout = 1 * time.Minute return wait.PollImmediate(10*time.Second, csiNodeRegisterTimeout, func() (bool, error) { - csiNode, err := cs.StorageV1beta1().CSINodes().Get(nodeName, metav1.GetOptions{}) + csiNode, err := cs.StorageV1().CSINodes().Get(nodeName, metav1.GetOptions{}) if err != nil && !errors.IsNotFound(err) { return false, err } diff --git a/test/e2e/storage/testsuites/BUILD b/test/e2e/storage/testsuites/BUILD index ac35673f734..be6e765885f 100644 --- a/test/e2e/storage/testsuites/BUILD +++ b/test/e2e/storage/testsuites/BUILD @@ -27,7 +27,6 @@ go_library( "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/storage/v1:go_default_library", - "//staging/src/k8s.io/api/storage/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/test/e2e/storage/testsuites/volumelimits.go b/test/e2e/storage/testsuites/volumelimits.go index fdad915055e..6aaf3484d1b 100644 --- a/test/e2e/storage/testsuites/volumelimits.go +++ b/test/e2e/storage/testsuites/volumelimits.go @@ -25,7 +25,7 @@ import ( "github.com/onsi/ginkgo" v1 "k8s.io/api/core/v1" - storagev1beta1 "k8s.io/api/storage/v1beta1" + storagev1 "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" @@ -319,12 +319,12 @@ func getCSINodeLimits(cs clientset.Interface, nodeName string, driverInfo *Drive // Wait in a loop, the driver might just have been installed and kubelet takes a while to publish everything. var limit int err := wait.PollImmediate(2*time.Second, csiNodeInfoTimeout, func() (bool, error) { - csiNode, err := cs.StorageV1beta1().CSINodes().Get(nodeName, metav1.GetOptions{}) + csiNode, err := cs.StorageV1().CSINodes().Get(nodeName, metav1.GetOptions{}) if err != nil { framework.Logf("%s", err) return false, nil } - var csiDriver *storagev1beta1.CSINodeDriver + var csiDriver *storagev1.CSINodeDriver for _, c := range csiNode.Spec.Drivers { if c.Name == driverInfo.Name { csiDriver = &c diff --git a/test/integration/auth/BUILD b/test/integration/auth/BUILD index 31ea9cf1217..3b32efe33c6 100644 --- a/test/integration/auth/BUILD +++ b/test/integration/auth/BUILD @@ -54,7 +54,6 @@ go_test( "//staging/src/k8s.io/api/policy/v1beta1:go_default_library", "//staging/src/k8s.io/api/rbac/v1:go_default_library", "//staging/src/k8s.io/api/storage/v1:go_default_library", - "//staging/src/k8s.io/api/storage/v1beta1:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", diff --git a/test/integration/auth/node_test.go b/test/integration/auth/node_test.go index b8634ed1e71..d0e851b1424 100644 --- a/test/integration/auth/node_test.go +++ b/test/integration/auth/node_test.go @@ -27,7 +27,6 @@ import ( corev1 "k8s.io/api/core/v1" policy "k8s.io/api/policy/v1beta1" storagev1 "k8s.io/api/storage/v1" - storagev1beta1 "k8s.io/api/storage/v1beta1" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" @@ -399,18 +398,18 @@ func TestNodeAuthorizer(t *testing.T) { getNode1CSINode := func(client clientset.Interface) func() error { return func() error { - _, err := client.StorageV1beta1().CSINodes().Get("node1", metav1.GetOptions{}) + _, err := client.StorageV1().CSINodes().Get("node1", metav1.GetOptions{}) return err } } createNode1CSINode := func(client clientset.Interface) func() error { return func() error { - nodeInfo := &storagev1beta1.CSINode{ + nodeInfo := &storagev1.CSINode{ ObjectMeta: metav1.ObjectMeta{ Name: "node1", }, - Spec: storagev1beta1.CSINodeSpec{ - Drivers: []storagev1beta1.CSINodeDriver{ + Spec: storagev1.CSINodeSpec{ + Drivers: []storagev1.CSINodeDriver{ { Name: "com.example.csi.driver1", NodeID: "com.example.csi/node1", @@ -419,24 +418,24 @@ func TestNodeAuthorizer(t *testing.T) { }, }, } - _, err := client.StorageV1beta1().CSINodes().Create(nodeInfo) + _, err := client.StorageV1().CSINodes().Create(nodeInfo) return err } } updateNode1CSINode := func(client clientset.Interface) func() error { return func() error { - nodeInfo, err := client.StorageV1beta1().CSINodes().Get("node1", metav1.GetOptions{}) + nodeInfo, err := client.StorageV1().CSINodes().Get("node1", metav1.GetOptions{}) if err != nil { return err } - nodeInfo.Spec.Drivers = []storagev1beta1.CSINodeDriver{ + nodeInfo.Spec.Drivers = []storagev1.CSINodeDriver{ { Name: "com.example.csi.driver2", NodeID: "com.example.csi/node1", TopologyKeys: []string{"com.example.csi/rack"}, }, } - _, err = client.StorageV1beta1().CSINodes().Update(nodeInfo) + _, err = client.StorageV1().CSINodes().Update(nodeInfo) return err } } @@ -444,13 +443,13 @@ func TestNodeAuthorizer(t *testing.T) { return func() error { bs := []byte(fmt.Sprintf(`{"csiDrivers": [ { "driver": "net.example.storage.driver2", "nodeID": "net.example.storage/node1", "topologyKeys": [ "net.example.storage/region" ] } ] }`)) // StrategicMergePatch is unsupported by CRs. Falling back to MergePatch - _, err := client.StorageV1beta1().CSINodes().Patch("node1", types.MergePatchType, bs) + _, err := client.StorageV1().CSINodes().Patch("node1", types.MergePatchType, bs) return err } } deleteNode1CSINode := func(client clientset.Interface) func() error { return func() error { - return client.StorageV1beta1().CSINodes().Delete("node1", &metav1.DeleteOptions{}) + return client.StorageV1().CSINodes().Delete("node1", &metav1.DeleteOptions{}) } }