remove deprecated flags in controller manager options

Signed-off-by: dahuo98 <sxdahuo@gmail.com>

Author: dahuo98

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

@@ -185,12 +185,6 @@ func (o *Options) AddFlags(flags *pflag.FlagSet, allControllers, disabledByDefau
 	flags.DurationVar(&o.LeaderElection.RetryPeriod.Duration, "leader-elect-retry-period", defaultElectionRetryPeriod.Duration, ""+
 		"The duration the clients should wait between attempting acquisition and renewal "+
 		"of a leadership. This is only applicable if leader election is enabled.")
-	flags.DurationVar(&o.ClusterLeaseDuration.Duration, "cluster-lease-duration", 40*time.Second,
-		"Specifies the expiration period of a cluster lease.")
-	_ = flags.MarkDeprecated("cluster-lease-duration", "The flag --cluster-lease-duration has been marked deprecated because it has never been used, and will be removed in a future release.")
-	flags.Float64Var(&o.ClusterLeaseRenewIntervalFraction, "cluster-lease-renew-interval-fraction", 0.25,
-		"Specifies the cluster lease renew interval fraction.")
-	_ = flags.MarkDeprecated("cluster-lease-renew-interval-fraction", "The flag --cluster-lease-renew-interval-fraction has been marked deprecated because it has never been used, and will be removed in a future release.")
 	flags.DurationVar(&o.ClusterSuccessThreshold.Duration, "cluster-success-threshold", 30*time.Second, "The duration of successes for the cluster to be considered healthy after recovery.")
 	flags.DurationVar(&o.ClusterFailureThreshold.Duration, "cluster-failure-threshold", 30*time.Second, "The duration of failure for the cluster to be considered unhealthy.")
 	flags.DurationVar(&o.ClusterMonitorPeriod.Duration, "cluster-monitor-period", 5*time.Second,

cmd/controller-manager/app/options/validation.go

@@ -37,12 +37,6 @@ func (o *Options) Validate() field.ErrorList {
 	if o.ClusterStatusUpdateFrequency.Duration <= 0 {
 		errs = append(errs, field.Invalid(newPath.Child("ClusterStatusUpdateFrequency"), o.ClusterStatusUpdateFrequency, "must be greater than 0"))
 	}
-	if o.ClusterLeaseDuration.Duration <= 0 {
-		errs = append(errs, field.Invalid(newPath.Child("ClusterLeaseDuration"), o.ClusterLeaseDuration, "must be greater than 0"))
-	}
-	if o.ClusterLeaseRenewIntervalFraction <= 0 || o.ClusterLeaseRenewIntervalFraction >= 1 {
-		errs = append(errs, field.Invalid(newPath.Child("ClusterLeaseRenewIntervalFraction"), o.ClusterLeaseRenewIntervalFraction, "must be greater than 0 and less than 1"))
-	}
 	if o.ClusterMonitorPeriod.Duration <= 0 {
 		errs = append(errs, field.Invalid(newPath.Child("ClusterMonitorPeriod"), o.ClusterMonitorPeriod, "must be greater than 0"))
 	}

cmd/controller-manager/app/options/validation_test.go

@@ -30,13 +30,11 @@ type ModifyOptions func(option *Options)
 // New an Options with default parameters
 func New(modifyOptions ModifyOptions) Options {
 	option := Options{
-		SkippedPropagatingAPIs:            "cluster.karmada.io;policy.karmada.io;work.karmada.io",
-		ClusterStatusUpdateFrequency:      metav1.Duration{Duration: 10 * time.Second},
-		ClusterLeaseDuration:              metav1.Duration{Duration: 10 * time.Second},
-		ClusterMonitorPeriod:              metav1.Duration{Duration: 10 * time.Second},
-		ClusterMonitorGracePeriod:         metav1.Duration{Duration: 10 * time.Second},
-		ClusterStartupGracePeriod:         metav1.Duration{Duration: 10 * time.Second},
-		ClusterLeaseRenewIntervalFraction: 0.25,
+		SkippedPropagatingAPIs:       "cluster.karmada.io;policy.karmada.io;work.karmada.io",
+		ClusterStatusUpdateFrequency: metav1.Duration{Duration: 10 * time.Second},
+		ClusterMonitorPeriod:         metav1.Duration{Duration: 10 * time.Second},
+		ClusterMonitorGracePeriod:    metav1.Duration{Duration: 10 * time.Second},
+		ClusterStartupGracePeriod:    metav1.Duration{Duration: 10 * time.Second},
 		FederatedResourceQuotaOptions: FederatedResourceQuotaOptions{
 			ResourceQuotaSyncPeriod: metav1.Duration{
 				Duration: 10 * time.Second,
@@ -78,24 +76,6 @@ func TestValidateControllerManagerConfiguration(t *testing.T) {
 			}),
 			expectedErrs: field.ErrorList{field.Invalid(newPath.Child("ClusterStatusUpdateFrequency"), metav1.Duration{Duration: -10 * time.Second}, "must be greater than 0")},
 		},
-		"invalid ClusterLeaseDuration": {
-			opt: New(func(options *Options) {
-				options.ClusterLeaseDuration.Duration = -40 * time.Second
-			}),
-			expectedErrs: field.ErrorList{field.Invalid(newPath.Child("ClusterLeaseDuration"), metav1.Duration{Duration: -40 * time.Second}, "must be greater than 0")},
-		},
-		"invalid ClusterLeaseRenewIntervalFraction": {
-			opt: New(func(options *Options) {
-				options.ClusterLeaseRenewIntervalFraction = 1.2
-			}),
-			expectedErrs: field.ErrorList{field.Invalid(newPath.Child("ClusterLeaseRenewIntervalFraction"), float64(1.2), "must be greater than 0 and less than 1")},
-		},
-		"invalid ClusterLeaseRenewIntervalFraction (negative)": {
-			opt: New(func(options *Options) {
-				options.ClusterLeaseRenewIntervalFraction = -0.1
-			}),
-			expectedErrs: field.ErrorList{field.Invalid(newPath.Child("ClusterLeaseRenewIntervalFraction"), float64(-0.1), "must be greater than 0 and less than 1")},
-		},
 		"invalid ClusterMonitorPeriod": {
 			opt: New(func(options *Options) {
 				options.ClusterMonitorPeriod.Duration = -40 * time.Second