From 9c92b37d4ed45427116e9ec2c27366199eea895c Mon Sep 17 00:00:00 2001 From: carlory Date: Fri, 10 May 2024 16:42:31 +0800 Subject: [PATCH] remove clusterName from VolumeOptions --- cmd/kube-controller-manager/app/core.go | 1 - .../volume/persistentvolume/pv_controller.go | 2 -- .../persistentvolume/pv_controller_base.go | 2 -- pkg/volume/plugins.go | 2 -- pkg/volume/util/util.go | 16 ------------ pkg/volume/util/util_test.go | 25 ------------------- test/integration/volume/attach_detach_test.go | 1 - .../volumescheduling/volume_binding_test.go | 1 - 8 files changed, 50 deletions(-) diff --git a/cmd/kube-controller-manager/app/core.go b/cmd/kube-controller-manager/app/core.go index a63e2054e86..5f34bff5edb 100644 --- a/cmd/kube-controller-manager/app/core.go +++ b/cmd/kube-controller-manager/app/core.go @@ -337,7 +337,6 @@ func startPersistentVolumeBinderController(ctx context.Context, controllerContex KubeClient: controllerContext.ClientBuilder.ClientOrDie("persistent-volume-binder"), SyncPeriod: controllerContext.ComponentConfig.PersistentVolumeBinderController.PVClaimBinderSyncPeriod.Duration, VolumePlugins: plugins, - ClusterName: controllerContext.ComponentConfig.KubeCloudShared.ClusterName, VolumeInformer: controllerContext.InformerFactory.Core().V1().PersistentVolumes(), ClaimInformer: controllerContext.InformerFactory.Core().V1().PersistentVolumeClaims(), ClassInformer: controllerContext.InformerFactory.Storage().V1().StorageClasses(), diff --git a/pkg/controller/volume/persistentvolume/pv_controller.go b/pkg/controller/volume/persistentvolume/pv_controller.go index 526e6179a04..02a6d5d76dd 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller.go +++ b/pkg/controller/volume/persistentvolume/pv_controller.go @@ -156,7 +156,6 @@ type PersistentVolumeController struct { eventRecorder record.EventRecorder volumePluginMgr vol.VolumePluginMgr enableDynamicProvisioning bool - clusterName string resyncPeriod time.Duration // Cache of the last known version of volumes and claims. This cache is @@ -1642,7 +1641,6 @@ func (ctrl *PersistentVolumeController) provisionClaimOperation( options := vol.VolumeOptions{ PersistentVolumeReclaimPolicy: *storageClass.ReclaimPolicy, MountOptions: storageClass.MountOptions, - ClusterName: ctrl.clusterName, PVName: pvName, PVC: claim, Parameters: storageClass.Parameters, diff --git a/pkg/controller/volume/persistentvolume/pv_controller_base.go b/pkg/controller/volume/persistentvolume/pv_controller_base.go index 15392ca6263..87620399096 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller_base.go +++ b/pkg/controller/volume/persistentvolume/pv_controller_base.go @@ -64,7 +64,6 @@ type ControllerParameters struct { KubeClient clientset.Interface SyncPeriod time.Duration VolumePlugins []vol.VolumePlugin - ClusterName string VolumeInformer coreinformers.PersistentVolumeInformer ClaimInformer coreinformers.PersistentVolumeClaimInformer ClassInformer storageinformers.StorageClassInformer @@ -86,7 +85,6 @@ func NewController(ctx context.Context, p ControllerParameters) (*PersistentVolu eventRecorder: eventRecorder, runningOperations: goroutinemap.NewGoRoutineMap(true /* exponentialBackOffOnError */), enableDynamicProvisioning: p.EnableDynamicProvisioning, - clusterName: p.ClusterName, createProvisionedPVRetryCount: createProvisionedPVRetryCount, createProvisionedPVInterval: createProvisionedPVInterval, claimQueue: workqueue.NewTypedWithConfig(workqueue.TypedQueueConfig[string]{Name: "claims"}), diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index 399ca814c26..cea3e14b686 100644 --- a/pkg/volume/plugins.go +++ b/pkg/volume/plugins.go @@ -82,8 +82,6 @@ type VolumeOptions struct { // i.e. with required capacity, accessMode, labels matching PVC.Selector and // so on. PVC *v1.PersistentVolumeClaim - // Unique name of Kubernetes cluster. - ClusterName string // Volume provisioning parameters from StorageClass Parameters map[string]string } diff --git a/pkg/volume/util/util.go b/pkg/volume/util/util.go index 54869386a83..fbd4a42ad1c 100644 --- a/pkg/volume/util/util.go +++ b/pkg/volume/util/util.go @@ -200,22 +200,6 @@ func CalculateTimeoutForVolume(minimumTimeout, timeoutIncrement int, pv *v1.Pers return timeout } -// GenerateVolumeName returns a PV name with clusterName prefix. The function -// should be used to generate a name of GCE PD or Cinder volume. It basically -// adds "-dynamic-" before the PV name, making sure the resulting -// string fits given length and cuts "dynamic" if not. -func GenerateVolumeName(clusterName, pvName string, maxLength int) string { - prefix := clusterName + "-dynamic" - pvLen := len(pvName) - - // cut the "-dynamic" to fit full pvName into maxLength - // +1 for the '-' dash - if pvLen+1+len(prefix) > maxLength { - prefix = prefix[:maxLength-pvLen-1] - } - return prefix + "-" + pvName -} - // GetPath checks if the path from the mounter is empty. func GetPath(mounter volume.Mounter) (string, error) { path := mounter.GetPath() diff --git a/pkg/volume/util/util_test.go b/pkg/volume/util/util_test.go index 8036c514dc9..1354ff12728 100644 --- a/pkg/volume/util/util_test.go +++ b/pkg/volume/util/util_test.go @@ -20,7 +20,6 @@ import ( "os" "reflect" "runtime" - "strings" "testing" "github.com/google/go-cmp/cmp" @@ -307,30 +306,6 @@ func TestFsUserFrom(t *testing.T) { } } -func TestGenerateVolumeName(t *testing.T) { - - // Normal operation, no truncate - v1 := GenerateVolumeName("kubernetes", "pv-cinder-abcde", 255) - if v1 != "kubernetes-dynamic-pv-cinder-abcde" { - t.Errorf("Expected kubernetes-dynamic-pv-cinder-abcde, got %s", v1) - } - - // Truncate trailing "6789-dynamic" - prefix := strings.Repeat("0123456789", 9) // 90 characters prefix + 8 chars. of "-dynamic" - v2 := GenerateVolumeName(prefix, "pv-cinder-abcde", 100) - expect := prefix[:84] + "-pv-cinder-abcde" - if v2 != expect { - t.Errorf("Expected %s, got %s", expect, v2) - } - - // Truncate really long cluster name - prefix = strings.Repeat("0123456789", 1000) // 10000 characters prefix - v3 := GenerateVolumeName(prefix, "pv-cinder-abcde", 100) - if v3 != expect { - t.Errorf("Expected %s, got %s", expect, v3) - } -} - func TestHasMountRefs(t *testing.T) { testCases := map[string]struct { mountPath string diff --git a/test/integration/volume/attach_detach_test.go b/test/integration/volume/attach_detach_test.go index 8e1702b6039..bc374ba7a98 100644 --- a/test/integration/volume/attach_detach_test.go +++ b/test/integration/volume/attach_detach_test.go @@ -376,7 +376,6 @@ func createAdClients(ctx context.Context, t *testing.T, server *kubeapiservertes KubeClient: testClient, SyncPeriod: controllerOptions.PVClaimBinderSyncPeriod, VolumePlugins: plugins, - ClusterName: "volume-test-cluster", VolumeInformer: informers.Core().V1().PersistentVolumes(), ClaimInformer: informers.Core().V1().PersistentVolumeClaims(), ClassInformer: informers.Storage().V1().StorageClasses(), diff --git a/test/integration/volumescheduling/volume_binding_test.go b/test/integration/volumescheduling/volume_binding_test.go index c455eb6c8a3..2c880ad987a 100644 --- a/test/integration/volumescheduling/volume_binding_test.go +++ b/test/integration/volumescheduling/volume_binding_test.go @@ -1111,7 +1111,6 @@ func initPVController(t *testing.T, testCtx *testutil.TestContext, provisionDela // https://github.com/kubernetes/kubernetes/issues/85320 SyncPeriod: 5 * time.Second, VolumePlugins: plugins, - ClusterName: "volume-test-cluster", VolumeInformer: informerFactory.Core().V1().PersistentVolumes(), ClaimInformer: informerFactory.Core().V1().PersistentVolumeClaims(), ClassInformer: informerFactory.Storage().V1().StorageClasses(),