Merge pull request #3453 from gman0/cachedresource-dynrestmapper

Use DynamicRESTMapper with CachedResource reconciler

Author: kcp-ci-bot

pkg/reconciler/cache/cachedresources/cachedresources_controller.go

@@ -42,6 +42,7 @@ import (
 	"github.com/kcp-dev/kcp/pkg/logging"
 	replicationcontroller "github.com/kcp-dev/kcp/pkg/reconciler/cache/cachedresources/replication"
 	"github.com/kcp-dev/kcp/pkg/reconciler/committer"
+	"github.com/kcp-dev/kcp/pkg/reconciler/dynamicrestmapper"
 	cachev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/cache/v1alpha1"
 	kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
 	cachev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/cache/v1alpha1"
@@ -73,6 +74,8 @@ func NewController(
 	namespaceInformer kcpcorev1informers.NamespaceClusterInformer,
 	secretInformer kcpcorev1informers.SecretClusterInformer,
 
+	dynRESTMapper *dynamicrestmapper.DynamicRESTMapper,
+
 	discoveringDynamicKcpInformers *informer.DiscoveringDynamicSharedInformerFactory,
 	cacheKcpInformers kcpinformers.SharedInformerFactory,
 
@@ -92,6 +95,8 @@ func NewController(
 		dynamicClient:      dynamicClient,
 		cacheDynamicClient: cacheDynamicClient,
 
+		dynRESTMapper: dynRESTMapper,
+
 		discoveringDynamicKcpInformers: discoveringDynamicKcpInformers,
 		cacheKcpInformers:              cacheKcpInformers,
 
@@ -151,6 +156,8 @@ type Controller struct {
 	dynamicClient      kcpdynamic.ClusterInterface
 	cacheDynamicClient kcpdynamic.ClusterInterface
 
+	dynRESTMapper *dynamicrestmapper.DynamicRESTMapper
+
 	discoveringDynamicKcpInformers *informer.DiscoveringDynamicSharedInformerFactory
 	cacheKcpInformers              kcpinformers.SharedInformerFactory
 

pkg/reconciler/cache/cachedresources/cachedresources_reconcile.go

@@ -85,6 +85,7 @@ func (c *Controller) reconcile(ctx context.Context, cluster logicalcluster.Name,
 			shardName:                      c.shardName,
 			dynamicCacheClient:             c.dynamicClient,
 			kcpCacheClient:                 c.kcpCacheClient,
+			dynRESTMapper:                  c.dynRESTMapper,
 			cacheKcpInformers:              c.cacheKcpInformers,
 			discoveringDynamicKcpInformers: c.discoveringDynamicKcpInformers,
 			callback:                       c.enqueue,

pkg/reconciler/cache/cachedresources/cachedresources_reconcile_replication.go

@@ -19,7 +19,6 @@ package cachedresources
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -31,6 +30,7 @@ import (
 
 	"github.com/kcp-dev/kcp/pkg/informer"
 	replicationcontroller "github.com/kcp-dev/kcp/pkg/reconciler/cache/cachedresources/replication"
+	"github.com/kcp-dev/kcp/pkg/reconciler/dynamicrestmapper"
 	cachev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/cache/v1alpha1"
 	"github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions"
 	kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster"
@@ -43,6 +43,7 @@ type replication struct {
 	shardName                      string
 	dynamicCacheClient             kcpdynamic.ClusterInterface
 	kcpCacheClient                 kcpclientset.ClusterInterface
+	dynRESTMapper                  *dynamicrestmapper.DynamicRESTMapper
 	cacheKcpInformers              kcpinformers.SharedInformerFactory
 	discoveringDynamicKcpInformers *informer.DiscoveringDynamicSharedInformerFactory
 	callback                       func(obj interface{})
@@ -85,9 +86,14 @@ func (r *replication) reconcile(ctx context.Context, cachedResource *cachev1alph
 			cancel()
 			return reconcileStatusStopAndRequeue, err
 		}
-		// TODO(mjudeikis): dynamic RestMapper!
+		replicatedKind, err := r.dynRESTMapper.ForCluster(clusterName).KindFor(gvr)
+		if err != nil {
+			logger.Error(err, "Failed to get Kind for resource", "resource", gvr)
+			cancel()
+			return reconcileStatusStopAndRequeue, err
+		}
 		replicated := &replicationcontroller.ReplicatedGVR{
-			Kind:   strings.TrimSuffix(strings.Title(gvr.Resource), "s"), //nolint:staticcheck
+			Kind:   replicatedKind.Kind,
 			Local:  local.Informer(),
 			Global: global.Informer(),
 		}

pkg/server/controllers.go

@@ -1719,6 +1719,7 @@ func (s *Server) installCacheController(ctx context.Context, config *rest.Config
 		s.KubeClusterClient,
 		s.KubeSharedInformerFactory.Core().V1().Namespaces(),
 		s.KubeSharedInformerFactory.Core().V1().Secrets(),
+		s.DynRESTMapper,
 		s.DiscoveringDynamicSharedInformerFactory,
 		s.CacheKcpSharedInformerFactory,
 		cachedResourceInformer,