Skip to content

Commit

Permalink
add group/values for resources
Browse files Browse the repository at this point in the history
Signed-off-by: Mohamed Awnallah <[email protected]>
  • Loading branch information
XiShanYongYe-Chang authored and mohamedawnallah committed Nov 22, 2024
1 parent 7f7879d commit ca9cb8f
Showing 1 changed file with 47 additions and 16 deletions.
63 changes: 47 additions & 16 deletions pkg/search/controllers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,44 @@ import (
informerfactory "github.com/karmada-io/karmada/pkg/generated/informers/externalversions"
"github.com/karmada-io/karmada/pkg/search/backendstore"
"github.com/karmada-io/karmada/pkg/util"
"k8s.io/client-go/restmapper"
)

var apiGroupResources = []*restmapper.APIGroupResources{
{
Group: metav1.APIGroup{
Name: "apps",
Versions: []metav1.GroupVersionForDiscovery{
{GroupVersion: "apps/v1", Version: "v1"},
},
PreferredVersion: metav1.GroupVersionForDiscovery{
GroupVersion: "apps/v1", Version: "v1",
},
},
VersionedResources: map[string][]metav1.APIResource{
"v1": {
{Name: "deployments", SingularName: "deployment", Namespaced: true, Kind: "Deployment"},
},
},
},
{
Group: metav1.APIGroup{
Name: "",
Versions: []metav1.GroupVersionForDiscovery{
{GroupVersion: "v1", Version: "v1"},
},
PreferredVersion: metav1.GroupVersionForDiscovery{
GroupVersion: "v1", Version: "v1",
},
},
VersionedResources: map[string][]metav1.APIResource{
"v1": {
{Name: "pods", SingularName: "pod", Namespaced: true, Kind: "Pod"},
},
},
},
}

func TestNewKarmadaSearchController(t *testing.T) {
tests := []struct {
name string
Expand Down Expand Up @@ -126,8 +162,6 @@ func TestAddClusterEventHandler(t *testing.T) {
if err != nil {
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
}

// start the informer to watch for changes.
informer.Start(test.stopCh)
defer close(test.stopCh)

Expand Down Expand Up @@ -189,8 +223,6 @@ func TestUpdateClusterEventHandler(t *testing.T) {
if err != nil {
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
}

// start the informer to watch for changes.
informer.Start(test.stopCh)
defer close(test.stopCh)

Expand All @@ -215,7 +247,7 @@ func TestDeleteClusterEventHandler(t *testing.T) {
name: "AddAllEventHandlers_TriggerDeleteClusterEvent_DeletedClusterAddedToWorkQueue",
restConfig: &rest.Config{},
client: fakekarmadaclient.NewSimpleClientset(),
restMapper: meta.NewDefaultRESTMapper(nil),
restMapper: restmapper.NewDiscoveryRESTMapper(apiGroupResources),
stopCh: make(chan struct{}),
prep: func(clientConnector *fakekarmadaclient.Clientset, restConfig *rest.Config, restMapper meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error) {
factory := informerfactory.NewSharedInformerFactory(clientConnector, 0)
Expand Down Expand Up @@ -278,8 +310,6 @@ func TestDeleteClusterEventHandler(t *testing.T) {
if err != nil {
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
}

// start the informer to watch for changes.
informer.Start(test.stopCh)
defer close(test.stopCh)

Expand All @@ -304,7 +334,7 @@ func TestAddResourceRegistryEventHandler(t *testing.T) {
name: "AddAllEventHandlers_TriggerAddResourceRegistryEvent_ResourceRegistryAddedToWorkQueue",
restConfig: &rest.Config{},
client: fakekarmadaclient.NewSimpleClientset(),
restMapper: meta.NewDefaultRESTMapper(nil),
restMapper: restmapper.NewDiscoveryRESTMapper(apiGroupResources),
stopCh: make(chan struct{}),
prep: func(clientConnector *fakekarmadaclient.Clientset, restConfig *rest.Config, restMapper meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error) {
factory := informerfactory.NewSharedInformerFactory(clientConnector, 0)
Expand Down Expand Up @@ -355,8 +385,6 @@ func TestAddResourceRegistryEventHandler(t *testing.T) {
if err != nil {
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
}

// start the informer to watch for changes.
informer.Start(test.stopCh)
defer close(test.stopCh)

Expand All @@ -381,7 +409,7 @@ func TestUpdateResourceRegistryEventHandler(t *testing.T) {
name: "AddAllEventHandlers_TriggerUpdateResourceRegistryEvent_UpdatedResourceRegistryAddedToWorkQueue",
restConfig: &rest.Config{},
client: fakekarmadaclient.NewSimpleClientset(),
restMapper: meta.NewDefaultRESTMapper(nil),
restMapper: restmapper.NewDiscoveryRESTMapper(apiGroupResources),
stopCh: make(chan struct{}),
prep: func(clientConnector *fakekarmadaclient.Clientset, restConfig *rest.Config, restMapper meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error) {
factory := informerfactory.NewSharedInformerFactory(clientConnector, 0)
Expand Down Expand Up @@ -410,6 +438,13 @@ func TestUpdateResourceRegistryEventHandler(t *testing.T) {
}
)

clusterDynamicClientBuilder = func(string, client.Client) (*util.DynamicClusterClient, error) {
return &util.DynamicClusterClient{
DynamicClientSet: fakedynamic.NewSimpleDynamicClient(scheme.Scheme),
ClusterName: clusterName,
}, nil
}

if err := upsertCluster(clientConnector, labels, apiEndpoint, clusterName, resourceVersion); err != nil {
return err
}
Expand Down Expand Up @@ -441,8 +476,6 @@ func TestUpdateResourceRegistryEventHandler(t *testing.T) {
if err != nil {
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
}

// start the informer to watch for changes.
informer.Start(test.stopCh)
defer close(test.stopCh)

Expand All @@ -467,7 +500,7 @@ func TestDeleteResourceRegistryEventHandler(t *testing.T) {
name: "AddAllEventHandlers_TriggerDeleteResourceRegistryEvent_DeletedResourceRegistryAddedToWorkQueue",
restConfig: &rest.Config{},
client: fakekarmadaclient.NewSimpleClientset(),
restMapper: meta.NewDefaultRESTMapper(nil),
restMapper: restmapper.NewDiscoveryRESTMapper(apiGroupResources),
stopCh: make(chan struct{}),
prep: func(clientConnector *fakekarmadaclient.Clientset, restConfig *rest.Config, restMapper meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error) {
factory := informerfactory.NewSharedInformerFactory(clientConnector, 0)
Expand Down Expand Up @@ -525,8 +558,6 @@ func TestDeleteResourceRegistryEventHandler(t *testing.T) {
if err != nil {
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
}

// start the informer to watch for changes.
informer.Start(test.stopCh)
defer close(test.stopCh)

Expand Down

0 comments on commit ca9cb8f

Please sign in to comment.