leader election issue fixed for all the kcp controlelrs

Signed-off-by: sankarm <[email protected]>
kcp-dev · Apr 16, 2024 · f57951c · f57951c
1 parent f79c2d5
commit f57951c
Show file tree

Hide file tree

Showing 18 changed files with 600 additions and 552 deletions.
diff --git a/pkg/permissionclaim/permissionclaim_labeler.go b/pkg/permissionclaim/permissionclaim_labeler.go
@@ -23,7 +23,6 @@ import (
  "github.com/kcp-dev/logicalcluster/v3"
 
  "k8s.io/apimachinery/pkg/runtime/schema"
- "k8s.io/client-go/tools/cache"
  "k8s.io/klog/v2"
 
  "github.com/kcp-dev/kcp/pkg/indexers"
@@ -46,10 +45,6 @@ func NewLabeler(
  apiBindingInformer apisv1alpha1informers.APIBindingClusterInformer,
  apiExportInformer, globalAPIExportInformer apisv1alpha1informers.APIExportClusterInformer,
 ) *Labeler {
- indexers.AddIfNotPresentOrDie(apiExportInformer.Informer().GetIndexer(), cache.Indexers{
- indexers.ByLogicalClusterPathAndName: indexers.IndexByLogicalClusterPathAndName,
- })
-
  return &Labeler{
  listAPIBindingsAcceptingClaimedGroupResource: func(clusterName logicalcluster.Name, groupResource schema.GroupResource) ([]*apisv1alpha1.APIBinding, error) {
  indexKey := indexers.ClusterAndGroupResourceValue(clusterName, groupResource)

diff --git a/pkg/reconciler/apis/apibinding/apibinding_controller.go b/pkg/reconciler/apis/apibinding/apibinding_controller.go
@@ -164,21 +164,6 @@ func NewController(
 
  logger := logging.WithReconciler(klog.Background(), ControllerName)
 
- // APIBinding indexers
- indexers.AddIfNotPresentOrDie(apiBindingInformer.Informer().GetIndexer(), cache.Indexers{
- indexers.APIBindingsByAPIExport: indexers.IndexAPIBindingByAPIExport,
- })
-
- // APIExport indexers
- indexers.AddIfNotPresentOrDie(apiExportInformer.Informer().GetIndexer(), cache.Indexers{
- indexers.ByLogicalClusterPathAndName: indexers.IndexByLogicalClusterPathAndName,
- indexAPIExportsByAPIResourceSchema: indexAPIExportsByAPIResourceSchemasFunc,
- })
- indexers.AddIfNotPresentOrDie(globalAPIExportInformer.Informer().GetIndexer(), cache.Indexers{
- indexers.ByLogicalClusterPathAndName: indexers.IndexByLogicalClusterPathAndName,
- indexAPIExportsByAPIResourceSchema: indexAPIExportsByAPIResourceSchemasFunc,
- })
-
  // APIBinding handlers
  _, _ = apiBindingInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
  AddFunc: func(obj interface{}) { c.enqueueAPIBinding(objOrTombstone[*apisv1alpha1.APIBinding](obj), logger, "") },

diff --git a/pkg/reconciler/apis/apiexport/apiexport_controller.go b/pkg/reconciler/apis/apiexport/apiexport_controller.go
@@ -121,14 +121,6 @@ func NewController(
  commit: committer.NewCommitter[*APIExport, Patcher, *APIExportSpec, *APIExportStatus](kcpClusterClient.ApisV1alpha1().APIExports()),
  }
 
- indexers.AddIfNotPresentOrDie(
- apiExportInformer.Informer().GetIndexer(),
- cache.Indexers{
- indexers.APIExportByIdentity: indexers.IndexAPIExportByIdentity,
- indexers.APIExportBySecret: indexers.IndexAPIExportBySecret,
- },
- )
-
  _, _ = apiExportInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
  AddFunc: func(obj interface{}) {
  c.enqueueAPIExport(obj.(*apisv1alpha1.APIExport))

diff --git a/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_controller.go b/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_controller.go
@@ -100,14 +100,6 @@ func NewController(
  commit: committer.NewCommitter[*APIExportEndpointSlice, Patcher, *APIExportEndpointSliceSpec, *APIExportEndpointSliceStatus](kcpClusterClient.ApisV1alpha1().APIExportEndpointSlices()),
  }
 
- indexers.AddIfNotPresentOrDie(globalAPIExportClusterInformer.Informer().GetIndexer(), cache.Indexers{
- indexers.ByLogicalClusterPathAndName: indexers.IndexByLogicalClusterPathAndName,
- })
-
- indexers.AddIfNotPresentOrDie(apiExportEndpointSliceClusterInformer.Informer().GetIndexer(), cache.Indexers{
- indexAPIExportEndpointSliceByAPIExport: indexAPIExportEndpointSliceByAPIExportFunc,
- })
-
  _, _ = apiExportEndpointSliceClusterInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
  AddFunc: func(obj interface{}) {
  c.enqueueAPIExportEndpointSlice(obj)
@@ -158,10 +150,6 @@ func NewController(
  },
  )
 
- indexers.AddIfNotPresentOrDie(apiExportEndpointSliceClusterInformer.Informer().GetIndexer(), cache.Indexers{
- indexAPIExportEndpointSlicesByPartition: indexAPIExportEndpointSlicesByPartitionFunc,
- })
-
  return c, nil
 }
 

diff --git a/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_indexes.go b/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_indexes.go
@@ -16,51 +16,7 @@ limitations under the License.
 
 package apiexportendpointslice
 
-import (
- "fmt"
-
- "github.com/kcp-dev/logicalcluster/v3"
-
- apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
- "github.com/kcp-dev/kcp/sdk/client"
-)
-
 const (
  indexAPIExportEndpointSliceByAPIExport = "indexAPIExportEndpointSliceByAPIExport"
  indexAPIExportEndpointSlicesByPartition = "indexAPIExportEndpointSlicesByPartition"
 )
-
-// indexAPIExportEndpointSliceByAPIExportFunc indexes the APIExportEndpointSlice by their APIExport's Reference Path and Name.
-func indexAPIExportEndpointSliceByAPIExportFunc(obj interface{}) ([]string, error) {
- apiExportEndpointSlice, ok := obj.(*apisv1alpha1.APIExportEndpointSlice)
- if !ok {
- return []string{}, fmt.Errorf("obj %T is not an APIExportEndpointSlice", obj)
- }
-
- path := logicalcluster.NewPath(apiExportEndpointSlice.Spec.APIExport.Path)
- if path.Empty() {
- path = logicalcluster.From(apiExportEndpointSlice).Path()
- }
- return []string{path.Join(apiExportEndpointSlice.Spec.APIExport.Name).String()}, nil
-}
-
-// indexAPIExportEndpointSlicesByPartitionFunc is an index function that maps a Partition to the key for its
-// spec.partition.
-func indexAPIExportEndpointSlicesByPartitionFunc(obj interface{}) ([]string, error) {
- slice, ok := obj.(*apisv1alpha1.APIExportEndpointSlice)
- if !ok {
- return []string{}, fmt.Errorf("obj is supposed to be an APIExportEndpointSlice, but is %T", obj)
- }
-
- if slice.Spec.Partition != "" {
- clusterName := logicalcluster.From(slice).Path()
- if !ok {
- // this will never happen due to validation
- return []string{}, fmt.Errorf("cluster information missing")
- }
- key := client.ToClusterAwareKey(clusterName, slice.Spec.Partition)
- return []string{key}, nil
- }
-
- return []string{}, nil
-}
diff --git a/pkg/reconciler/apis/crdcleanup/crdcleanup_controller.go b/pkg/reconciler/apis/crdcleanup/crdcleanup_controller.go
@@ -71,13 +71,6 @@ func NewController(
  },
  }
 
- indexers.AddIfNotPresentOrDie(
- apiBindingInformer.Informer().GetIndexer(),
- cache.Indexers{
- indexers.APIBindingByBoundResourceUID: indexers.IndexAPIBindingByBoundResourceUID,
- },
- )
-
  _, _ = crdInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
  FilterFunc: func(obj interface{}) bool {
  crd := obj.(*apiextensionsv1.CustomResourceDefinition)

diff --git a/pkg/reconciler/apis/extraannotationsync/apibindingannotation_controller.go b/pkg/reconciler/apis/extraannotationsync/apibindingannotation_controller.go
@@ -106,14 +106,6 @@ func NewController(
 
  logger := logging.WithReconciler(klog.Background(), ControllerName)
 
- indexers.AddIfNotPresentOrDie(apiExportInformer.Informer().GetIndexer(), cache.Indexers{
- indexers.ByLogicalClusterPathAndName: indexers.IndexByLogicalClusterPathAndName,
- })
-
- indexers.AddIfNotPresentOrDie(apiBindingInformer.Informer().GetIndexer(), cache.Indexers{
- indexers.APIBindingsByAPIExport: indexers.IndexAPIBindingByAPIExport,
- })
-
  _, _ = apiExportInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
  AddFunc: func(obj interface{}) { c.enqueueAPIExport(obj, logger) },
  UpdateFunc: func(_, obj interface{}) { c.enqueueAPIExport(obj, logger) },

diff --git a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_controller.go b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_controller.go
@@ -78,10 +78,6 @@ func NewController(
  commit: committer.NewCommitter[*APIBinding, Patcher, *APIBindingSpec, *APIBindingStatus](kcpClusterClient.ApisV1alpha1().APIBindings()),
  }
 
- indexers.AddIfNotPresentOrDie(apiExportInformer.Informer().GetIndexer(), cache.Indexers{
- indexers.ByLogicalClusterPathAndName: indexers.IndexByLogicalClusterPathAndName,
- })
-
  _, _ = apiBindingInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
  AddFunc: func(obj interface{}) { c.enqueueAPIBinding(obj, logger) },
  UpdateFunc: func(_, newObj interface{}) {
@@ -125,7 +121,7 @@ func (c *controller) enqueueAPIBinding(obj interface{}, logger logr.Logger) {
  return
  }
 
- logging.WithQueueKey(logger, key).V(4).Info("queueing APIBinding")
+ logging.WithQueueKey(logger, key).V(2).Info("queueing APIBinding")
  c.queue.Add(key)
 }
 
@@ -161,7 +157,7 @@ func (c *controller) processNextWorkItem(ctx context.Context) bool {
 
  logger := logging.WithQueueKey(klog.FromContext(ctx), key)
  ctx = klog.NewContext(ctx, logger)
- logger.V(4).Info("processing key")
+ logger.V(1).Info("processing key")
 
  // No matter what, tell the queue we're done with this key, to unblock
  // other workers.

diff --git a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_controller.go b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_controller.go
@@ -31,11 +31,9 @@ import (
  "k8s.io/apimachinery/pkg/runtime/schema"
  utilruntime "k8s.io/apimachinery/pkg/util/runtime"
  "k8s.io/apimachinery/pkg/util/wait"
- "k8s.io/client-go/tools/cache"
  "k8s.io/client-go/util/workqueue"
  "k8s.io/klog/v2"
 
- "github.com/kcp-dev/kcp/pkg/indexers"
  "github.com/kcp-dev/kcp/pkg/informer"
  "github.com/kcp-dev/kcp/pkg/logging"
  "github.com/kcp-dev/kcp/pkg/permissionclaim"
@@ -55,14 +53,6 @@ func NewResourceController(
  apiBindingInformer apisv1alpha1informers.APIBindingClusterInformer,
  apiExportInformer, globalAPIExportInformer apisv1alpha1informers.APIExportClusterInformer,
 ) (*resourceController, error) {
- if err := apiBindingInformer.Informer().GetIndexer().AddIndexers(
- cache.Indexers{
- indexers.APIBindingByClusterAndAcceptedClaimedGroupResources: indexers.IndexAPIBindingByClusterAndAcceptedClaimedGroupResources,
- },
- ); err != nil {
- return nil, err
- }
-
  c := &resourceController{
  queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), ResourceControllerName),
  kcpClusterClient: kcpClusterClient,
@@ -102,7 +92,7 @@ func (c *resourceController) enqueueForResource(logger logr.Logger, gvr schema.G
  }
 
  queueKey += "::" + key
- logging.WithQueueKey(logger, queueKey).V(4).Info("queuing resource")
+ logging.WithQueueKey(logger, queueKey).V(2).Info("queuing resource")
  c.queue.Add(queueKey)
 }
 
@@ -138,7 +128,7 @@ func (c *resourceController) processNextWorkItem(ctx context.Context) bool {
 
  logger := logging.WithQueueKey(klog.FromContext(ctx), key)
  ctx = klog.NewContext(ctx, logger)
- logger.V(4).Info("processing key")
+ logger.V(1).Info("processing key")
 
  // No matter what, tell the queue we're done with this key, to unblock
  // other workers.

diff --git a/pkg/reconciler/cache/labelclusterrolebindings/labelclusterrolebinding_controller.go b/pkg/reconciler/cache/labelclusterrolebindings/labelclusterrolebinding_controller.go
@@ -38,7 +38,6 @@ import (
  "k8s.io/client-go/util/workqueue"
  "k8s.io/klog/v2"
 
- "github.com/kcp-dev/kcp/pkg/indexers"
  "github.com/kcp-dev/kcp/pkg/logging"
  "github.com/kcp-dev/kcp/pkg/reconciler/cache/labelclusterroles"
  "github.com/kcp-dev/kcp/pkg/reconciler/cache/replication"
@@ -83,10 +82,6 @@ func NewController(
  commit: committer.NewStatuslessCommitter[*rbacv1.ClusterRoleBinding, rbacclientv1.ClusterRoleBindingInterface](kubeClusterClient.RbacV1().ClusterRoleBindings(), committer.ShallowCopy[rbacv1.ClusterRoleBinding]),
  }
 
- indexers.AddIfNotPresentOrDie(clusterRoleBindingInformer.Informer().GetIndexer(), cache.Indexers{
- labelclusterroles.ClusterRoleBindingByClusterRoleName: labelclusterroles.IndexClusterRoleBindingByClusterRoleName,
- })
-
  _, _ = clusterRoleBindingInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
  FilterFunc: replication.IsNoSystemClusterName,
  Handler: cache.ResourceEventHandlerFuncs{

diff --git a/pkg/reconciler/cache/labelclusterroles/labelclusterrole_controller.go b/pkg/reconciler/cache/labelclusterroles/labelclusterrole_controller.go
@@ -38,7 +38,6 @@ import (
  "k8s.io/client-go/util/workqueue"
  "k8s.io/klog/v2"
 
- "github.com/kcp-dev/kcp/pkg/indexers"
  "github.com/kcp-dev/kcp/pkg/logging"
  "github.com/kcp-dev/kcp/pkg/reconciler/cache/replication"
  "github.com/kcp-dev/kcp/pkg/reconciler/committer"
@@ -82,10 +81,6 @@ func NewController(
  commit: committer.NewStatuslessCommitter[*rbacv1.ClusterRole, rbacclientv1.ClusterRoleInterface](kubeClusterClient.RbacV1().ClusterRoles(), committer.ShallowCopy[rbacv1.ClusterRole]),
  }
 
- indexers.AddIfNotPresentOrDie(clusterRoleBindingInformer.Informer().GetIndexer(), cache.Indexers{
- ClusterRoleBindingByClusterRoleName: IndexClusterRoleBindingByClusterRoleName,
- })
-
  _, _ = clusterRoleInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
  FilterFunc: replication.IsNoSystemClusterName,
  Handler: cache.ResourceEventHandlerFuncs{