Clean up CLI flags

Author: carreter

cmd/agent/app/options/options.go

@@ -84,7 +84,7 @@ type GrpcProxyAgentOptions struct {
 
 	// Providing a label selector enables updating the server count by counting the
 	// number of valid leases matching the selector.
-	ServerCountLeaseSelector string
+	ServerLeaseSelector string
 	// Initial fallback server count to use if proxy server lease listing fails.
 	ServerCount uint
 	// Lease informer resync period.
@@ -134,7 +134,7 @@ func (o *GrpcProxyAgentOptions) Flags() *pflag.FlagSet {
 	flags.BoolVar(&o.SyncForever, "sync-forever", o.SyncForever, "If true, the agent continues syncing, in order to support server count changes.")
 	flags.IntVar(&o.XfrChannelSize, "xfr-channel-size", 150, "Set the size of the channel for transferring data between the agent and the proxy server.")
 	flags.UintVar(&o.ServerCount, "server-count", o.ServerCount, "Static server count, also used as fallback server count if proxy server lease listing fails.")
-	flags.StringVar(&o.ServerCountLeaseSelector, "server-count-lease-selector", o.ServerCountLeaseSelector, "Providing a label selector enables updating the server count by counting the number of valid leases matching the selector.")
+	flags.StringVar(&o.ServerLeaseSelector, "server-lease-selector", o.ServerLeaseSelector, "Providing a label selector enables updating the server count by counting the number of valid leases matching the selector.")
 	flags.DurationVar(&o.InformerResync, "informer-resync", o.InformerResync, "Lease informer resync period")
 	flags.StringVar(&o.KubeconfigPath, "kubeconfig", o.KubeconfigPath, "absolute path to the kubeconfig file (used with agent-namespace, agent-service-account, authentication-audience).")
 	return flags
@@ -213,8 +213,8 @@ func (o *GrpcProxyAgentOptions) Validate() error {
 	if err := validateAgentIdentifiers(o.AgentIdentifiers); err != nil {
 		return fmt.Errorf("agent address is invalid: %v", err)
 	}
-	if o.ServerCountLeaseSelector != "" {
-		if _, err := labels.Parse(o.ServerCountLeaseSelector); err != nil {
+	if o.ServerLeaseSelector != "" {
+		if _, err := labels.Parse(o.ServerLeaseSelector); err != nil {
 			return fmt.Errorf("invalid server count lease selector: %w", err)
 		}
 	}
@@ -269,8 +269,7 @@ func NewGrpcProxyAgentOptions() *GrpcProxyAgentOptions {
 		WarnOnChannelLimit:        false,
 		SyncForever:               false,
 		XfrChannelSize:            150,
-		ServerCount:               1,
-		ServerCountLeaseSelector:  "",
+		ServerLeaseSelector:       "",
 		InformerResync:            10 * time.Second,
 		KubeconfigPath:            "",
 	}

cmd/agent/app/server.go

@@ -137,7 +137,7 @@ func (a *Agent) runProxyConnection(o *options.GrpcProxyAgentOptions, drainCh, st
 	}
 	cc := o.ClientSetConfig(dialOptions...)
 
-	if o.ServerCountLeaseSelector != "" {
+	if o.ServerLeaseSelector != "" {
 		var k8sClient *kubernetes.Clientset
 		config, err := clientcmd.BuildConfigFromFlags("", o.KubeconfigPath)
 		if err != nil {
@@ -148,7 +148,7 @@ func (a *Agent) runProxyConnection(o *options.GrpcProxyAgentOptions, drainCh, st
 			return nil, fmt.Errorf("failed to create kubernetes clientset: %v", err)
 		}
 		sharedInformerFactory := informers.NewSharedInformerFactory(k8sClient, o.InformerResync)
-		serverLeaseSelector, err := labels.Parse(o.ServerCountLeaseSelector)
+		serverLeaseSelector, err := labels.Parse(o.ServerLeaseSelector)
 		if err != nil {
 			return nil, fmt.Errorf("invalid server count lease selector: %w", err)
 		}