Merge pull request #44196 from xiangpengzhao/cmd-cleanup

cmd/kube-apiserver/app/options/options.go

@@ -137,7 +137,7 @@ func (s *ServerRunOptions) AddFlags(fs *pflag.FlagSet) {
 	// arrange these text blocks sensibly. Grrr.
 
 	fs.DurationVar(&s.EventTTL, "event-ttl", s.EventTTL,
-		"Amount of time to retain events. Default is 1h.")
+		"Amount of time to retain events.")
 
 	fs.BoolVar(&s.AllowPrivileged, "allow-privileged", s.AllowPrivileged,
 		"If true, allow privileged containers.")

federation/cmd/federation-apiserver/app/options/options.go

@@ -90,5 +90,5 @@ func (s *ServerRunOptions) AddFlags(fs *pflag.FlagSet) {
 	s.Admission.AddFlags(fs)
 
 	fs.DurationVar(&s.EventTTL, "event-ttl", s.EventTTL,
-		"Amount of time to retain events. Default is 1h.")
+		"Amount of time to retain events.")
 }

pkg/kubeapiserver/options/authentication.go

@@ -257,7 +257,7 @@ func (s *BuiltInAuthenticationOptions) AddFlags(fs *pflag.FlagSet) {
 			"The API server will query the remote service to determine authentication for bearer tokens.")
 
 		fs.DurationVar(&s.WebHook.CacheTTL, "authentication-token-webhook-cache-ttl", s.WebHook.CacheTTL,
-			"The duration to cache responses from the webhook token authenticator. Default is 2m.")
+			"The duration to cache responses from the webhook token authenticator.")
 	}
 }
 

pkg/kubeapiserver/options/authorization.go

@@ -62,11 +62,11 @@ func (s *BuiltInAuthorizationOptions) AddFlags(fs *pflag.FlagSet) {
 
 	fs.DurationVar(&s.WebhookCacheAuthorizedTTL, "authorization-webhook-cache-authorized-ttl",
 		s.WebhookCacheAuthorizedTTL,
-		"The duration to cache 'authorized' responses from the webhook authorizer. Default is 5m.")
+		"The duration to cache 'authorized' responses from the webhook authorizer.")
 
 	fs.DurationVar(&s.WebhookCacheUnauthorizedTTL,
 		"authorization-webhook-cache-unauthorized-ttl", s.WebhookCacheUnauthorizedTTL,
-		"The duration to cache 'unauthorized' responses from the webhook authorizer. Default is 30s.")
+		"The duration to cache 'unauthorized' responses from the webhook authorizer.")
 
 	fs.String("authorization-rbac-super-user", "", ""+
 		"If specified, a username which avoids RBAC authorization checks and role binding "+

pkg/kubeapiserver/options/serving.go

@@ -97,11 +97,10 @@ func (s *InsecureServingOptions) DefaultExternalAddress() (net.IP, error) {
 
 func (s *InsecureServingOptions) AddFlags(fs *pflag.FlagSet) {
 	fs.IPVar(&s.BindAddress, "insecure-bind-address", s.BindAddress, ""+
-		"The IP address on which to serve the --insecure-port (set to 0.0.0.0 for all interfaces). "+
-		"Defaults to localhost.")
+		"The IP address on which to serve the --insecure-port (set to 0.0.0.0 for all interfaces).")
 
 	fs.IntVar(&s.BindPort, "insecure-port", s.BindPort, ""+
-		"The port on which to serve unsecured, unauthenticated access. Default 8080. It is assumed "+
+		"The port on which to serve unsecured, unauthenticated access. It is assumed "+
 		"that firewall rules are set up such that this port is not reachable from outside of "+
 		"the cluster and that port 443 on the cluster's public address is proxied to this "+
 		"port. This is performed by nginx in the default setup.")

staging/src/k8s.io/apiserver/pkg/server/options/audit.go

@@ -44,7 +44,7 @@ func (o *AuditLogOptions) AddFlags(fs *pflag.FlagSet) {
 	fs.IntVar(&o.MaxBackups, "audit-log-maxbackup", o.MaxBackups,
 		"The maximum number of old audit log files to retain.")
 	fs.IntVar(&o.MaxSize, "audit-log-maxsize", o.MaxSize,
-		"The maximum size in megabytes of the audit log file before it gets rotated. Defaults to 100MB.")
+		"The maximum size in megabytes of the audit log file before it gets rotated.")
 }
 
 func (o *AuditLogOptions) ApplyTo(c *server.Config) error {

staging/src/k8s.io/apiserver/pkg/server/options/serving.go

@@ -101,7 +101,7 @@ func (s *SecureServingOptions) AddFlags(fs *pflag.FlagSet) {
 		"don't serve HTTPS at all.")
 
 	fs.StringVar(&s.ServerCert.CertDirectory, "cert-dir", s.ServerCert.CertDirectory, ""+
-		"The directory where the TLS certs are located (by default /var/run/kubernetes). "+
+		"The directory where the TLS certs are located. "+
 		"If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored.")
 
 	fs.StringVar(&s.ServerCert.CertKey.CertFile, "tls-cert-file", s.ServerCert.CertKey.CertFile, ""+