Merge pull request #124017 from carlory/rm-ctrl-flags

kube-controller-manager removes deprecated command flags

Kubernetes-commit: 1ff1207d22ab5cf442c8dafdf5bded1e32519873

config/v1alpha1/types.go

@@ -422,12 +422,6 @@ type PersistentVolumeBinderControllerConfiguration struct {
 	PVClaimBinderSyncPeriod metav1.Duration
 	// volumeConfiguration holds configuration for volume related features.
 	VolumeConfiguration VolumeConfiguration
-	// DEPRECATED: VolumeHostCIDRDenylist is a list of CIDRs that should not be reachable by the
-	// controller from plugins.
-	VolumeHostCIDRDenylist []string
-	// DEPRECATED: VolumeHostAllowLocalLoopback indicates if local loopback hosts (127.0.0.1, etc)
-	// should be allowed from plugins.
-	VolumeHostAllowLocalLoopback *bool
 }
 
 // PodGCControllerConfiguration contains elements describing PodGCController.

config/v1alpha1/zz_generated.deepcopy.go

@@ -416,16 +416,6 @@ func (in *PersistentVolumeBinderControllerConfiguration) DeepCopyInto(out *Persi
 	*out = *in
 	out.PVClaimBinderSyncPeriod = in.PVClaimBinderSyncPeriod
 	in.VolumeConfiguration.DeepCopyInto(&out.VolumeConfiguration)
-	if in.VolumeHostCIDRDenylist != nil {
-		in, out := &in.VolumeHostCIDRDenylist, &out.VolumeHostCIDRDenylist
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.VolumeHostAllowLocalLoopback != nil {
-		in, out := &in.VolumeHostAllowLocalLoopback, &out.VolumeHostAllowLocalLoopback
-		*out = new(bool)
-		**out = **in
-	}
 	return
 }
 

go.mod

@@ -29,3 +29,5 @@ require (
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
+
+replace k8s.io/client-go => k8s.io/client-go v0.0.0-20240528163907-5f741a5d35fe