improve variable naming, get rid of misleading TODO

On-behalf-of: @SAP [email protected]

Author: xrstf

cmd/kcp/kcp.go

@@ -78,8 +78,8 @@ func main() {
 		}
 	}
 
-	serverOptions := options.NewOptions(rootDir)
-	serverOptions.Server.GenericControlPlane.Logs.Verbosity = logsapiv1.VerbosityLevel(2)
+	kcpOptions := options.NewOptions(rootDir)
+	kcpOptions.Server.GenericControlPlane.Logs.Verbosity = logsapiv1.VerbosityLevel(2)
 
 	startCmd := &cobra.Command{
 		Use:   "start",
@@ -101,30 +101,30 @@ func main() {
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// run as early as possible to avoid races later when some components (e.g. grpc) start early using klog
-			if err := logsapiv1.ValidateAndApply(serverOptions.Server.GenericControlPlane.Logs, kcpfeatures.DefaultFeatureGate); err != nil {
+			if err := logsapiv1.ValidateAndApply(kcpOptions.Server.GenericControlPlane.Logs, kcpfeatures.DefaultFeatureGate); err != nil {
 				return err
 			}
 
-			completed, err := serverOptions.Complete()
+			completedKcpOptions, err := kcpOptions.Complete()
 			if err != nil {
 				return err
 			}
 
-			if errs := completed.Validate(); len(errs) > 0 {
+			if errs := completedKcpOptions.Validate(); len(errs) > 0 {
 				return errors.NewAggregate(errs)
 			}
 
 			logger := klog.FromContext(cmd.Context())
-			logger.Info("running with selected batteries", "batteries", strings.Join(completed.Server.Extra.BatteriesIncluded, ","))
+			logger.Info("running with selected batteries", "batteries", strings.Join(completedKcpOptions.Server.Extra.BatteriesIncluded, ","))
 
 			ctx := genericapiserver.SetupSignalContext()
 
-			serverConfig, err := server.NewConfig(ctx, completed.Server)
+			serverConfig, err := server.NewConfig(ctx, completedKcpOptions.Server)
 			if err != nil {
 				return err
 			}
 
-			completedConfig, err := config.Complete()
+			completedConfig, err := serverConfig.Complete()
 			if err != nil {
 				return err
 			}
@@ -146,7 +146,7 @@ func main() {
 
 	// add start named flag sets to start flags
 	fss := cliflag.NamedFlagSets{}
-	serverOptions.AddFlags(&fss)
+	kcpOptions.AddFlags(&fss)
 	globalflag.AddGlobalFlags(fss.FlagSet("global"), cmd.Name(), logs.SkipLoggingConfigurationFlags())
 	startFlags := startCmd.Flags()
 	for _, f := range fss.FlagSets {

pkg/server/options/options.go

@@ -29,7 +29,6 @@ import (
 	genericapiserveroptions "k8s.io/apiserver/pkg/server/options"
 	cliflag "k8s.io/component-base/cli/flag"
 	controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver/options"
-	authzmodes "k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
 
 	kcpadmission "github.com/kcp-dev/kcp/pkg/admission"
 	etcdoptions "github.com/kcp-dev/kcp/pkg/embeddedetcd/options"
@@ -114,15 +113,6 @@ func NewOptions(rootDir string) *Options {
 
 	// override all the stuff
 	o.GenericControlPlane.SecureServing.ServerCert.CertDirectory = rootDir
-	o.GenericControlPlane.Authentication = kubeoptions.NewBuiltInAuthenticationOptions().
-		WithAnonymous().
-		WithBootstrapToken().
-		WithClientCert().
-		WithOIDC().
-		WithRequestHeader().
-		WithServiceAccounts().
-		WithTokenFile().
-		WithWebHook()
 	o.GenericControlPlane.Authentication.ServiceAccounts.Issuers = []string{"https://kcp.default.svc"}
 	o.GenericControlPlane.Etcd.StorageConfig.Transport.ServerList = []string{"embedded"}
 	o.GenericControlPlane.Authorization = nil // we have our own
@@ -315,7 +305,9 @@ func (o *Options) Complete(rootDir string) (*CompletedOptions, error) {
 	}
 	if o.GenericControlPlane.ServiceAccountSigningKeyFile == "" {
 		o.GenericControlPlane.ServiceAccountSigningKeyFile = o.Controllers.SAController.ServiceAccountKeyFile
-	completedGenericServerRunOptions, err := o.GenericControlPlane.Complete(nil, nil)
+	}
+
+	completedGenericOptions, err := o.GenericControlPlane.Complete(nil, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -354,16 +346,15 @@ func (o *Options) Complete(rootDir string) (*CompletedOptions, error) {
 	//    we already do that for cluster names (stored in the obj)
 	//  - we need to modify wildcardClusterNameRegex and crdWildcardPartialMetadataClusterNameRegex
 	o.Cache.Server.Etcd.EnableWatchCache = false
-	o.Cache.Server.SecureServing = completedGenericServerRunOptions.SecureServing
+	o.Cache.Server.SecureServing = completedGenericOptions.SecureServing
 	cacheCompletedOptions, err := o.Cache.Complete()
 	if err != nil {
 		return nil, err
 	}
 
 	return &CompletedOptions{
 		completedOptions: &completedOptions{
-			// TODO: GenericControlPlane here should be completed. But the k/k repo does not expose the CompleteOptions type, but should.
-			GenericControlPlane: completedGenericServerRunOptions,
+			GenericControlPlane: completedGenericOptions,
 			EmbeddedEtcd:        completedEmbeddedEtcd,
 			Controllers:         o.Controllers,
 			Authorization:       o.Authorization,