remove helper function for unused storage feature in pkg/proxy/util

cmd/kube-controller-manager/app/core.go

@@ -43,7 +43,6 @@ import (
 	servicecontroller "k8s.io/cloud-provider/controllers/service"
 	"k8s.io/controller-manager/controller"
 	csitrans "k8s.io/csi-translation-lib"
-	"k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
 	pkgcontroller "k8s.io/kubernetes/pkg/controller"
 	endpointcontroller "k8s.io/kubernetes/pkg/controller/endpoint"
 	"k8s.io/kubernetes/pkg/controller/garbagecollector"
@@ -255,12 +254,7 @@ func startPersistentVolumeBinderController(ctx context.Context, controllerContex
 	if err != nil {
 		return nil, true, fmt.Errorf("failed to probe volume plugins when starting persistentvolume controller: %v", err)
 	}
-	filteredDialOptions, err := options.ParseVolumeHostFilters(
-		controllerContext.ComponentConfig.PersistentVolumeBinderController.VolumeHostCIDRDenylist,
-		controllerContext.ComponentConfig.PersistentVolumeBinderController.VolumeHostAllowLocalLoopback)
-	if err != nil {
-		return nil, true, err
-	}
+
 	params := persistentvolumecontroller.ControllerParameters{
 		KubeClient:                controllerContext.ClientBuilder.ClientOrDie("persistent-volume-binder"),
 		SyncPeriod:                controllerContext.ComponentConfig.PersistentVolumeBinderController.PVClaimBinderSyncPeriod.Duration,
@@ -273,7 +267,6 @@ func startPersistentVolumeBinderController(ctx context.Context, controllerContex
 		PodInformer:               controllerContext.InformerFactory.Core().V1().Pods(),
 		NodeInformer:              controllerContext.InformerFactory.Core().V1().Nodes(),
 		EnableDynamicProvisioning: controllerContext.ComponentConfig.PersistentVolumeBinderController.VolumeConfiguration.EnableDynamicProvisioning,
-		FilteredDialOptions:       filteredDialOptions,
 	}
 	volumeController, volumeControllerErr := persistentvolumecontroller.NewController(ctx, params)
 	if volumeControllerErr != nil {
@@ -293,13 +286,6 @@ func startAttachDetachController(ctx context.Context, controllerContext Controll
 		return nil, true, fmt.Errorf("failed to probe volume plugins when starting attach/detach controller: %v", err)
 	}
 
-	filteredDialOptions, err := options.ParseVolumeHostFilters(
-		controllerContext.ComponentConfig.PersistentVolumeBinderController.VolumeHostCIDRDenylist,
-		controllerContext.ComponentConfig.PersistentVolumeBinderController.VolumeHostAllowLocalLoopback)
-	if err != nil {
-		return nil, true, err
-	}
-
 	ctx = klog.NewContext(ctx, logger)
 	attachDetachController, attachDetachControllerErr :=
 		attachdetach.NewAttachDetachController(
@@ -318,7 +304,6 @@ func startAttachDetachController(ctx context.Context, controllerContext Controll
 			controllerContext.ComponentConfig.AttachDetachController.DisableAttachDetachReconcilerSync,
 			controllerContext.ComponentConfig.AttachDetachController.ReconcilerSyncLoopPeriod.Duration,
 			attachdetach.DefaultTimerConfig,
-			filteredDialOptions,
 		)
 	if attachDetachControllerErr != nil {
 		return nil, true, fmt.Errorf("failed to start attach/detach controller: %v", attachDetachControllerErr)
@@ -334,12 +319,7 @@ func startVolumeExpandController(ctx context.Context, controllerContext Controll
 		return nil, true, fmt.Errorf("failed to probe volume plugins when starting volume expand controller: %v", err)
 	}
 	csiTranslator := csitrans.New()
-	filteredDialOptions, err := options.ParseVolumeHostFilters(
-		controllerContext.ComponentConfig.PersistentVolumeBinderController.VolumeHostCIDRDenylist,
-		controllerContext.ComponentConfig.PersistentVolumeBinderController.VolumeHostAllowLocalLoopback)
-	if err != nil {
-		return nil, true, err
-	}
+
 	expandController, expandControllerErr := expand.NewExpandController(
 		controllerContext.ClientBuilder.ClientOrDie("expand-controller"),
 		controllerContext.InformerFactory.Core().V1().PersistentVolumeClaims(),
@@ -347,7 +327,6 @@ func startVolumeExpandController(ctx context.Context, controllerContext Controll
 		plugins,
 		csiTranslator,
 		csimigration.NewPluginManager(csiTranslator, utilfeature.DefaultFeatureGate),
-		filteredDialOptions,
 	)
 
 	if expandControllerErr != nil {

cmd/kube-controller-manager/app/options/options_test.go

@@ -1053,30 +1053,6 @@ func TestValidateControllersOptions(t *testing.T) {
 				},
 			}).Validate,
 		},
-		{
-			name:                   "PersistentVolumeBinderControllerOptions bad cidr deny list",
-			expectErrors:           true,
-			expectedErrorSubString: "bad --volume-host-ip-denylist/--volume-host-allow-local-loopback invalid CIDR",
-			validate: (&PersistentVolumeBinderControllerOptions{
-				&persistentvolumeconfig.PersistentVolumeBinderControllerConfiguration{
-					PVClaimBinderSyncPeriod: metav1.Duration{Duration: 30 * time.Second},
-					VolumeConfiguration: persistentvolumeconfig.VolumeConfiguration{
-						EnableDynamicProvisioning:  false,
-						EnableHostPathProvisioning: true,
-						FlexVolumePluginDir:        "/flex-volume-plugin",
-						PersistentVolumeRecyclerConfiguration: persistentvolumeconfig.PersistentVolumeRecyclerConfiguration{
-							MaximumRetry:             3,
-							MinimumTimeoutNFS:        200,
-							IncrementTimeoutNFS:      45,
-							MinimumTimeoutHostPath:   45,
-							IncrementTimeoutHostPath: 45,
-						},
-					},
-					VolumeHostCIDRDenylist:       []string{"127.0.0.1"},
-					VolumeHostAllowLocalLoopback: false,
-				},
-			}).Validate,
-		},
 		{
 			name:                   "StatefulSetControllerOptions ConcurrentStatefulSetSyncs equal 0",
 			expectErrors:           true,

cmd/kube-controller-manager/app/options/persistentvolumebindercontroller.go

@@ -17,13 +17,9 @@ limitations under the License.
 package options
 
 import (
-	"fmt"
-
 	"github.com/spf13/pflag"
 
 	persistentvolumeconfig "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/config"
-	proxyutil "k8s.io/kubernetes/pkg/proxy/util"
-	netutils "k8s.io/utils/net"
 )
 
 // PersistentVolumeBinderControllerOptions holds the PersistentVolumeBinderController options.
@@ -48,7 +44,9 @@ func (o *PersistentVolumeBinderControllerOptions) AddFlags(fs *pflag.FlagSet) {
 	fs.BoolVar(&o.VolumeConfiguration.EnableDynamicProvisioning, "enable-dynamic-provisioning", o.VolumeConfiguration.EnableDynamicProvisioning, "Enable dynamic provisioning for environments that support it.")
 	fs.StringVar(&o.VolumeConfiguration.FlexVolumePluginDir, "flex-volume-plugin-dir", o.VolumeConfiguration.FlexVolumePluginDir, "Full path of the directory in which the flex volume plugin should search for additional third party volume plugins.")
 	fs.StringSliceVar(&o.VolumeHostCIDRDenylist, "volume-host-cidr-denylist", o.VolumeHostCIDRDenylist, "A comma-separated list of CIDR ranges to avoid from volume plugins.")
+	fs.MarkDeprecated("volume-host-cidr-denylist", "This flag is currently no-op and will be deleted.")
 	fs.BoolVar(&o.VolumeHostAllowLocalLoopback, "volume-host-allow-local-loopback", o.VolumeHostAllowLocalLoopback, "If false, deny local loopback IPs in addition to any CIDR ranges in --volume-host-cidr-denylist")
+	fs.MarkDeprecated("volume-host-allow-local-loopback", "This flag is currently no-op and will be deleted.")
 }
 
 // ApplyTo fills up PersistentVolumeBinderController config with options.
@@ -72,17 +70,5 @@ func (o *PersistentVolumeBinderControllerOptions) Validate() []error {
 	}
 
 	errs := []error{}
-	if _, err := ParseVolumeHostFilters(o.VolumeHostCIDRDenylist, o.VolumeHostAllowLocalLoopback); err != nil {
-		errs = append(errs, fmt.Errorf("bad --volume-host-ip-denylist/--volume-host-allow-local-loopback %w", err))
-	}
 	return errs
 }
-
-// ParseVolumeHostFilters process the --volume-host-ip-denylist and --volume-host-allow-local-loopback flags.
-func ParseVolumeHostFilters(denylist []string, allowLocalLoopback bool) (*proxyutil.FilteredDialOptions, error) {
-	denyCIDRs, err := netutils.ParseCIDRs(denylist)
-	if err != nil {
-		return nil, err
-	}
-	return &proxyutil.FilteredDialOptions{DialHostCIDRDenylist: denyCIDRs, AllowLocalLoopback: allowLocalLoopback}, nil
-}