get rid of copied fields in the options and using wraped componentconfig fields

2019-01-12 19:13:05 +08:00
parent 3478647333
commit 5b43a24318
24 changed files with 37 additions and 99 deletions
--- a/cmd/kube-controller-manager/app/options/attachdetachcontroller.go
+++ b/cmd/kube-controller-manager/app/options/attachdetachcontroller.go
@@ -19,14 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"

-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )

 // AttachDetachControllerOptions holds the AttachDetachController options.
 type AttachDetachControllerOptions struct {
-	ReconcilerSyncLoopPeriod          metav1.Duration
-	DisableAttachDetachReconcilerSync bool
+	*kubectrlmgrconfig.AttachDetachControllerConfiguration
 }

 // AddFlags adds flags related to AttachDetachController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/csrsigningcontroller.go
+++ b/cmd/kube-controller-manager/app/options/csrsigningcontroller.go
@@ -19,7 +19,6 @@ package options
 import (
 	"github.com/spf13/pflag"

-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )

@@ -35,9 +34,7 @@ const (

 // CSRSigningControllerOptions holds the CSRSigningController options.
 type CSRSigningControllerOptions struct {
-	ClusterSigningDuration metav1.Duration
-	ClusterSigningKeyFile  string
-	ClusterSigningCertFile string
+	*kubectrlmgrconfig.CSRSigningControllerConfiguration
 }

 // AddFlags adds flags related to CSRSigningController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/daemonsetcontroller.go
+++ b/cmd/kube-controller-manager/app/options/daemonsetcontroller.go
@@ -24,7 +24,7 @@ import (

 // DaemonSetControllerOptions holds the DaemonSetController options.
 type DaemonSetControllerOptions struct {
-	ConcurrentDaemonSetSyncs int32
+	*kubectrlmgrconfig.DaemonSetControllerConfiguration
 }

 // AddFlags adds flags related to DaemonSetController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/deploymentcontroller.go
+++ b/cmd/kube-controller-manager/app/options/deploymentcontroller.go
@@ -19,14 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"

-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )

 // DeploymentControllerOptions holds the DeploymentController options.
 type DeploymentControllerOptions struct {
-	ConcurrentDeploymentSyncs      int32
-	DeploymentControllerSyncPeriod metav1.Duration
+	*kubectrlmgrconfig.DeploymentControllerConfiguration
 }

 // AddFlags adds flags related to DeploymentController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/deprecatedcontroller.go
+++ b/cmd/kube-controller-manager/app/options/deprecatedcontroller.go
@@ -25,9 +25,7 @@ import (
 // DeprecatedControllerOptions holds the DeprecatedController options, those option are deprecated.
 // TODO remove these fields once the deprecated flags are removed.
 type DeprecatedControllerOptions struct {
-	DeletingPodsQPS    float32
-	DeletingPodsBurst  int32
-	RegisterRetryCount int32
+	*kubectrlmgrconfig.DeprecatedControllerConfiguration
 }

 // AddFlags adds flags related to DeprecatedController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/endpointcontroller.go
+++ b/cmd/kube-controller-manager/app/options/endpointcontroller.go
@@ -24,7 +24,7 @@ import (

 // EndpointControllerOptions holds the EndPointController options.
 type EndpointControllerOptions struct {
-	ConcurrentEndpointSyncs int32
+	*kubectrlmgrconfig.EndpointControllerConfiguration
 }

 // AddFlags adds flags related to EndPointController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/garbagecollectorcontroller.go
+++ b/cmd/kube-controller-manager/app/options/garbagecollectorcontroller.go
@@ -24,9 +24,7 @@ import (

 // GarbageCollectorControllerOptions holds the GarbageCollectorController options.
 type GarbageCollectorControllerOptions struct {
-	ConcurrentGCSyncs      int32
-	GCIgnoredResources     []kubectrlmgrconfig.GroupResource
-	EnableGarbageCollector bool
+	*kubectrlmgrconfig.GarbageCollectorControllerConfiguration
 }

 // AddFlags adds flags related to GarbageCollectorController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/hpacontroller.go
+++ b/cmd/kube-controller-manager/app/options/hpacontroller.go
@@ -19,20 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"

-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )

 // HPAControllerOptions holds the HPAController options.
 type HPAControllerOptions struct {
-	HorizontalPodAutoscalerUseRESTClients               bool
-	HorizontalPodAutoscalerTolerance                    float64
-	HorizontalPodAutoscalerDownscaleStabilizationWindow metav1.Duration
-	HorizontalPodAutoscalerDownscaleForbiddenWindow     metav1.Duration
-	HorizontalPodAutoscalerUpscaleForbiddenWindow       metav1.Duration
-	HorizontalPodAutoscalerSyncPeriod                   metav1.Duration
-	HorizontalPodAutoscalerCPUInitializationPeriod      metav1.Duration
-	HorizontalPodAutoscalerInitialReadinessDelay        metav1.Duration
+	*kubectrlmgrconfig.HPAControllerConfiguration
 }

 // AddFlags adds flags related to HPAController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/jobcontroller.go
+++ b/cmd/kube-controller-manager/app/options/jobcontroller.go
@@ -24,7 +24,7 @@ import (

 // JobControllerOptions holds the JobController options.
 type JobControllerOptions struct {
-	ConcurrentJobSyncs int32
+	*kubectrlmgrconfig.JobControllerConfiguration
 }

 // AddFlags adds flags related to JobController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/namespacecontroller.go
+++ b/cmd/kube-controller-manager/app/options/namespacecontroller.go
@@ -19,14 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"

-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )

 // NamespaceControllerOptions holds the NamespaceController options.
 type NamespaceControllerOptions struct {
-	NamespaceSyncPeriod      metav1.Duration
-	ConcurrentNamespaceSyncs int32
+	*kubectrlmgrconfig.NamespaceControllerConfiguration
 }

 // AddFlags adds flags related to NamespaceController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/nodeipamcontroller.go
+++ b/cmd/kube-controller-manager/app/options/nodeipamcontroller.go
@@ -24,8 +24,7 @@ import (

 // NodeIPAMControllerOptions holds the NodeIpamController options.
 type NodeIPAMControllerOptions struct {
-	ServiceCIDR      string
-	NodeCIDRMaskSize int32
+	*kubectrlmgrconfig.NodeIPAMControllerConfiguration
 }

 // AddFlags adds flags related to NodeIpamController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/nodelifecyclecontroller.go
+++ b/cmd/kube-controller-manager/app/options/nodelifecyclecontroller.go
@@ -19,20 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"

-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )

 // NodeLifecycleControllerOptions holds the NodeLifecycleController options.
 type NodeLifecycleControllerOptions struct {
-	EnableTaintManager        bool
-	NodeEvictionRate          float32
-	SecondaryNodeEvictionRate float32
-	NodeStartupGracePeriod    metav1.Duration
-	NodeMonitorGracePeriod    metav1.Duration
-	PodEvictionTimeout        metav1.Duration
-	LargeClusterSizeThreshold int32
-	UnhealthyZoneThreshold    float32
+	*kubectrlmgrconfig.NodeLifecycleControllerConfiguration
 }

 // AddFlags adds flags related to NodeLifecycleController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/persistentvolumebindercontroller.go
+++ b/cmd/kube-controller-manager/app/options/persistentvolumebindercontroller.go
@@ -19,14 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"

-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )

 // PersistentVolumeBinderControllerOptions holds the PersistentVolumeBinderController options.
 type PersistentVolumeBinderControllerOptions struct {
-	PVClaimBinderSyncPeriod metav1.Duration
-	VolumeConfiguration     kubectrlmgrconfig.VolumeConfiguration
+	*kubectrlmgrconfig.PersistentVolumeBinderControllerConfiguration
 }

 // AddFlags adds flags related to PersistentVolumeBinderController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/podgccontroller.go
+++ b/cmd/kube-controller-manager/app/options/podgccontroller.go
@@ -24,7 +24,7 @@ import (

 // PodGCControllerOptions holds the PodGCController options.
 type PodGCControllerOptions struct {
-	TerminatedPodGCThreshold int32
+	*kubectrlmgrconfig.PodGCControllerConfiguration
 }

 // AddFlags adds flags related to PodGCController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/replicasetcontroller.go
+++ b/cmd/kube-controller-manager/app/options/replicasetcontroller.go
@@ -24,7 +24,7 @@ import (

 // ReplicaSetControllerOptions holds the ReplicaSetController options.
 type ReplicaSetControllerOptions struct {
-	ConcurrentRSSyncs int32
+	*kubectrlmgrconfig.ReplicaSetControllerConfiguration
 }

 // AddFlags adds flags related to ReplicaSetController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/replicationcontroller.go
+++ b/cmd/kube-controller-manager/app/options/replicationcontroller.go
@@ -24,7 +24,7 @@ import (

 // ReplicationControllerOptions holds the ReplicationController options.
 type ReplicationControllerOptions struct {
-	ConcurrentRCSyncs int32
+	*kubectrlmgrconfig.ReplicationControllerConfiguration
 }

 // AddFlags adds flags related to ReplicationController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/resourcequotacontroller.go
+++ b/cmd/kube-controller-manager/app/options/resourcequotacontroller.go
@@ -19,14 +19,12 @@ package options
 import (
 	"github.com/spf13/pflag"

-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
 )

 // ResourceQuotaControllerOptions holds the ResourceQuotaController options.
 type ResourceQuotaControllerOptions struct {
-	ResourceQuotaSyncPeriod      metav1.Duration
-	ConcurrentResourceQuotaSyncs int32
+	*kubectrlmgrconfig.ResourceQuotaControllerConfiguration
 }

 // AddFlags adds flags related to ResourceQuotaController for controller manager to the specified FlagSet.
--- a/cmd/kube-controller-manager/app/options/serviceaccountcontroller.go
+++ b/cmd/kube-controller-manager/app/options/serviceaccountcontroller.go
@@ -24,9 +24,7 @@ import (

 // SAControllerOptions holds the ServiceAccountController options.
 type SAControllerOptions struct {
-	ServiceAccountKeyFile  string
-	ConcurrentSATokenSyncs int32
-	RootCAFile             string
+	*kubectrlmgrconfig.SAControllerConfiguration
 }

 // AddFlags adds flags related to ServiceAccountController for controller manager to the specified FlagSet
--- a/cmd/kube-controller-manager/app/options/ttlafterfinishedcontroller.go
+++ b/cmd/kube-controller-manager/app/options/ttlafterfinishedcontroller.go
@@ -24,7 +24,7 @@ import (

 // TTLAfterFinishedControllerOptions holds the TTLAfterFinishedController options.
 type TTLAfterFinishedControllerOptions struct {
-	ConcurrentTTLSyncs int32
+	*kubectrlmgrconfig.TTLAfterFinishedControllerConfiguration
 }

 // AddFlags adds flags related to TTLAfterFinishedController for controller manager to the specified FlagSet.