now that tmc/ is just an empty wrapper around pkg/server, get rid of …

…it entirely

cmd/kcp/kcp.go

@@ -42,7 +42,7 @@ import (
 	"github.com/kcp-dev/kcp/pkg/cmd/help"
 	"github.com/kcp-dev/kcp/pkg/embeddedetcd"
 	kcpfeatures "github.com/kcp-dev/kcp/pkg/features"
-	tmcserver "github.com/kcp-dev/kcp/tmc/pkg/server"
+	"github.com/kcp-dev/kcp/pkg/server"
 )
 
 func main() {
@@ -83,7 +83,7 @@ func main() {
 	}
 
 	serverOptions := options.NewOptions(rootDir)
-	serverOptions.Server.Core.GenericControlPlane.Logs.Verbosity = logsapiv1.VerbosityLevel(2)
+	serverOptions.Server.GenericControlPlane.Logs.Verbosity = logsapiv1.VerbosityLevel(2)
 
 	startCmd := &cobra.Command{
 		Use:   "start",
@@ -105,7 +105,7 @@ 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.Core.GenericControlPlane.Logs, kcpfeatures.DefaultFeatureGate); err != nil {
+			if err := logsapiv1.ValidateAndApply(serverOptions.Server.GenericControlPlane.Logs, kcpfeatures.DefaultFeatureGate); err != nil {
 				return err
 			}
 
@@ -119,9 +119,9 @@ func main() {
 			}
 
 			logger := klog.FromContext(cmd.Context())
-			logger.Info("running with selected batteries", "batteries", strings.Join(completed.Server.Core.Extra.BatteriesIncluded, ","))
+			logger.Info("running with selected batteries", "batteries", strings.Join(completed.Server.Extra.BatteriesIncluded, ","))
 
-			config, err := tmcserver.NewConfig(completed.Server)
+			config, err := server.NewConfig(completed.Server)
 			if err != nil {
 				return err
 			}
@@ -134,13 +134,13 @@ func main() {
 			ctx := genericapiserver.SetupSignalContext()
 
 			// the etcd server must be up before NewServer because storage decorators access it right away
-			if completedConfig.Core.EmbeddedEtcd.Config != nil {
-				if err := embeddedetcd.NewServer(completedConfig.Core.EmbeddedEtcd).Run(ctx); err != nil {
+			if completedConfig.EmbeddedEtcd.Config != nil {
+				if err := embeddedetcd.NewServer(completedConfig.EmbeddedEtcd).Run(ctx); err != nil {
 					return err
 				}
 			}
 
-			s, err := tmcserver.NewServer(completedConfig)
+			s, err := server.NewServer(completedConfig)
 			if err != nil {
 				return err
 			}

cmd/kcp/options/options.go

@@ -22,14 +22,14 @@ import (
 	cliflag "k8s.io/component-base/cli/flag"
 
 	kcpcoreoptions "github.com/kcp-dev/kcp/cmd/kcp-core/options"
-	tmcserveroptions "github.com/kcp-dev/kcp/tmc/pkg/server/options"
+	serveroptions "github.com/kcp-dev/kcp/pkg/server/options"
 )
 
 type Options struct {
 	Output io.Writer
 
 	Generic kcpcoreoptions.GenericOptions
-	Server  tmcserveroptions.Options
+	Server  serveroptions.Options
 	Extra   ExtraOptions
 }
 
@@ -39,7 +39,7 @@ func NewOptions(rootDir string) *Options {
 	opts := &Options{
 		Output: nil,
 
-		Server:  *tmcserveroptions.NewOptions(rootDir),
+		Server:  *serveroptions.NewOptions(rootDir),
 		Generic: *kcpcoreoptions.NewGeneric(rootDir),
 		Extra:   ExtraOptions{},
 	}
@@ -51,7 +51,7 @@ type completedOptions struct {
 	Output io.Writer
 
 	Generic kcpcoreoptions.GenericOptions
-	Server  tmcserveroptions.CompletedOptions
+	Server  serveroptions.CompletedOptions
 	Extra   ExtraOptions
 }
 

test/e2e/framework/kcp.go

@@ -61,10 +61,10 @@ import (
 	kcpoptions "github.com/kcp-dev/kcp/cmd/kcp/options"
 	"github.com/kcp-dev/kcp/cmd/sharded-test-server/third_party/library-go/crypto"
 	"github.com/kcp-dev/kcp/pkg/embeddedetcd"
+	"github.com/kcp-dev/kcp/pkg/server"
 	corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
 	kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
 	kubefixtures "github.com/kcp-dev/kcp/test/e2e/fixtures/kube"
-	"github.com/kcp-dev/kcp/tmc/pkg/server"
 )
 
 // TestServerArgs returns the set of kcp args used to start a test
@@ -664,8 +664,8 @@ func (c *kcpServer) Run(opts ...RunOption) error {
 		}
 
 		// the etcd server must be up before NewServer because storage decorators access it right away
-		if completedConfig.Core.EmbeddedEtcd.Config != nil {
-			if err := embeddedetcd.NewServer(completedConfig.Core.EmbeddedEtcd).Run(ctx); err != nil {
+		if completedConfig.EmbeddedEtcd.Config != nil {
+			if err := embeddedetcd.NewServer(completedConfig.EmbeddedEtcd).Run(ctx); err != nil {
 				return err
 			}
 		}