go.mod changes

Fix failing unit tests due to missing kubeconfig in unit test environment

Remove commented out debug statements and fix list volume for non-MT clsuters

Fix list instances call by adding back the main project call

Author: cemakd

go.mod

@@ -116,8 +116,6 @@ require (
 	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
 )
 
 replace k8s.io/client-go => k8s.io/client-go v0.32.2

pkg/gce-cloud-provider/compute/gce-compute.go

@@ -162,19 +162,31 @@ func (cloud *CloudProvider) listDisksInternal(ctx context.Context, fields []goog
 	}
 	disks := []*computev1.Disk{}
 
-	// listing out regional disks in the region for each project
+	klog.Infof("Getting regional disks for project: %s", cloud.project)
+	rDisks, err := listRegionalDisksForProject(cloud.service, cloud.project, region, fields, filter)
+	if err != nil {
+		return nil, "", err
+	}
+	disks = append(disks, rDisks...)
+	// listing out regional disks in the region for each tenant project
 	for p, s := range cloud.tenantServiceMap {
-		klog.Infof("Getting regional disks for project: %s", p)
+		klog.Infof("Getting regional disks for tenant project: %s", p)
 		rDisks, err := listRegionalDisksForProject(s, p, region, fields, filter)
 		if err != nil {
 			return nil, "", err
 		}
 		disks = append(disks, rDisks...)
 	}
 
-	// listing out zonal disks in all zones of the region for each project
+	klog.Infof("Getting zonal disks for project: %s", cloud.project)
+	zDisks, err := listZonalDisksForProject(cloud.service, cloud.project, zones, fields, filter)
+	if err != nil {
+		return nil, "", err
+	}
+	disks = append(disks, zDisks...)
+	// listing out zonal disks in all zones of the region for each tenant project
 	for p, s := range cloud.tenantServiceMap {
-		klog.Infof("Getting zonal disks for project: %s", p)
+		klog.Infof("Getting zonal disks for tenant project: %s", p)
 		zDisks, err := listZonalDisksForProject(s, p, zones, fields, filter)
 		if err != nil {
 			return nil, "", err
@@ -236,6 +248,11 @@ func (cloud *CloudProvider) ListInstances(ctx context.Context, fields []googleap
 		return nil, "", err
 	}
 	items := []*computev1.Instance{}
+	instances, err := cloud.listInstancesForProject(cloud.service, cloud.project, zones, fields)
+	if err != nil {
+		return nil, "", err
+	}
+	items = append(items, instances...)
 
 	for p, s := range cloud.tenantServiceMap {
 		instances, err := cloud.listInstancesForProject(s, p, zones, fields)

pkg/gce-cloud-provider/compute/gce.go

@@ -156,13 +156,6 @@ func CreateCloudProvider(ctx context.Context, vendorVersion string, configPath s
 		return nil, err
 	}
 
-	// token, err := tokenSource.Token()
-	// if err != nil {
-	// 	klog.Errorf("error getting initial token.: %v", err)
-	// } else {
-	// 	klog.Infof("test token success: %+v", token)
-	// }
-
 	svc, err := createCloudService(ctx, vendorVersion, tokenSource, computeEndpoint, computeEnvironment)
 	if err != nil {
 		return nil, err
@@ -197,7 +190,7 @@ func CreateCloudProvider(ctx context.Context, vendorVersion string, configPath s
 
 	if multiTenancyEnabled {
 		klog.Info("Setting up multitenancy")
-		ti, err := tenancy.NewTenantsInformer(multiTenancyEnabled)
+		ti, err := tenancy.NewTenantsInformer(multiTenancyEnabled, tenancy.GetKubeConfig())
 		if err != nil {
 			return nil, fmt.Errorf("failed initializing tenant informer: %w", err)
 		}

pkg/gce-cloud-provider/compute/tenancy/informer.go

@@ -42,13 +42,12 @@ var defaultResyncPeriod = 10 * time.Minute
 // tenancy.gke.io/tenants objects.
 //
 // After creating a new TenantsInformer, you must call Run() to start it.
-func NewTenantsInformer(isMultiTenantCluster bool) (TenantsInformer, error) {
+func NewTenantsInformer(isMultiTenantCluster bool, kubeConfig *rest.Config) (TenantsInformer, error) {
 	if !isMultiTenantCluster {
 		return NewNoopTenantsInformer(), nil
 	}
 
-	kc := GetKubeConfig()
-	dynamicClient, err := newDynamicClientForConfig(kc)
+	dynamicClient, err := newDynamicClientForConfig(kubeConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create dynamic client for CRD: %w", err)
 	}

pkg/gce-cloud-provider/compute/tenancy/informer_test.go

@@ -18,7 +18,7 @@ func TestNewTenantsInformer_MultiTenantCluster(t *testing.T) {
 	newDynamicClientForConfig = func(*rest.Config) (dynamic.Interface, error) {
 		return dynamicfake.NewSimpleDynamicClient(runtime.NewScheme()), nil
 	}
-	informer, err := NewTenantsInformer(true)
+	informer, err := NewTenantsInformer(true, &rest.Config{})
 	if err != nil {
 		t.Fatalf("NewTenantsInformer(true, &rest.Config{}, 1h) failed: %v", err)
 	}
@@ -34,7 +34,7 @@ func TestNewTenantsInformer_SingleTenantCluster(t *testing.T) {
 	newDynamicClientForConfig = func(*rest.Config) (dynamic.Interface, error) {
 		return dynamicfake.NewSimpleDynamicClient(runtime.NewScheme()), nil
 	}
-	informer, err := NewTenantsInformer(false)
+	informer, err := NewTenantsInformer(false, &rest.Config{})
 	if err != nil {
 		t.Fatalf("NewTenantsInformer(false, &rest.Config{}, 1h) failed: %v", err)
 	}