update some tests

Signed-off-by: Ajay Mishra <ajmishra@nvidia.com>

Author: XRFXLP

node-drainer/pkg/informers/informers_test.go

@@ -24,9 +24,11 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/utils/ptr"
+	"sigs.k8s.io/controller-runtime/pkg/envtest"
 
 	"github.com/nvidia/nvsentinel/data-models/pkg/model"
 	"github.com/nvidia/nvsentinel/fault-quarantine/pkg/common"
@@ -249,13 +251,18 @@ func TestEventRecorderAggregatesNodeEvents(t *testing.T) {
 	ctx, cancel := context.WithCancel(t.Context())
 	defer cancel()
 
-	node := &v1.Node{
-		ObjectMeta: metav1.ObjectMeta{
-			Name: "node-a",
-			UID:  types.UID("node-uid"),
-		},
-	}
-	client := fake.NewSimpleClientset(node)
+	testEnv := envtest.Environment{}
+	cfg, err := testEnv.Start()
+	require.NoError(t, err)
+	t.Cleanup(func() { require.NoError(t, testEnv.Stop()) })
+
+	client, err := kubernetes.NewForConfig(cfg)
+	require.NoError(t, err)
+	node, err := client.CoreV1().Nodes().Create(ctx, &v1.Node{
+		ObjectMeta: metav1.ObjectMeta{Name: "node-a"},
+	}, metav1.CreateOptions{})
+	require.NoError(t, err)
+
 	informers, err := NewInformers(client, 0, ptr.To(5), false, false, "")
 	require.NoError(t, err)
 	require.NoError(t, informers.Run(ctx))

node-drainer/pkg/reconciler/reconciler_integration_test.go

@@ -504,7 +504,7 @@ func TestReconciler_ProcessEvent(t *testing.T) {
 				assert.Error(t, err)
 				assert.Contains(t, err.Error(), "waiting for pods to complete")
 
-				nodeEvent := requireSingleNodeEvent(t, client, ctx, nodeName)
+				nodeEvent := requireSingleNodeEvent(t, client, ctx, nodeName, 5)
 				require.Equal(t, v1.EventTypeNormal, nodeEvent.Type)
 				require.Equal(t, "AwaitingPodCompletion", nodeEvent.Reason)
 				expectedMessage := "Waiting for following pods to finish: [completion-test/running-pod-1]"
@@ -660,7 +660,7 @@ func TestReconciler_ProcessEvent(t *testing.T) {
 				assert.Error(t, err)
 				assert.Contains(t, err.Error(), "failed timeout eviction for node test-node: waiting for 1 pods to complete or timeout")
 
-				nodeEvent := requireSingleNodeEvent(t, client, ctx, nodeName)
+				nodeEvent := requireSingleNodeEvent(t, client, ctx, nodeName, 1)
 				require.Equal(t, v1.EventTypeNormal, nodeEvent.Type)
 				require.Equal(t, "WaitingBeforeForceDelete", nodeEvent.Reason)
 				expectedMessage := "Waiting for following pods to finish: [pod-1] in namespace: [timeout-test] or they will be force deleted on:"
@@ -890,7 +890,7 @@ func TestReconciler_ProcessEvent(t *testing.T) {
 				assert.Error(t, err)
 				assert.Contains(t, err.Error(), "waiting for pods to complete")
 
-				nodeEvent := requireSingleNodeEvent(t, client, ctx, nodeName)
+				nodeEvent := requireSingleNodeEvent(t, client, ctx, nodeName, 5)
 				require.Equal(t, v1.EventTypeNormal, nodeEvent.Type)
 				require.Equal(t, "AwaitingPodCompletion", nodeEvent.Reason)
 				expectedMessage := "Waiting for following pods to finish: [completion-test/running-pod-1 completion-test/running-pod-2 completion-test/running-pod-3]"
@@ -1396,6 +1396,7 @@ func requireSingleNodeEvent(
 	client kubernetes.Interface,
 	ctx context.Context,
 	nodeName string,
+	expectedCount int32,
 ) v1.Event {
 	t.Helper()
 
@@ -1404,12 +1405,13 @@ func requireSingleNodeEvent(
 	}
 	require.Eventually(t, func() bool {
 		nodeEvents, err := client.CoreV1().Events(metav1.NamespaceDefault).List(ctx, eventListOptions)
-		return err == nil && len(nodeEvents.Items) == 1
-	}, 5*time.Second, 50*time.Millisecond, "node event should be recorded asynchronously")
+		return err == nil && len(nodeEvents.Items) == 1 && nodeEvents.Items[0].Count == expectedCount
+	}, 5*time.Second, 50*time.Millisecond, "node event should be recorded asynchronously with count %d", expectedCount)
 
 	nodeEvents, err := client.CoreV1().Events(metav1.NamespaceDefault).List(ctx, eventListOptions)
 	require.NoError(t, err)
 	require.Len(t, nodeEvents.Items, 1, "only one event should be created despite multiple reconciliations")
+	require.Equal(t, expectedCount, nodeEvents.Items[0].Count)
 
 	return nodeEvents.Items[0]
 }