refactor: use default storage config obj

Author: faiq

pkg/handlers/generic/lifecycle/csi/aws-ebs/handler.go

@@ -54,7 +54,6 @@ func (a *AWSEBS) Apply(
 	ctx context.Context,
 	provider v1alpha1.CSIProvider,
 	defaultStorageConfig *v1alpha1.DefaultStorage,
-	hasOneProviderAndOneStorageClass bool,
 	req *runtimehooksv1.AfterControlPlaneInitializedRequest,
 ) error {
 	strategy := provider.Strategy
@@ -72,21 +71,19 @@ func (a *AWSEBS) Apply(
 		ctx,
 		provider.StorageClassConfig,
 		&req.Cluster,
-		hasOneProviderAndOneStorageClass,
 		defaultStorageConfig,
 	)
 }
 
 func (a *AWSEBS) createStorageClasses(ctx context.Context,
 	configs []v1alpha1.StorageClassConfig,
 	cluster *clusterv1.Cluster,
-	hasOneProviderAndOneStorageClass bool,
 	defaultStorageConfig *v1alpha1.DefaultStorage,
 ) error {
 	allStorageClasses := make([]runtime.Object, 0, len(configs))
 	for _, c := range configs {
 		setAsDefault := c.Name == defaultStorageConfig.StorageClassConfigName &&
-			v1alpha1.CSIProviderAWSEBS == defaultStorageConfig.ProviderName || hasOneProviderAndOneStorageClass
+			v1alpha1.CSIProviderAWSEBS == defaultStorageConfig.ProviderName
 		allStorageClasses = append(allStorageClasses, lifecycleutils.CreateStorageClass(
 			c,
 			a.config.GlobalOptions.DefaultsNamespace(),

pkg/handlers/generic/lifecycle/csi/handler.go

@@ -27,7 +27,6 @@ type CSIProvider interface {
 		context.Context,
 		v1alpha1.CSIProvider,
 		*v1alpha1.DefaultStorage,
-		bool, // this is a bool which keeps track of the case where a user has only one provider and one storageclass
 		*runtimehooksv1.AfterControlPlaneInitializedRequest,
 	) error
 }
@@ -99,9 +98,15 @@ func (c *CSIHandler) AfterControlPlaneInitialized(
 		)
 		return
 	}
-	hasOneProviderAndOneStorageClass := len(csiProviders.Providers) == 1 &&
+	if len(csiProviders.Providers) == 1 &&
+		csiProviders.Providers[0].StorageClassConfig != nil &&
 		len(csiProviders.Providers[0].StorageClassConfig) == 1 &&
-		csiProviders.DefaultStorage == nil
+		csiProviders.DefaultStorage == nil {
+		csiProviders.DefaultStorage = &v1alpha1.DefaultStorage{
+			ProviderName:           csiProviders.Providers[0].Name,
+			StorageClassConfigName: csiProviders.Providers[0].StorageClassConfig[0].Name,
+		}
+	}
 
 	for _, provider := range csiProviders.Providers {
 		handler, ok := c.ProviderHandler[provider.Name]
@@ -119,7 +124,6 @@ func (c *CSIHandler) AfterControlPlaneInitialized(
 			ctx,
 			provider,
 			csiProviders.DefaultStorage,
-			hasOneProviderAndOneStorageClass,
 			req,
 		)
 		if err != nil {

pkg/handlers/generic/lifecycle/csi/nutanix-csi/handler.go

@@ -63,7 +63,6 @@ func (n *NutanixCSI) Apply(
 	ctx context.Context,
 	provider v1alpha1.CSIProvider,
 	defaultStorageConfig *v1alpha1.DefaultStorage,
-	hasOneProviderAndOneStorageClass bool,
 	req *runtimehooksv1.AfterControlPlaneInitializedRequest,
 ) error {
 	strategy := provider.Strategy
@@ -111,7 +110,6 @@ func (n *NutanixCSI) Apply(
 		ctx,
 		provider.StorageClassConfig,
 		&req.Cluster,
-		hasOneProviderAndOneStorageClass,
 		defaultStorageConfig,
 	)
 }
@@ -171,14 +169,12 @@ func (n *NutanixCSI) handleHelmAddonApply(
 func (n *NutanixCSI) createStorageClasses(ctx context.Context,
 	configs []v1alpha1.StorageClassConfig,
 	cluster *clusterv1.Cluster,
-	hasOneProviderAndOneStorageClass bool,
 	defaultStorageConfig *v1alpha1.DefaultStorage,
 ) error {
 	allStorageClasses := make([]runtime.Object, 0, len(configs))
 	for _, c := range configs {
 		setAsDefault := c.Name == defaultStorageConfig.StorageClassConfigName &&
-			v1alpha1.CSIProviderNutanix == defaultStorageConfig.ProviderName ||
-			hasOneProviderAndOneStorageClass
+			v1alpha1.CSIProviderNutanix == defaultStorageConfig.ProviderName
 		allStorageClasses = append(allStorageClasses, lifecycleutils.CreateStorageClass(
 			c,
 			n.config.GlobalOptions.DefaultsNamespace(),