Start DynamicRESTMapperController, wire in DynRESTMapper into server

Author: gman0

pkg/server/controllers.go

@@ -56,6 +56,7 @@ import (
 
 	configuniversal "github.com/kcp-dev/kcp/config/universal"
 	bootstrappolicy "github.com/kcp-dev/kcp/pkg/authorization/bootstrap"
+	"github.com/kcp-dev/kcp/pkg/dynamicrestmapper"
 	kcpfeatures "github.com/kcp-dev/kcp/pkg/features"
 	"github.com/kcp-dev/kcp/pkg/informer"
 	permissionclaimlabler "github.com/kcp-dev/kcp/pkg/permissionclaim"
@@ -1594,6 +1595,38 @@ func (s *Server) installGarbageCollectorController(ctx context.Context, config *
 	})
 }
 
+func (s *Server) installDynamicRESTMapper(ctx context.Context, config *rest.Config) error {
+	config = rest.CopyConfig(config)
+	config = rest.AddUserAgent(config, dynamicrestmapper.ControllerName)
+
+	crdClusterClient, err := kcpapiextensionsclientset.NewForConfig(config)
+	if err != nil {
+		return err
+	}
+
+	c, err := dynamicrestmapper.NewController(ctx, s.DynRESTMapper, crdClusterClient,
+		s.ApiExtensionsSharedInformerFactory.Apiextensions().V1().CustomResourceDefinitions())
+	if err != nil {
+		return err
+	}
+
+	if err := s.registerController(&controllerWrapper{
+		Name: dynamicrestmapper.ControllerName,
+		Wait: func(ctx context.Context, s *Server) error {
+			return wait.PollUntilContextCancel(ctx, waitPollInterval, true, func(ctx context.Context) (bool, error) {
+				return s.ApiExtensionsSharedInformerFactory.Apiextensions().V1().CustomResourceDefinitions().Informer().HasSynced(), nil
+			})
+		},
+		Runner: func(ctx context.Context) {
+			c.Start(ctx, 2)
+		},
+	}); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (s *Server) WaitForSync(stop <-chan struct{}) error {
 	// Wait for shared informer factories to by synced.
 	// factory. Otherwise, informer list calls may go into backoff (before the CRDs are ready) and

pkg/server/server.go

@@ -52,6 +52,7 @@ import (
 	configshard "github.com/kcp-dev/kcp/config/shard"
 	systemcrds "github.com/kcp-dev/kcp/config/system-crds"
 	bootstrappolicy "github.com/kcp-dev/kcp/pkg/authorization/bootstrap"
+	"github.com/kcp-dev/kcp/pkg/dynamicrestmapper"
 	"github.com/kcp-dev/kcp/pkg/informer"
 	metadataclient "github.com/kcp-dev/kcp/pkg/metadata"
 	"github.com/kcp-dev/kcp/pkg/reconciler/cache/replication"
@@ -71,6 +72,7 @@ type Server struct {
 	Apis           *controlplaneapiserver.Server
 	MiniAggregator *miniaggregator.MiniAggregatorServer
 	virtual        *virtualrootapiserver.Server
+	DynRESTMapper  *dynamicrestmapper.DynamicRESTMapper
 
 	syncedCh             chan struct{}
 	rootPhase1FinishedCh chan struct{}
@@ -178,6 +180,8 @@ func NewServer(c CompletedConfig) (*Server, error) {
 		}
 	}
 
+	s.DynRESTMapper = dynamicrestmapper.NewDynamicRESTMapper(nil)
+
 	return s, nil
 }
 
@@ -191,6 +195,11 @@ func (s *Server) uninstallControllers() {
 /* Registering all controllers and informers before starting informers. */
 func (s *Server) installControllers(ctx context.Context, controllerConfig *rest.Config, gvrs map[schema.GroupVersionResource]replication.ReplicatedGVR) error {
 	logger := klog.FromContext(ctx).WithValues("component", "kcp")
+
+	if err := s.installDynamicRESTMapper(ctx, controllerConfig); err != nil {
+		return nil
+	}
+
 	if err := s.installKubeNamespaceController(ctx, controllerConfig); err != nil {
 		return err
 	}