batteries: show possible batteries in --help

Signed-off-by: Dr. Stefan Schimanski <stefan.schimanski@gmail.com>

Author: sttts

server/batteries/options.go

@@ -18,10 +18,12 @@ package batteries
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/spf13/pflag"
 
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/apimachinery/pkg/util/sets"
 	genericfeatures "k8s.io/apiserver/pkg/features"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 )
@@ -48,7 +50,11 @@ func (s *Options) AddFlags(fs *pflag.FlagSet) {
 		return
 	}
 
-	fs.StringSliceVar(&s.Enabled, "batteries", []string{}, "The batteries to enable in the generic control-plane server.")
+	bats := sets.NewString()
+	for b := range defaultBatteries {
+		bats = bats.Insert(string(b))
+	}
+	fs.StringSliceVar(&s.Enabled, "batteries", []string{}, "The batteries to enable in the generic control-plane server. Possible values: "+strings.Join(bats.List(), ", "))
 }
 
 // Complete defaults fields that have not set by the consumer of this package.

server/cmd/server.go

@@ -164,6 +164,7 @@ APIs.`,
 
 	setPartialUsageAndHelpFunc(cmdStart, namedFlagSets, cols, []string{
 		"etcd-servers",
+		"batteries",
 	})
 
 	help.FitTerminal(cmdStart.OutOrStdout())
@@ -295,13 +296,3 @@ func createServerChain(config options.CompletedConfig) (*aggregatorapiserver.API
 
 	return aggregatorServer, nil
 }
-
-type ControlPlaneBattery string
-
-const (
-	ControlPlaneBatteryCore        ControlPlaneBattery = "core"
-	ControlPlaneBatteryFlowControl ControlPlaneBattery = "flowcontrol"
-	ControlPlaneBatteryRBAC        ControlPlaneBattery = "rbac"
-	ControlPlaneBatteryAdmission   ControlPlaneBattery = "admission"
-	ControlPlaneBatteryLease       ControlPlaneBattery = "lease"
-)