Performance Improvement - Reduce unstructured usages from Storage Pools (#3435)

Author: kolluria

pkg/apis/storagepool/cns/v1alpha1/storagepool_types.go

@@ -44,7 +44,7 @@ type StoragePoolStatus struct {
 	Capacity *PoolCapacity `json:"capacity,omitempty"`
 	// Error that has occurred on the storage pool. Present only when there is an error.
 	// +optional
-	Error StoragePoolError `json:"error,omitempty"`
+	Error *StoragePoolError `json:"error,omitempty"`
 	// DiskDecomm indicates the status of disk decommission for the given storagepool
 	// +optional
 	DiskDecomm map[string]string `json:"diskDecomm,omitempty"`

pkg/csi/service/wcp/controller_helper.go

@@ -35,9 +35,8 @@ import (
 	"google.golang.org/grpc/status"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/fields"
-	"k8s.io/client-go/dynamic"
+	"k8s.io/apimachinery/pkg/types"
 	api "k8s.io/kubernetes/pkg/apis/core"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	spv1alpha1 "sigs.k8s.io/vsphere-csi-driver/v3/pkg/apis/storagepool/cns/v1alpha1"
@@ -399,23 +398,24 @@ func getDatastoreURLFromStoragePool(ctx context.Context, spName string) (string,
 	}
 
 	// create a new StoragePool client.
-	spclient, err := dynamic.NewForConfig(cfg)
+	c, err := k8s.NewClientForGroup(ctx, cfg, spv1alpha1.SchemeGroupVersion.Group)
 	if err != nil {
 		return "", fmt.Errorf("failed to create StoragePool client using config. Err: %+v", err)
 	}
-	spResource := spv1alpha1.SchemeGroupVersion.WithResource("storagepools")
 
+	sp := &spv1alpha1.StoragePool{}
 	// Get StoragePool with spName.
-	sp, err := spclient.Resource(spResource).Get(ctx, spName, metav1.GetOptions{})
+	err = c.Get(ctx, types.NamespacedName{Name: spName}, sp)
 	if err != nil {
 		return "", fmt.Errorf("failed to get StoragePool with name %s: %+v", spName, err)
 	}
 
 	// extract the datastoreUrl field.
-	datastoreURL, found, err := unstructured.NestedString(sp.Object, "spec", "parameters", "datastoreUrl")
-	if !found || err != nil {
+	datastoreURL, found := sp.Spec.Parameters["datastoreUrl"]
+	if !found {
 		return "", fmt.Errorf("failed to find datastoreUrl in StoragePool %s", spName)
 	}
+
 	return datastoreURL, nil
 }
 
@@ -429,31 +429,30 @@ func getStoragePoolInfo(ctx context.Context, spName string) ([]string, string, e
 	}
 
 	// Create a new StoragePool client.
-	spClient, err := dynamic.NewForConfig(cfg)
+	c, err := k8s.NewClientForGroup(ctx, cfg, spv1alpha1.SchemeGroupVersion.Group)
 	if err != nil {
 		return nil, "", fmt.Errorf("failed to create StoragePool client using config. Err: %+v", err)
 	}
-	spResource := spv1alpha1.SchemeGroupVersion.WithResource("storagepools")
 
 	// Get StoragePool with spName.
-	sp, err := spClient.Resource(spResource).Get(ctx, spName, metav1.GetOptions{})
+	sp := &spv1alpha1.StoragePool{}
+	err = c.Get(ctx, types.NamespacedName{Name: spName}, sp)
 	if err != nil {
 		return nil, "", fmt.Errorf("failed to get StoragePool with name %s: %+v", spName, err)
 	}
 
 	// Extract the accessibleNodes field.
-	accessibleNodes, found, err := unstructured.NestedStringSlice(sp.Object, "status", "accessibleNodes")
-	if !found || err != nil {
-		return nil, "", fmt.Errorf("failed to find datastoreUrl in StoragePool %s", spName)
+	if len(sp.Status.AccessibleNodes) == 0 {
+		return nil, "", fmt.Errorf("failed to find accessible nodes in StoragePool %s", spName)
 	}
 
 	// Get the storage pool type.
-	poolType, found, err := unstructured.NestedString(sp.Object, "metadata", "labels", spTypeKey)
-	if !found || err != nil {
+	poolType, found := sp.ObjectMeta.Labels[spTypeKey]
+	if !found {
 		return nil, "", fmt.Errorf("failed to find pool type in StoragePool %s", spName)
 	}
 
-	return accessibleNodes, poolType, nil
+	return sp.Status.AccessibleNodes, poolType, nil
 }
 
 // isValidAccessibilityRequirements validates if the given accessibility

pkg/kubernetes/kubernetes.go

@@ -56,6 +56,7 @@ import (
 
 	cnsoperatorv1alpha1 "sigs.k8s.io/vsphere-csi-driver/v3/pkg/apis/cnsoperator"
 	migrationv1alpha1 "sigs.k8s.io/vsphere-csi-driver/v3/pkg/apis/migration/v1alpha1"
+	storagepoolAPIs "sigs.k8s.io/vsphere-csi-driver/v3/pkg/apis/storagepool"
 	wcpcapapis "sigs.k8s.io/vsphere-csi-driver/v3/pkg/apis/wcpcapabilities"
 	cnsconfig "sigs.k8s.io/vsphere-csi-driver/v3/pkg/common/config"
 	"sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service/logger"
@@ -286,15 +287,21 @@ func NewClientForGroup(ctx context.Context, config *restclient.Config, groupName
 			log.Errorf("failed to add CNSVolumeInfo to scheme with error: %+v", err)
 			return nil, err
 		}
+
+		err = storagepoolAPIs.AddToScheme(scheme)
+		if err != nil {
+			log.Errorf("failed to add StoragePool scheme with error :%+v", err)
+			return nil, err
+		}
 	}
-	client, err := client.New(config, client.Options{
+
+	c, err := client.New(config, client.Options{
 		Scheme: scheme,
 	})
 	if err != nil {
 		log.Errorf("failed to create client for group %s with err: %+v", groupName, err)
 	}
-	return client, err
-
+	return c, err
 }
 
 // NewCnsFileAccessConfigWatcher creates a new ListWatch for VirtualMachines