Merge pull request kubernetes-sigs#1 from fabianvf/cluster/cache

????

Author: varshaprasad96

examples/kcp/main.go

@@ -21,7 +21,10 @@ import (
 	"fmt"
 	"os"
 
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	ctrl "sigs.k8s.io/controller-runtime"
 	api "sigs.k8s.io/controller-runtime/examples/crd/pkg"
@@ -44,18 +47,41 @@ func (r *reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	log := log.FromContext(ctx).WithValues("chaospod", req.NamespacedName)
 	log.V(1).Info("reconciling chaos pod")
 
-	log.Info(fmt.Sprintf("%+v\n\n%+v\n", ctx, req))
+	fmt.Println("***************************************")
+	fmt.Println(req.ClusterName)
+	fmt.Println("***************************************")
+	// log.Info(fmt.Sprintf("%+v\n\n%+v\n", ctx, req))
 
-	var chaospod api.ChaosPod
+	chaospod := api.ChaosPod{ObjectMeta: metav1.ObjectMeta{ClusterName: req.ClusterName}}
 	if err := r.Get(ctx, req.NamespacedName, &chaospod); err != nil {
 		log.Error(err, "unable to get chaosctl")
 		return ctrl.Result{}, err
 	}
 
+	cm := &corev1.ConfigMap{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "ConfigMap",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:        "test-cm",
+			Namespace:   "default",
+			ClusterName: req.ClusterName,
+		},
+		Data: map[string]string{
+			"test-key": "test-value",
+		},
+	}
+	if err := r.Create(ctx, cm); err != nil {
+		log.Error(err, "unable to create configmap")
+		return ctrl.Result{}, err
+	}
+
 	return ctrl.Result{}, nil
 }
 
 func main() {
+
 	ctrl.SetLogger(zap.New())
 
 	cfg := ctrl.GetConfigOrDie()
@@ -73,6 +99,11 @@ func main() {
 		setupLog.Error(err, "unable to add scheme")
 		os.Exit(1)
 	}
+	err = corev1.AddToScheme(mgr.GetScheme())
+	if err != nil {
+		setupLog.Error(err, "unable to add scheme")
+		os.Exit(1)
+	}
 
 	err = ctrl.NewControllerManagedBy(mgr).
 		For(&api.ChaosPod{}).

pkg/cache/clusterscoped_cache.go

@@ -50,14 +50,18 @@ func MultiClusterCacheBuilder(clusterNames []string) NewCacheFunc {
 		caches := map[string]Cache{}
 
 		// create aglobal cache for * scope
-		gCache, err := New(config, opts)
+		globalConfig := *config
+		globalConfig.Host = globalConfig.Host + "/clusters/*"
+		gCache, err := New(&globalConfig, opts)
 		if err != nil {
 			return nil, fmt.Errorf("error creating global cache %v", err)
 		}
 
 		for _, cs := range clusterNames {
+			scopedConfig := *config
+			scopedConfig.Host = config.Host + "/clusters/" + cs
 			opts.ClusterName = cs
-			c, err := New(config, opts)
+			c, err := New(&scopedConfig, opts)
 			if err != nil {
 				return nil, err
 			}

pkg/cache/internal/cache_reader.go

@@ -29,6 +29,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/selection"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/client-go/tools/clusters"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -61,8 +62,11 @@ func (c *CacheReader) Get(_ context.Context, key client.ObjectKey, out client.Ob
 	if c.scopeName == apimeta.RESTScopeNameRoot {
 		key.Namespace = ""
 	}
-	storeKey := objectKeyToStoreKey(key, out.GetClusterName())
+	key.Name = clusters.ToClusterAwareKey(out.GetClusterName(), key.Name)
+
+	storeKey := objectKeyToStoreKey(key)
 	fmt.Println("storeKey", storeKey)
+	fmt.Println("c.Indexer.ListKeys()", c.indexer.ListKeys())
 
 	// Lookup the object from the indexer cache
 	obj, exists, err := c.indexer.GetByKey(storeKey)
@@ -184,11 +188,11 @@ func (c *CacheReader) List(_ context.Context, out client.ObjectList, opts ...cli
 // It's akin to MetaNamespaceKeyFunc.  It's separate from
 // String to allow keeping the key format easily in sync with
 // MetaNamespaceKeyFunc.
-func objectKeyToStoreKey(k client.ObjectKey, clusterName string) string {
+func objectKeyToStoreKey(k client.ObjectKey) string {
 	if k.Namespace == "" {
-		return k.Name + clusterName
+		return k.Name
 	}
-	return k.Namespace + "/" + k.Name + "/" + clusterName
+	return k.Namespace + "/" + k.Name
 }
 
 // requiresExactMatch checks if the given field selector is of the form `k=v` or `k==v`.