Merge pull request #550 from hungnguyen243/addWICheckForNode

fix clientSet error in sanity test setup as part of adding WI check f…

Author: hungnguyen243

pkg/cloud_provider/clientset/fake.go

@@ -31,6 +31,14 @@ type FakeClientset struct {
 	fakeNode *corev1.Node
 }
 
+func NewFakeClientset() *FakeClientset {
+	fakeClientSet := &FakeClientset{}
+	// Default setting for most unit tests is pod doesn't use host network & workload identity is enabled on the node
+	fakeClientSet.CreatePod( /*hostNetworkEnabled */ false)
+	fakeClientSet.CreateNode( /* isWorkloadIdentityEnabledOnNode */ true)
+	return fakeClientSet
+}
+
 func (c *FakeClientset) ConfigurePodLister(_ string) {}
 
 func (c *FakeClientset) ConfigureNodeLister(_ string) {}
@@ -81,11 +89,13 @@ func (c *FakeClientset) CreateNode(isWorkloadIdentityEnabled bool) {
 func (c *FakeClientset) GetPod(namespace, name string) (*corev1.Pod, error) {
 	c.fakePod.ObjectMeta.Name = name
 	c.fakePod.ObjectMeta.Namespace = namespace
+
 	return c.fakePod, nil
 }
 
 func (c *FakeClientset) GetNode(name string) (*corev1.Node, error) {
 	c.fakeNode.ObjectMeta.Name = name
+
 	return c.fakeNode, nil
 }
 

pkg/csi_driver/gcs_fuse_driver_test.go

@@ -31,10 +31,6 @@ import (
 
 func initTestDriver(t *testing.T, fm *mount.FakeMounter) *GCSDriver {
 	t.Helper()
-	fakeClientSet := &clientset.FakeClientset{}
-	// Default setting for most unit tests is pod doesn't use host network & workload identity is enabled on the node
-	fakeClientSet.CreatePod( /*hostNetworkEnabled */ false)
-	fakeClientSet.CreateNode( /* isWorkloadIdentityEnabledOnNode */ true)
 	config := &GCSDriverConfig{
 		Name:                  "test-driver",
 		NodeID:                "test-node",
@@ -44,7 +40,7 @@ func initTestDriver(t *testing.T, fm *mount.FakeMounter) *GCSDriver {
 		StorageServiceManager: storage.NewFakeServiceManager(),
 		TokenManager:          auth.NewFakeTokenManager(),
 		Mounter:               fm,
-		K8sClients:            fakeClientSet,
+		K8sClients:            clientset.NewFakeClientset(),
 		MetricsManager:        &metrics.FakeMetricsManager{},
 	}
 	driver, err := NewGCSDriver(config)

test/sanity/sanity_test.go

@@ -59,7 +59,6 @@ func TestSanity(t *testing.T) {
 	}
 	defer cleanUp()
 
-	// Set up driver and env
 	driverConfig := &driver.GCSDriverConfig{
 		Name:                  driverName,
 		Version:               driverVersion,
@@ -69,7 +68,7 @@ func TestSanity(t *testing.T) {
 		StorageServiceManager: storage.NewFakeServiceManager(),
 		TokenManager:          auth.NewFakeTokenManager(),
 		Mounter:               mount.NewFakeMounter([]mount.MountPoint{}),
-		K8sClients:            &clientset.FakeClientset{},
+		K8sClients:            clientset.NewFakeClientset(),
 		MetricsManager:        &metrics.FakeMetricsManager{},
 	}