Merge pull request kubernetes#128383 from carlory/cleanup-codes

remove csi translator from volume operation generator

Author: k8s-ci-robot

pkg/volume/util/operationexecutor/fakegenerator.go

@@ -24,7 +24,6 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/types"
-	csitrans "k8s.io/csi-translation-lib"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util/hostutil"
 	volumetypes "k8s.io/kubernetes/pkg/volume/util/types"
@@ -92,10 +91,6 @@ func (f *fakeOGCounter) GetVolumePluginMgr() *volume.VolumePluginMgr {
 	return nil
 }
 
-func (f *fakeOGCounter) GetCSITranslator() InTreeToCSITranslator {
-	return csitrans.New()
-}
-
 func (f *fakeOGCounter) GenerateExpandVolumeFunc(*v1.PersistentVolumeClaim, *v1.PersistentVolume) (volumetypes.GeneratedOperations, error) {
 	return f.recordFuncCall("GenerateExpandVolumeFunc"), nil
 }

pkg/volume/util/operationexecutor/operation_executor_test.go

@@ -29,7 +29,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/uuid"
-	csitrans "k8s.io/csi-translation-lib"
 	"k8s.io/klog/v2/ktesting"
 	"k8s.io/kubernetes/pkg/volume"
 	"k8s.io/kubernetes/pkg/volume/util/hostutil"
@@ -724,10 +723,6 @@ func (fopg *fakeOperationGenerator) GetVolumePluginMgr() *volume.VolumePluginMgr
 	return nil
 }
 
-func (fopg *fakeOperationGenerator) GetCSITranslator() InTreeToCSITranslator {
-	return csitrans.New()
-}
-
 func getTestPodWithSecret(podName, secretName string) *v1.Pod {
 	return &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{

pkg/volume/util/operationexecutor/operation_generator.go

@@ -36,7 +36,6 @@ import (
 	"k8s.io/client-go/tools/record"
 	volerr "k8s.io/cloud-provider/volume/errors"
 	storagehelpers "k8s.io/component-helpers/storage/volume"
-	csitrans "k8s.io/csi-translation-lib"
 	"k8s.io/klog/v2"
 	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
 	"k8s.io/kubernetes/pkg/features"
@@ -55,18 +54,6 @@ const (
 	VerifyControllerAttachedVolumeOpName string = "verify_controller_attached_volume"
 )
 
-// InTreeToCSITranslator contains methods required to check migratable status
-// and perform translations from InTree PVs and Inline to CSI
-type InTreeToCSITranslator interface {
-	IsPVMigratable(pv *v1.PersistentVolume) bool
-	IsInlineMigratable(vol *v1.Volume) bool
-	IsMigratableIntreePluginByName(inTreePluginName string) bool
-	GetInTreePluginNameFromSpec(pv *v1.PersistentVolume, vol *v1.Volume) (string, error)
-	GetCSINameFromInTreeName(pluginName string) (string, error)
-	TranslateInTreePVToCSI(logger klog.Logger, pv *v1.PersistentVolume) (*v1.PersistentVolume, error)
-	TranslateInTreeInlineVolumeToCSI(logger klog.Logger, volume *v1.Volume, podNamespace string) (*v1.PersistentVolume, error)
-}
-
 var _ OperationGenerator = &operationGenerator{}
 
 type operationGenerator struct {
@@ -83,8 +70,6 @@ type operationGenerator struct {
 
 	// blkUtil provides volume path related operations for block volume
 	blkUtil volumepathhandler.BlockVolumePathHandler
-
-	translator InTreeToCSITranslator
 }
 
 type inTreeResizeResponse struct {
@@ -108,7 +93,6 @@ func NewOperationGenerator(kubeClient clientset.Interface,
 		volumePluginMgr: volumePluginMgr,
 		recorder:        recorder,
 		blkUtil:         blkUtil,
-		translator:      csitrans.New(),
 	}
 }
 
@@ -147,9 +131,6 @@ type OperationGenerator interface {
 	// GetVolumePluginMgr returns volume plugin manager
 	GetVolumePluginMgr() *volume.VolumePluginMgr
 
-	// GetCSITranslator returns the CSI Translation Library
-	GetCSITranslator() InTreeToCSITranslator
-
 	GenerateExpandVolumeFunc(*v1.PersistentVolumeClaim, *v1.PersistentVolume) (volumetypes.GeneratedOperations, error)
 
 	GenerateExpandAndRecoverVolumeFunc(*v1.PersistentVolumeClaim, *v1.PersistentVolume, string) (volumetypes.GeneratedOperations, error)
@@ -361,10 +342,6 @@ func (og *operationGenerator) GetVolumePluginMgr() *volume.VolumePluginMgr {
 	return og.volumePluginMgr
 }
 
-func (og *operationGenerator) GetCSITranslator() InTreeToCSITranslator {
-	return og.translator
-}
-
 func (og *operationGenerator) GenerateDetachVolumeFunc(
 	logger klog.Logger,
 	volumeToDetach AttachedVolume,