Merge pull request #5856 from XiShanYongYe-Chang/flake-TestUpdateClusterEventHandler
fix flake test of TestUpdateClusterEventHandler
This commit is contained in:
commit
8691287429
|
@ -350,9 +350,6 @@ func (c *Controller) getRegistryBackendHandler(cluster string, matchedRegistries
|
||||||
return handler, nil
|
return handler, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var controlPlaneClientBuilder = func(restConfig *rest.Config) client.Client {
|
|
||||||
return gclient.NewForConfigOrDie(restConfig)
|
|
||||||
}
|
|
||||||
var clusterDynamicClientBuilder = func(cluster string, controlPlaneClient client.Client) (*util.DynamicClusterClient, error) {
|
var clusterDynamicClientBuilder = func(cluster string, controlPlaneClient client.Client) (*util.DynamicClusterClient, error) {
|
||||||
return util.NewClusterDynamicClientSet(cluster, controlPlaneClient)
|
return util.NewClusterDynamicClientSet(cluster, controlPlaneClient)
|
||||||
}
|
}
|
||||||
|
@ -394,7 +391,7 @@ func (c *Controller) doCacheCluster(cluster string) error {
|
||||||
// STEP2: added/updated cluster, builds an informer manager for a specific cluster.
|
// STEP2: added/updated cluster, builds an informer manager for a specific cluster.
|
||||||
if !c.InformerManager.IsManagerExist(cluster) {
|
if !c.InformerManager.IsManagerExist(cluster) {
|
||||||
klog.Info("Try to build informer manager for cluster ", cluster)
|
klog.Info("Try to build informer manager for cluster ", cluster)
|
||||||
controlPlaneClient := controlPlaneClientBuilder(c.restConfig)
|
controlPlaneClient := gclient.NewForConfigOrDie(c.restConfig)
|
||||||
|
|
||||||
clusterDynamicClient, err := clusterDynamicClientBuilder(cluster, controlPlaneClient)
|
clusterDynamicClient, err := clusterDynamicClientBuilder(cluster, controlPlaneClient)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -22,7 +22,6 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
|
||||||
|
|
||||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||||
"k8s.io/apimachinery/pkg/api/meta"
|
"k8s.io/apimachinery/pkg/api/meta"
|
||||||
|
@ -30,19 +29,54 @@ import (
|
||||||
fakedynamic "k8s.io/client-go/dynamic/fake"
|
fakedynamic "k8s.io/client-go/dynamic/fake"
|
||||||
"k8s.io/client-go/kubernetes/scheme"
|
"k8s.io/client-go/kubernetes/scheme"
|
||||||
"k8s.io/client-go/rest"
|
"k8s.io/client-go/rest"
|
||||||
|
"k8s.io/client-go/restmapper"
|
||||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||||
"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
|
||||||
|
|
||||||
clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1"
|
clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1"
|
||||||
policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1"
|
policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1"
|
||||||
searchv1alpha1 "github.com/karmada-io/karmada/pkg/apis/search/v1alpha1"
|
searchv1alpha1 "github.com/karmada-io/karmada/pkg/apis/search/v1alpha1"
|
||||||
versioned "github.com/karmada-io/karmada/pkg/generated/clientset/versioned"
|
"github.com/karmada-io/karmada/pkg/generated/clientset/versioned"
|
||||||
fakekarmadaclient "github.com/karmada-io/karmada/pkg/generated/clientset/versioned/fake"
|
fakekarmadaclient "github.com/karmada-io/karmada/pkg/generated/clientset/versioned/fake"
|
||||||
informerfactory "github.com/karmada-io/karmada/pkg/generated/informers/externalversions"
|
informerfactory "github.com/karmada-io/karmada/pkg/generated/informers/externalversions"
|
||||||
"github.com/karmada-io/karmada/pkg/search/backendstore"
|
"github.com/karmada-io/karmada/pkg/search/backendstore"
|
||||||
"github.com/karmada-io/karmada/pkg/util"
|
"github.com/karmada-io/karmada/pkg/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
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) {
|
func TestNewKarmadaSearchController(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
name string
|
name string
|
||||||
|
@ -110,12 +144,9 @@ func TestAddClusterEventHandler(t *testing.T) {
|
||||||
apiEndpoint, labels = "10.0.0.1", map[string]string{}
|
apiEndpoint, labels = "10.0.0.1", map[string]string{}
|
||||||
)
|
)
|
||||||
|
|
||||||
// Wait a bit to allow addCluster
|
|
||||||
// background thread to complete its execution.
|
|
||||||
if err := upsertCluster(clientConnector, labels, apiEndpoint, clusterName, resourceVersion); err != nil {
|
if err := upsertCluster(clientConnector, labels, apiEndpoint, clusterName, resourceVersion); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -130,9 +161,6 @@ func TestAddClusterEventHandler(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
|
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add event handlers and start the informer to watch for changes.
|
|
||||||
controller.addAllEventHandlers()
|
|
||||||
informer.Start(test.stopCh)
|
informer.Start(test.stopCh)
|
||||||
defer close(test.stopCh)
|
defer close(test.stopCh)
|
||||||
|
|
||||||
|
@ -170,22 +198,16 @@ func TestUpdateClusterEventHandler(t *testing.T) {
|
||||||
apiEndpoint, oldLabels, newLabels = "10.0.0.1", map[string]string{"status": "old"}, map[string]string{"status": "new"}
|
apiEndpoint, oldLabels, newLabels = "10.0.0.1", map[string]string{"status": "old"}, map[string]string{"status": "new"}
|
||||||
)
|
)
|
||||||
|
|
||||||
// Wait a bit to allow addCluster
|
|
||||||
// background thread to complete its execution.
|
|
||||||
if err := upsertCluster(clientConnector, oldLabels, apiEndpoint, clusterName, resourceVersion); err != nil {
|
if err := upsertCluster(clientConnector, oldLabels, apiEndpoint, clusterName, resourceVersion); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit to allow updateCluster
|
|
||||||
// background thread to complete its execution.
|
|
||||||
if err := upsertCluster(clientConnector, newLabels, apiEndpoint, clusterName, updatedResourceVerison); err != nil {
|
if err := upsertCluster(clientConnector, newLabels, apiEndpoint, clusterName, updatedResourceVerison); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -200,9 +222,6 @@ func TestUpdateClusterEventHandler(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
|
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add event handlers and start the informer to watch for changes.
|
|
||||||
controller.addAllEventHandlers()
|
|
||||||
informer.Start(test.stopCh)
|
informer.Start(test.stopCh)
|
||||||
defer close(test.stopCh)
|
defer close(test.stopCh)
|
||||||
|
|
||||||
|
@ -218,25 +237,23 @@ func TestDeleteClusterEventHandler(t *testing.T) {
|
||||||
name string
|
name string
|
||||||
restConfig *rest.Config
|
restConfig *rest.Config
|
||||||
client *fakekarmadaclient.Clientset
|
client *fakekarmadaclient.Clientset
|
||||||
controlPlaneClient client.WithWatch
|
|
||||||
restMapper meta.RESTMapper
|
restMapper meta.RESTMapper
|
||||||
stopCh chan struct{}
|
stopCh chan struct{}
|
||||||
prep func(*fakekarmadaclient.Clientset, *rest.Config, meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error)
|
prep func(*fakekarmadaclient.Clientset, *rest.Config, meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error)
|
||||||
verify func(*fakekarmadaclient.Clientset, *Controller, client.Client) error
|
verify func(*fakekarmadaclient.Clientset, *Controller) error
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "AddAllEventHandlers_TriggerDeleteClusterEvent_DeletedClusterAddedToWorkQueue",
|
name: "AddAllEventHandlers_TriggerDeleteClusterEvent_DeletedClusterAddedToWorkQueue",
|
||||||
restConfig: &rest.Config{},
|
restConfig: &rest.Config{},
|
||||||
client: fakekarmadaclient.NewSimpleClientset(),
|
client: fakekarmadaclient.NewSimpleClientset(),
|
||||||
controlPlaneClient: fake.NewFakeClient(),
|
restMapper: restmapper.NewDiscoveryRESTMapper(apiGroupResources),
|
||||||
restMapper: meta.NewDefaultRESTMapper(nil),
|
|
||||||
stopCh: make(chan struct{}),
|
stopCh: make(chan struct{}),
|
||||||
prep: func(clientConnector *fakekarmadaclient.Clientset, restConfig *rest.Config, restMapper meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error) {
|
prep: func(clientConnector *fakekarmadaclient.Clientset, restConfig *rest.Config, restMapper meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error) {
|
||||||
factory := informerfactory.NewSharedInformerFactory(clientConnector, 0)
|
factory := informerfactory.NewSharedInformerFactory(clientConnector, 0)
|
||||||
controller, err := createController(restConfig, factory, restMapper)
|
controller, err := createController(restConfig, factory, restMapper)
|
||||||
return controller, factory, err
|
return controller, factory, err
|
||||||
},
|
},
|
||||||
verify: func(clientConnector *fakekarmadaclient.Clientset, controller *Controller, controlPlaneClient client.Client) error {
|
verify: func(clientConnector *fakekarmadaclient.Clientset, controller *Controller) error {
|
||||||
var (
|
var (
|
||||||
registryName, clusterName = "test-registry", "test-cluster"
|
registryName, clusterName = "test-registry", "test-cluster"
|
||||||
resourceVersion, apiEndpoint = "1000", "10.0.0.1"
|
resourceVersion, apiEndpoint = "1000", "10.0.0.1"
|
||||||
|
@ -249,15 +266,6 @@ func TestDeleteClusterEventHandler(t *testing.T) {
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
if err := clusterv1alpha1.Install(scheme.Scheme); err != nil {
|
|
||||||
return fmt.Errorf("failed to install scheme: %w", err)
|
|
||||||
}
|
|
||||||
if err := upsertClusterControllerRuntime(controlPlaneClient, labels, clusterName, apiEndpoint); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
controlPlaneClientBuilder = func(*rest.Config) client.Client {
|
|
||||||
return controlPlaneClient
|
|
||||||
}
|
|
||||||
clusterDynamicClientBuilder = func(string, client.Client) (*util.DynamicClusterClient, error) {
|
clusterDynamicClientBuilder = func(string, client.Client) (*util.DynamicClusterClient, error) {
|
||||||
return &util.DynamicClusterClient{
|
return &util.DynamicClusterClient{
|
||||||
DynamicClientSet: fakedynamic.NewSimpleDynamicClient(scheme.Scheme),
|
DynamicClientSet: fakedynamic.NewSimpleDynamicClient(scheme.Scheme),
|
||||||
|
@ -265,32 +273,23 @@ func TestDeleteClusterEventHandler(t *testing.T) {
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit to allow for addCluster background
|
|
||||||
// thread to complete its execution.
|
|
||||||
if err := upsertCluster(clientConnector, labels, apiEndpoint, clusterName, resourceVersion); err != nil {
|
if err := upsertCluster(clientConnector, labels, apiEndpoint, clusterName, resourceVersion); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit to allow for addResourceRegistry background
|
|
||||||
// thread to complete its execution.
|
|
||||||
if err := upsertResourceRegistry(clientConnector, resourceSelectors, registryName, resourceVersion, []string{clusterName}); err != nil {
|
if err := upsertResourceRegistry(clientConnector, resourceSelectors, registryName, resourceVersion, []string{clusterName}); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit to allow for deleteCluster on the controller
|
|
||||||
// background thread to complete its execution.
|
|
||||||
if err := deleteCluster(clientConnector, clusterName); err != nil {
|
if err := deleteCluster(clientConnector, clusterName); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -310,13 +309,10 @@ func TestDeleteClusterEventHandler(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
|
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add event handlers and start the informer to watch for changes.
|
|
||||||
controller.addAllEventHandlers()
|
|
||||||
informer.Start(test.stopCh)
|
informer.Start(test.stopCh)
|
||||||
defer close(test.stopCh)
|
defer close(test.stopCh)
|
||||||
|
|
||||||
if err := test.verify(test.client, controller, test.controlPlaneClient); err != nil {
|
if err := test.verify(test.client, controller); err != nil {
|
||||||
t.Errorf("failed to verify controller, got: %v", err)
|
t.Errorf("failed to verify controller, got: %v", err)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -328,25 +324,23 @@ func TestAddResourceRegistryEventHandler(t *testing.T) {
|
||||||
name string
|
name string
|
||||||
restConfig *rest.Config
|
restConfig *rest.Config
|
||||||
client *fakekarmadaclient.Clientset
|
client *fakekarmadaclient.Clientset
|
||||||
controlPlaneClient client.WithWatch
|
|
||||||
restMapper meta.RESTMapper
|
restMapper meta.RESTMapper
|
||||||
stopCh chan struct{}
|
stopCh chan struct{}
|
||||||
prep func(*fakekarmadaclient.Clientset, *rest.Config, meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error)
|
prep func(*fakekarmadaclient.Clientset, *rest.Config, meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error)
|
||||||
verify func(*fakekarmadaclient.Clientset, *Controller, client.Client) error
|
verify func(*fakekarmadaclient.Clientset, *Controller) error
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "AddAllEventHandlers_TriggerAddResourceRegistryEvent_ResourceRegistryAddedToWorkQueue",
|
name: "AddAllEventHandlers_TriggerAddResourceRegistryEvent_ResourceRegistryAddedToWorkQueue",
|
||||||
restConfig: &rest.Config{},
|
restConfig: &rest.Config{},
|
||||||
client: fakekarmadaclient.NewSimpleClientset(),
|
client: fakekarmadaclient.NewSimpleClientset(),
|
||||||
controlPlaneClient: fake.NewFakeClient(),
|
restMapper: restmapper.NewDiscoveryRESTMapper(apiGroupResources),
|
||||||
restMapper: meta.NewDefaultRESTMapper(nil),
|
|
||||||
stopCh: make(chan struct{}),
|
stopCh: make(chan struct{}),
|
||||||
prep: func(clientConnector *fakekarmadaclient.Clientset, restConfig *rest.Config, restMapper meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error) {
|
prep: func(clientConnector *fakekarmadaclient.Clientset, restConfig *rest.Config, restMapper meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error) {
|
||||||
factory := informerfactory.NewSharedInformerFactory(clientConnector, 0)
|
factory := informerfactory.NewSharedInformerFactory(clientConnector, 0)
|
||||||
controller, err := createController(restConfig, factory, restMapper)
|
controller, err := createController(restConfig, factory, restMapper)
|
||||||
return controller, factory, err
|
return controller, factory, err
|
||||||
},
|
},
|
||||||
verify: func(clientConnector *fakekarmadaclient.Clientset, controller *Controller, controlPlaneClient client.Client) error {
|
verify: func(clientConnector *fakekarmadaclient.Clientset, controller *Controller) error {
|
||||||
var (
|
var (
|
||||||
registryName, clusterName = "test-registry", "test-cluster"
|
registryName, clusterName = "test-registry", "test-cluster"
|
||||||
resourceVersion, apiEndpoint = "1000", "10.0.0.1"
|
resourceVersion, apiEndpoint = "1000", "10.0.0.1"
|
||||||
|
@ -359,9 +353,6 @@ func TestAddResourceRegistryEventHandler(t *testing.T) {
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
controlPlaneClientBuilder = func(*rest.Config) client.Client {
|
|
||||||
return controlPlaneClient
|
|
||||||
}
|
|
||||||
clusterDynamicClientBuilder = func(string, client.Client) (*util.DynamicClusterClient, error) {
|
clusterDynamicClientBuilder = func(string, client.Client) (*util.DynamicClusterClient, error) {
|
||||||
return &util.DynamicClusterClient{
|
return &util.DynamicClusterClient{
|
||||||
DynamicClientSet: fakedynamic.NewSimpleDynamicClient(scheme.Scheme),
|
DynamicClientSet: fakedynamic.NewSimpleDynamicClient(scheme.Scheme),
|
||||||
|
@ -369,22 +360,16 @@ func TestAddResourceRegistryEventHandler(t *testing.T) {
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit to allow addCluster background
|
|
||||||
// thread to complete its execution.
|
|
||||||
if err := upsertCluster(clientConnector, labels, apiEndpoint, clusterName, resourceVersion); err != nil {
|
if err := upsertCluster(clientConnector, labels, apiEndpoint, clusterName, resourceVersion); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit to allow addResourceRegistry background
|
|
||||||
// thread to complete its execution.
|
|
||||||
if err := upsertResourceRegistry(clientConnector, resourceSelectors, registryName, resourceVersion, []string{clusterName}); err != nil {
|
if err := upsertResourceRegistry(clientConnector, resourceSelectors, registryName, resourceVersion, []string{clusterName}); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -399,13 +384,10 @@ func TestAddResourceRegistryEventHandler(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
|
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add event handlers and start the informer to watch for changes.
|
|
||||||
controller.addAllEventHandlers()
|
|
||||||
informer.Start(test.stopCh)
|
informer.Start(test.stopCh)
|
||||||
defer close(test.stopCh)
|
defer close(test.stopCh)
|
||||||
|
|
||||||
if err := test.verify(test.client, controller, test.controlPlaneClient); err != nil {
|
if err := test.verify(test.client, controller); err != nil {
|
||||||
t.Errorf("failed to verify controller, got: %v", err)
|
t.Errorf("failed to verify controller, got: %v", err)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -426,7 +408,7 @@ func TestUpdateResourceRegistryEventHandler(t *testing.T) {
|
||||||
name: "AddAllEventHandlers_TriggerUpdateResourceRegistryEvent_UpdatedResourceRegistryAddedToWorkQueue",
|
name: "AddAllEventHandlers_TriggerUpdateResourceRegistryEvent_UpdatedResourceRegistryAddedToWorkQueue",
|
||||||
restConfig: &rest.Config{},
|
restConfig: &rest.Config{},
|
||||||
client: fakekarmadaclient.NewSimpleClientset(),
|
client: fakekarmadaclient.NewSimpleClientset(),
|
||||||
restMapper: meta.NewDefaultRESTMapper(nil),
|
restMapper: restmapper.NewDiscoveryRESTMapper(apiGroupResources),
|
||||||
stopCh: make(chan struct{}),
|
stopCh: make(chan struct{}),
|
||||||
prep: func(clientConnector *fakekarmadaclient.Clientset, restConfig *rest.Config, restMapper meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error) {
|
prep: func(clientConnector *fakekarmadaclient.Clientset, restConfig *rest.Config, restMapper meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error) {
|
||||||
factory := informerfactory.NewSharedInformerFactory(clientConnector, 0)
|
factory := informerfactory.NewSharedInformerFactory(clientConnector, 0)
|
||||||
|
@ -455,32 +437,30 @@ func TestUpdateResourceRegistryEventHandler(t *testing.T) {
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
// Wait a bit to allow addCluster background thread
|
clusterDynamicClientBuilder = func(string, client.Client) (*util.DynamicClusterClient, error) {
|
||||||
// to complete its execution.
|
return &util.DynamicClusterClient{
|
||||||
|
DynamicClientSet: fakedynamic.NewSimpleDynamicClient(scheme.Scheme),
|
||||||
|
ClusterName: clusterName,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
if err := upsertCluster(clientConnector, labels, apiEndpoint, clusterName, resourceVersion); err != nil {
|
if err := upsertCluster(clientConnector, labels, apiEndpoint, clusterName, resourceVersion); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit to allow addResourceRegistry background thread
|
|
||||||
// to complete its execution.
|
|
||||||
if err := upsertResourceRegistry(clientConnector, resourceSelectors, registryName, resourceVersion, []string{clusterName}); err != nil {
|
if err := upsertResourceRegistry(clientConnector, resourceSelectors, registryName, resourceVersion, []string{clusterName}); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit to allow updateResourceRegistry background thread
|
|
||||||
// to complete its execution.
|
|
||||||
if err := upsertResourceRegistry(clientConnector, resourceSelectorsUpdated, registryName, resourceVersion, []string{clusterName}); err != nil {
|
if err := upsertResourceRegistry(clientConnector, resourceSelectorsUpdated, registryName, resourceVersion, []string{clusterName}); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -495,9 +475,6 @@ func TestUpdateResourceRegistryEventHandler(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
|
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add event handlers and start the informer to watch for changes.
|
|
||||||
controller.addAllEventHandlers()
|
|
||||||
informer.Start(test.stopCh)
|
informer.Start(test.stopCh)
|
||||||
defer close(test.stopCh)
|
defer close(test.stopCh)
|
||||||
|
|
||||||
|
@ -513,25 +490,23 @@ func TestDeleteResourceRegistryEventHandler(t *testing.T) {
|
||||||
name string
|
name string
|
||||||
restConfig *rest.Config
|
restConfig *rest.Config
|
||||||
client *fakekarmadaclient.Clientset
|
client *fakekarmadaclient.Clientset
|
||||||
controlPlaneClient client.WithWatch
|
|
||||||
restMapper meta.RESTMapper
|
restMapper meta.RESTMapper
|
||||||
stopCh chan struct{}
|
stopCh chan struct{}
|
||||||
prep func(*fakekarmadaclient.Clientset, *rest.Config, meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error)
|
prep func(*fakekarmadaclient.Clientset, *rest.Config, meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error)
|
||||||
verify func(*fakekarmadaclient.Clientset, *Controller, client.Client) error
|
verify func(*fakekarmadaclient.Clientset, *Controller) error
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "AddAllEventHandlers_TriggerDeleteResourceRegistryEvent_DeletedResourceRegistryAddedToWorkQueue",
|
name: "AddAllEventHandlers_TriggerDeleteResourceRegistryEvent_DeletedResourceRegistryAddedToWorkQueue",
|
||||||
restConfig: &rest.Config{},
|
restConfig: &rest.Config{},
|
||||||
client: fakekarmadaclient.NewSimpleClientset(),
|
client: fakekarmadaclient.NewSimpleClientset(),
|
||||||
controlPlaneClient: fake.NewFakeClient(),
|
restMapper: restmapper.NewDiscoveryRESTMapper(apiGroupResources),
|
||||||
restMapper: meta.NewDefaultRESTMapper(nil),
|
|
||||||
stopCh: make(chan struct{}),
|
stopCh: make(chan struct{}),
|
||||||
prep: func(clientConnector *fakekarmadaclient.Clientset, restConfig *rest.Config, restMapper meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error) {
|
prep: func(clientConnector *fakekarmadaclient.Clientset, restConfig *rest.Config, restMapper meta.RESTMapper) (*Controller, informerfactory.SharedInformerFactory, error) {
|
||||||
factory := informerfactory.NewSharedInformerFactory(clientConnector, 0)
|
factory := informerfactory.NewSharedInformerFactory(clientConnector, 0)
|
||||||
controller, err := createController(restConfig, factory, restMapper)
|
controller, err := createController(restConfig, factory, restMapper)
|
||||||
return controller, factory, err
|
return controller, factory, err
|
||||||
},
|
},
|
||||||
verify: func(clientConnector *fakekarmadaclient.Clientset, controller *Controller, controlPlaneClient client.Client) error {
|
verify: func(clientConnector *fakekarmadaclient.Clientset, controller *Controller) error {
|
||||||
var (
|
var (
|
||||||
registryName, clusterName = "test-registry", "test-cluster"
|
registryName, clusterName = "test-registry", "test-cluster"
|
||||||
resourceVersion, apiEndpoint = "1000", "10.0.0.1"
|
resourceVersion, apiEndpoint = "1000", "10.0.0.1"
|
||||||
|
@ -544,9 +519,6 @@ func TestDeleteResourceRegistryEventHandler(t *testing.T) {
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
controlPlaneClientBuilder = func(*rest.Config) client.Client {
|
|
||||||
return controlPlaneClient
|
|
||||||
}
|
|
||||||
clusterDynamicClientBuilder = func(string, client.Client) (*util.DynamicClusterClient, error) {
|
clusterDynamicClientBuilder = func(string, client.Client) (*util.DynamicClusterClient, error) {
|
||||||
return &util.DynamicClusterClient{
|
return &util.DynamicClusterClient{
|
||||||
DynamicClientSet: fakedynamic.NewSimpleDynamicClient(scheme.Scheme),
|
DynamicClientSet: fakedynamic.NewSimpleDynamicClient(scheme.Scheme),
|
||||||
|
@ -554,32 +526,23 @@ func TestDeleteResourceRegistryEventHandler(t *testing.T) {
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit to allow addCluster
|
|
||||||
// background thread to complete its execution.
|
|
||||||
if err := upsertCluster(clientConnector, labels, apiEndpoint, clusterName, resourceVersion); err != nil {
|
if err := upsertCluster(clientConnector, labels, apiEndpoint, clusterName, resourceVersion); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit to allow addResourceRegistry
|
|
||||||
// background thread to complete its execution.
|
|
||||||
if err := upsertResourceRegistry(clientConnector, resourceSelectors, registryName, resourceVersion, []string{clusterName}); err != nil {
|
if err := upsertResourceRegistry(clientConnector, resourceSelectors, registryName, resourceVersion, []string{clusterName}); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait a bit to allow deleteResourceRegistry
|
|
||||||
// background thread to complete its execution.
|
|
||||||
if err := deleteResourceRegistry(clientConnector, registryName); err != nil {
|
if err := deleteResourceRegistry(clientConnector, registryName); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
time.Sleep(time.Millisecond * 250)
|
|
||||||
if err := cacheNextWrapper(controller); err != nil {
|
if err := cacheNextWrapper(controller); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -594,13 +557,10 @@ func TestDeleteResourceRegistryEventHandler(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
|
t.Fatalf("failed to prepare test environment for event handler setup, got: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add event handlers and start the informer to watch for changes.
|
|
||||||
controller.addAllEventHandlers()
|
|
||||||
informer.Start(test.stopCh)
|
informer.Start(test.stopCh)
|
||||||
defer close(test.stopCh)
|
defer close(test.stopCh)
|
||||||
|
|
||||||
if err := test.verify(test.client, controller, test.controlPlaneClient); err != nil {
|
if err := test.verify(test.client, controller); err != nil {
|
||||||
t.Errorf("failed to verify controller, got: %v", err)
|
t.Errorf("failed to verify controller, got: %v", err)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -660,45 +620,6 @@ func upsertCluster(client *fakekarmadaclient.Clientset, labels map[string]string
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// upsertClusterControllerRuntime creates or updates a Cluster resource using the controller-runtime
|
|
||||||
// client. The function takes labels, API endpoint, and cluster name to define the Cluster.
|
|
||||||
func upsertClusterControllerRuntime(controlPlaneClient client.Client, labels map[string]string, clusterName, apiEndpoint string) error {
|
|
||||||
cluster := &clusterv1alpha1.Cluster{
|
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
|
||||||
Name: clusterName,
|
|
||||||
Labels: labels,
|
|
||||||
},
|
|
||||||
Spec: clusterv1alpha1.ClusterSpec{
|
|
||||||
APIEndpoint: apiEndpoint,
|
|
||||||
},
|
|
||||||
Status: clusterv1alpha1.ClusterStatus{
|
|
||||||
Conditions: []metav1.Condition{
|
|
||||||
{
|
|
||||||
Type: clusterv1alpha1.ClusterConditionReady,
|
|
||||||
Status: metav1.ConditionTrue,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to create the Cluster.
|
|
||||||
err := controlPlaneClient.Create(context.TODO(), cluster)
|
|
||||||
if err == nil {
|
|
||||||
// Successfully created the Cluster.
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// If the Cluster already exists, update it.
|
|
||||||
if apierrors.IsAlreadyExists(err) {
|
|
||||||
if updateErr := controlPlaneClient.Update(context.TODO(), cluster); updateErr != nil {
|
|
||||||
return fmt.Errorf("failed to update cluster: %v", updateErr)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// upsertResourceRegistry creates or updates a ResourceRegistry resource in the Kubernetes API.
|
// upsertResourceRegistry creates or updates a ResourceRegistry resource in the Kubernetes API.
|
||||||
// It uses the provided client, resource selectors, registry name, resource version, and target cluster names.
|
// It uses the provided client, resource selectors, registry name, resource version, and target cluster names.
|
||||||
func upsertResourceRegistry(client *fakekarmadaclient.Clientset, resourceSelectors []searchv1alpha1.ResourceSelector, registryName, resourceVersion string, clusterNames []string) error {
|
func upsertResourceRegistry(client *fakekarmadaclient.Clientset, resourceSelectors []searchv1alpha1.ResourceSelector, registryName, resourceVersion string, clusterNames []string) error {
|
||||||
|
|
Loading…
Reference in New Issue