refactored failing registration test cases

Signed-off-by: gnana997 <[email protected]>

Author: gnana997

pkg/registration/spoke/managedcluster/claim_reconcile.go

@@ -65,7 +65,14 @@ func (r *claimReconcile) exposeClaims(ctx context.Context, cluster *clusterv1.Ma
 
 	propertiesMap := map[string]*aboutv1alpha1.ClusterProperty{}
 	for _, property := range clusterProperties {
-		propertiesMap[property.Name] = property
+		propertiesMap[property.Name] = &aboutv1alpha1.ClusterProperty{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: property.Name,
+			},
+			Spec: aboutv1alpha1.ClusterPropertySpec{
+				Value: property.Spec.Value,
+			},
+		}
 	}
 	// convert claim to properties
 	for _, clusterClaim := range clusterClaims {

pkg/registration/spoke/managedcluster/claim_reconcile_test.go

@@ -15,6 +15,9 @@ import (
 	fakekube "k8s.io/client-go/kubernetes/fake"
 	kubefake "k8s.io/client-go/kubernetes/fake"
 	clienttesting "k8s.io/client-go/testing"
+	aboutv1alpha1 "sigs.k8s.io/about-api/pkg/apis/v1alpha1"
+	aboutclusterfake "sigs.k8s.io/about-api/pkg/generated/clientset/versioned/fake"
+	aboutinformers "sigs.k8s.io/about-api/pkg/generated/informers/externalversions"
 
 	clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake"
 	clusterscheme "open-cluster-management.io/api/client/cluster/clientset/versioned/scheme"
@@ -34,6 +37,7 @@ func TestSync(t *testing.T) {
 	cases := []struct {
 		name            string
 		cluster         runtime.Object
+		properties      []runtime.Object
 		claims          []runtime.Object
 		validateActions func(t *testing.T, actions []clienttesting.Action)
 		expectedErr     string
@@ -52,6 +56,16 @@ func TestSync(t *testing.T) {
 		{
 			name:    "sync a joined managed cluster",
 			cluster: testinghelpers.NewJoinedManagedCluster(),
+			properties: []runtime.Object{
+				&aboutv1alpha1.ClusterProperty{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "name",
+					},
+					Spec: aboutv1alpha1.ClusterPropertySpec{
+						Value: "test",
+					},
+				},
+			},
 			claims: []runtime.Object{
 				&clusterv1alpha1.ClusterClaim{
 					ObjectMeta: metav1.ObjectMeta{
@@ -71,6 +85,10 @@ func TestSync(t *testing.T) {
 					t.Fatal(err)
 				}
 				expected := []clusterv1.ManagedClusterClaim{
+					{
+						Name:  "name",
+						Value: "tests",
+					},
 					{
 						Name:  "a",
 						Value: "b",
@@ -97,11 +115,16 @@ func TestSync(t *testing.T) {
 			}
 
 			clusterClient := clusterfake.NewSimpleClientset(objects...)
+			aboutClusterClient := aboutclusterfake.NewSimpleClientset(objects...)
+			clusterPropertyInformerFactory := aboutinformers.NewSharedInformerFactory(aboutClusterClient, time.Minute*10)
 			clusterInformerFactory := clusterinformers.NewSharedInformerFactory(clusterClient, time.Minute*10)
 			if c.cluster != nil {
 				if err := clusterInformerFactory.Cluster().V1().ManagedClusters().Informer().GetStore().Add(c.cluster); err != nil {
 					t.Fatal(err)
 				}
+				if err := clusterPropertyInformerFactory.About().V1alpha1().ClusterProperties().Informer().GetStore().Add(c.cluster); err != nil {
+					t.Fatal(err)
+				}
 			}
 
 			for _, claim := range c.claims {
@@ -110,6 +133,12 @@ func TestSync(t *testing.T) {
 				}
 			}
 
+			for _, property := range c.properties {
+				if err := clusterPropertyInformerFactory.About().V1alpha1().ClusterProperties().Informer().GetStore().Add(property); err != nil {
+					t.Fatal(err)
+				}
+			}
+
 			fakeHubClient := fakekube.NewSimpleClientset()
 			ctx := context.TODO()
 			hubEventRecorder, err := helpers.NewEventRecorder(ctx,
@@ -123,6 +152,7 @@ func TestSync(t *testing.T) {
 				clusterInformerFactory.Cluster().V1().ManagedClusters(),
 				discoveryClient,
 				clusterInformerFactory.Cluster().V1alpha1().ClusterClaims(),
+				clusterPropertyInformerFactory.About().V1alpha1().ClusterProperties(),
 				kubeInformerFactory.Core().V1().Nodes(),
 				20,
 				eventstesting.NewTestingEventRecorder(t),
@@ -141,6 +171,7 @@ func TestExposeClaims(t *testing.T) {
 	cases := []struct {
 		name                   string
 		cluster                *clusterv1.ManagedCluster
+		properties             []*aboutv1alpha1.ClusterProperty
 		claims                 []*clusterv1alpha1.ClusterClaim
 		maxCustomClusterClaims int
 		validateActions        func(t *testing.T, actions []clienttesting.Action)
@@ -179,6 +210,39 @@ func TestExposeClaims(t *testing.T) {
 				}
 			},
 		},
+		{
+			name:    "sync properties into status of the managed cluster",
+			cluster: testinghelpers.NewJoinedManagedCluster(),
+			properties: []*aboutv1alpha1.ClusterProperty{
+				{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "a",
+					},
+					Spec: aboutv1alpha1.ClusterPropertySpec{
+						Value: "b",
+					},
+				},
+			},
+			validateActions: func(t *testing.T, actions []clienttesting.Action) {
+				testingcommon.AssertActions(t, actions, "patch")
+				patch := actions[0].(clienttesting.PatchAction).GetPatch()
+				cluster := &clusterv1.ManagedCluster{}
+				err := json.Unmarshal(patch, cluster)
+				if err != nil {
+					t.Fatal(err)
+				}
+				expected := []clusterv1.ManagedClusterClaim{
+					{
+						Name:  "a",
+						Value: "b",
+					},
+				}
+				actual := cluster.Status.ClusterClaims
+				if !reflect.DeepEqual(actual, expected) {
+					t.Errorf("expected cluster claim %v but got: %v", expected, actual)
+				}
+			},
+		},
 		{
 			name:    "truncate custom cluster claims",
 			cluster: testinghelpers.NewJoinedManagedCluster(),
@@ -324,11 +388,16 @@ func TestExposeClaims(t *testing.T) {
 			}
 
 			clusterClient := clusterfake.NewSimpleClientset(objects...)
+			aboutClusterClient := aboutclusterfake.NewSimpleClientset(objects...)
+			clusterPropertyInformerFactory := aboutinformers.NewSharedInformerFactory(aboutClusterClient, time.Minute*10)
 			clusterInformerFactory := clusterinformers.NewSharedInformerFactory(clusterClient, time.Minute*10)
 			if c.cluster != nil {
 				if err := clusterInformerFactory.Cluster().V1().ManagedClusters().Informer().GetStore().Add(c.cluster); err != nil {
 					t.Fatal(err)
 				}
+				if err := clusterPropertyInformerFactory.About().V1alpha1().ClusterProperties().Informer().GetStore().Add(c.cluster); err != nil {
+					t.Fatal(err)
+				}
 			}
 
 			for _, claim := range c.claims {
@@ -337,6 +406,12 @@ func TestExposeClaims(t *testing.T) {
 				}
 			}
 
+			for _, property := range c.properties {
+				if err := clusterPropertyInformerFactory.About().V1alpha1().ClusterProperties().Informer().GetStore().Add(property); err != nil {
+					t.Fatal(err)
+				}
+			}
+
 			if c.maxCustomClusterClaims == 0 {
 				c.maxCustomClusterClaims = 20
 			}
@@ -354,6 +429,7 @@ func TestExposeClaims(t *testing.T) {
 				clusterInformerFactory.Cluster().V1().ManagedClusters(),
 				discoveryClient,
 				clusterInformerFactory.Cluster().V1alpha1().ClusterClaims(),
+				clusterPropertyInformerFactory.About().V1alpha1().ClusterProperties(),
 				kubeInformerFactory.Core().V1().Nodes(),
 				c.maxCustomClusterClaims,
 				eventstesting.NewTestingEventRecorder(t),

pkg/registration/spoke/managedcluster/joining_controller_test.go

@@ -13,6 +13,8 @@ import (
 	fakekube "k8s.io/client-go/kubernetes/fake"
 	kubefake "k8s.io/client-go/kubernetes/fake"
 	clienttesting "k8s.io/client-go/testing"
+	aboutclusterfake "sigs.k8s.io/about-api/pkg/generated/clientset/versioned/fake"
+	aboutinformers "sigs.k8s.io/about-api/pkg/generated/informers/externalversions"
 
 	clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake"
 	clusterscheme "open-cluster-management.io/api/client/cluster/clientset/versioned/scheme"
@@ -73,12 +75,18 @@ func TestSyncManagedCluster(t *testing.T) {
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
 			clusterClient := clusterfake.NewSimpleClientset(c.startingObjects...)
+			aboutClusterClient := aboutclusterfake.NewSimpleClientset(c.startingObjects...)
+			clusterPropertyInformerFactory := aboutinformers.NewSharedInformerFactory(aboutClusterClient, time.Minute*10)
 			clusterInformerFactory := clusterinformers.NewSharedInformerFactory(clusterClient, time.Minute*10)
+			clusterPropertyStore := clusterPropertyInformerFactory.About().V1alpha1().ClusterProperties().Informer().GetStore()
 			clusterStore := clusterInformerFactory.Cluster().V1().ManagedClusters().Informer().GetStore()
 			for _, cluster := range c.startingObjects {
 				if err := clusterStore.Add(cluster); err != nil {
 					t.Fatal(err)
 				}
+				if err := clusterPropertyStore.Add(cluster); err != nil {
+					t.Fatal(err)
+				}
 			}
 
 			fakeHubClient := fakekube.NewSimpleClientset()
@@ -94,6 +102,7 @@ func TestSyncManagedCluster(t *testing.T) {
 				clusterInformerFactory.Cluster().V1().ManagedClusters(),
 				discoveryClient,
 				clusterInformerFactory.Cluster().V1alpha1().ClusterClaims(),
+				clusterPropertyInformerFactory.About().V1alpha1().ClusterProperties(),
 				kubeInformerFactory.Core().V1().Nodes(),
 				20,
 				eventstesting.NewTestingEventRecorder(t),

pkg/registration/spoke/managedcluster/resource_reconcile_test.go

@@ -19,6 +19,8 @@ import (
 	kubefake "k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/rest"
 	clienttesting "k8s.io/client-go/testing"
+	aboutclusterfake "sigs.k8s.io/about-api/pkg/generated/clientset/versioned/fake"
+	aboutinformers "sigs.k8s.io/about-api/pkg/generated/informers/externalversions"
 
 	clusterfake "open-cluster-management.io/api/client/cluster/clientset/versioned/fake"
 	clusterscheme "open-cluster-management.io/api/client/cluster/clientset/versioned/scheme"
@@ -294,12 +296,18 @@ func TestHealthCheck(t *testing.T) {
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
 			clusterClient := clusterfake.NewSimpleClientset(c.clusters...)
+			aboutClusterClient := aboutclusterfake.NewSimpleClientset(c.clusters...)
+			clusterPropertyInformerFactory := aboutinformers.NewSharedInformerFactory(aboutClusterClient, time.Minute*10)
 			clusterInformerFactory := clusterinformers.NewSharedInformerFactory(clusterClient, time.Minute*10)
+			clusterPropertyStore := clusterPropertyInformerFactory.About().V1alpha1().ClusterProperties().Informer().GetStore()
 			clusterStore := clusterInformerFactory.Cluster().V1().ManagedClusters().Informer().GetStore()
 			for _, cluster := range c.clusters {
 				if err := clusterStore.Add(cluster); err != nil {
 					t.Fatal(err)
 				}
+				if err := clusterPropertyStore.Add(cluster); err != nil {
+					t.Fatal(err)
+				}
 			}
 
 			kubeClient := kubefake.NewSimpleClientset(c.nodes...)
@@ -328,6 +336,7 @@ func TestHealthCheck(t *testing.T) {
 				clusterInformerFactory.Cluster().V1().ManagedClusters(),
 				discoveryClient,
 				clusterInformerFactory.Cluster().V1alpha1().ClusterClaims(),
+				clusterPropertyInformerFactory.About().V1alpha1().ClusterProperties(),
 				kubeInformerFactory.Core().V1().Nodes(),
 				20,
 				eventstesting.NewTestingEventRecorder(t),

vendor/modules.txt

@@ -1819,8 +1819,10 @@ open-cluster-management.io/sdk-go/pkg/patcher
 ## explicit; go 1.22
 sigs.k8s.io/about-api/pkg/apis/v1alpha1
 sigs.k8s.io/about-api/pkg/generated/clientset/versioned
+sigs.k8s.io/about-api/pkg/generated/clientset/versioned/fake
 sigs.k8s.io/about-api/pkg/generated/clientset/versioned/scheme
 sigs.k8s.io/about-api/pkg/generated/clientset/versioned/typed/apis/v1alpha1
+sigs.k8s.io/about-api/pkg/generated/clientset/versioned/typed/apis/v1alpha1/fake
 sigs.k8s.io/about-api/pkg/generated/informers/externalversions
 sigs.k8s.io/about-api/pkg/generated/informers/externalversions/apis
 sigs.k8s.io/about-api/pkg/generated/informers/externalversions/apis/v1alpha1