karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4554 from yanfeng1992/fix-member-apienable 

search add check member cluster api enable
This commit is contained in:
karmada-bot 2024-01-23 10:15:44 +08:00 committed by GitHub
parent 23c51ec08e b6ff5b8cc5
commit d508417a1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/search/controller.go
View File

@ -46,6 +46,7 @@ import (
"github.com/karmada-io/karmada/pkg/util/fedinformer"
"github.com/karmada-io/karmada/pkg/util/fedinformer/genericmanager"
"github.com/karmada-io/karmada/pkg/util/gclient"
"github.com/karmada-io/karmada/pkg/util/helper"
"github.com/karmada-io/karmada/pkg/util/restmapper"
)
@ -401,10 +402,18 @@ func (c *Controller) doCacheCluster(cluster string) error {
sci := c.InformerManager.GetSingleClusterManager(cluster)
for gvr := range cr.resources {
gvk, err := c.restMapper.KindFor(gvr)
if err != nil {
klog.Errorf("Failed to get gvk: %v", err)
continue
}
if !helper.IsAPIEnabled(cls.Status.APIEnablements, gvk.GroupVersion().String(), gvk.Kind) {
klog.Warningf("Resource %s is not enabled for cluster %s", gvr.String(), cluster)
continue
}
klog.Infof("Add informer for %s, %v", cluster, gvr)
sci.ForResource(gvr, handler)
}
klog.Infof("Start informer for %s", cluster)
sci.Start()
_ = sci.WaitForCacheSync()
@ -486,7 +495,8 @@ func (c *Controller) updateCluster(oldObj, curObj interface{}) {
c.queue.Add(curCluster.GetName())
}
if !reflect.DeepEqual(curCluster.Spec, oldCluster.Spec) || !reflect.DeepEqual(curCluster.Labels, oldCluster.Labels) {
if !reflect.DeepEqual(curCluster.Spec, oldCluster.Spec) || !reflect.DeepEqual(curCluster.Labels, oldCluster.Labels) ||
!reflect.DeepEqual(curCluster.Status.APIEnablements, oldCluster.Status.APIEnablements) {
c.queue.Add(curCluster.GetName())
}
}

10
pkg/search/proxy/controller.go
View File

@ -47,6 +47,7 @@ import (
pluginruntime "github.com/karmada-io/karmada/pkg/search/proxy/framework/runtime"
"github.com/karmada-io/karmada/pkg/search/proxy/store"
"github.com/karmada-io/karmada/pkg/util"
"github.com/karmada-io/karmada/pkg/util/helper"
"github.com/karmada-io/karmada/pkg/util/lifted"
"github.com/karmada-io/karmada/pkg/util/restmapper"
)
@ -223,6 +224,15 @@ func (ctl *Controller) reconcile(util.QueueKey) error {
}
for resource, multiNS := range matchedResources {
gvk, err := ctl.restMapper.KindFor(resource)
if err != nil {
klog.Errorf("Failed to get gvk: %v", err)
continue
}
if !helper.IsAPIEnabled(cluster.Status.APIEnablements, gvk.GroupVersion().String(), gvk.Kind) {
klog.Warningf("Resource %s is not enabled for cluster %s", resource.String(), cluster)
continue
}
resourcesByClusters[cluster.Name][resource] = multiNS
}
}

19
pkg/search/proxy/controller_test.go
View File

@ -510,9 +510,28 @@ func TestController_Connect_Error(t *testing.T) {
func newCluster(name string) *clusterv1alpha1.Cluster {
c := &clusterv1alpha1.Cluster{}
clusterEnablements := []clusterv1alpha1.APIEnablement{
{
GroupVersion: "v1",
Resources: []clusterv1alpha1.APIResource{
{
Kind: "Pod",
},
},
},
{
GroupVersion: "v1",
Resources: []clusterv1alpha1.APIResource{
{
Kind: "Node",
},
},
},
}
c.Name = name
conditions := make([]metav1.Condition, 0, 1)
conditions = append(conditions, util.NewCondition(clusterv1alpha1.ClusterConditionReady, "", "", metav1.ConditionTrue))
c.Status.Conditions = conditions
c.Status.APIEnablements = clusterEnablements
return c
}