split snapshot controller and update capability.

Signed-off-by: f10atin9 <f10atin9@kubesphere.io>

pkg/controller/storage/capability/capability_controller.go

@@ -24,18 +24,11 @@ import (
 	"strconv"
 	"time"
 
-	snapinformers "github.com/kubernetes-csi/external-snapshotter/client/v3/informers/externalversions/volumesnapshot/v1beta1"
 	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/util/version"
-	"k8s.io/client-go/discovery"
 	storageinformersv1beta1 "k8s.io/client-go/informers/storage/v1beta1"
 	storagelistersv1beta1 "k8s.io/client-go/listers/storage/v1beta1"
 
-	snapshotv1beta1 "github.com/kubernetes-csi/external-snapshotter/client/v3/apis/volumesnapshot/v1beta1"
-	snapshotclient "github.com/kubernetes-csi/external-snapshotter/client/v3/clientset/versioned/typed/volumesnapshot/v1beta1"
-	snapshotlisters "github.com/kubernetes-csi/external-snapshotter/client/v3/listers/volumesnapshot/v1beta1"
 	storagev1 "k8s.io/api/storage/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -51,9 +44,8 @@ import (
 )
 
 const (
-	minSnapshotSupportedVersion = "v1.17.0"
-	annotationSupportSnapshot   = "storageclass.kubesphere.io/allow-snapshot"
-	annotationSupportClone      = "storageclass.kubesphere.io/allow-clone"
+	annotationAllowSnapshot = "storageclass.kubesphere.io/allow-snapshot"
+	annotationAllowClone    = "storageclass.kubesphere.io/allow-clone"
 )
 
 type StorageCapabilityController struct {
@@ -64,43 +56,26 @@ type StorageCapabilityController struct {
 	csiDriverLister storagelistersv1beta1.CSIDriverLister
 	csiDriverSynced cache.InformerSynced
 
-	snapshotSupported   bool
-	snapshotClassClient snapshotclient.VolumeSnapshotClassInterface
-	snapshotClassLister snapshotlisters.VolumeSnapshotClassLister
-	snapshotClassSynced cache.InformerSynced
-
-	workQueue    workqueue.RateLimitingInterface
-	csiWorkQueue workqueue.RateLimitingInterface
+	storageClassWorkQueue workqueue.RateLimitingInterface
 }
 
-// This controller is responsible to watch StorageClass/ProvisionerCapability.
-// And then update StorageClassCapability CRD resource object to the newest status.
+// This controller is responsible to watch StorageClass and CSIDriver.
+// And then update StorageClass CRD resource object to the newest status.
 func NewController(
 	storageClassClient storageclient.StorageClassInterface,
 	storageClassInformer storageinformersv1.StorageClassInformer,
 	csiDriverInformer storageinformersv1beta1.CSIDriverInformer,
-	snapshotSupported bool,
-	snapshotClassClient snapshotclient.VolumeSnapshotClassInterface,
-	snapshotClassInformer snapinformers.VolumeSnapshotClassInformer,
 ) *StorageCapabilityController {
 
 	utilruntime.Must(crdscheme.AddToScheme(scheme.Scheme))
 
 	controller := &StorageCapabilityController{
-		storageClassClient: storageClassClient,
-		storageClassLister: storageClassInformer.Lister(),
-		storageClassSynced: storageClassInformer.Informer().HasSynced,
-		csiDriverLister:    csiDriverInformer.Lister(),
-		csiDriverSynced:    csiDriverInformer.Informer().HasSynced,
-		snapshotSupported:  snapshotSupported,
-		workQueue:          workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "StorageClasses"),
-		csiWorkQueue:       workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "csiDriver"),
-	}
-
-	if snapshotSupported {
-		controller.snapshotClassClient = snapshotClassClient
-		controller.snapshotClassLister = snapshotClassInformer.Lister()
-		controller.snapshotClassSynced = snapshotClassInformer.Informer().HasSynced
+		storageClassClient:    storageClassClient,
+		storageClassLister:    storageClassInformer.Lister(),
+		storageClassSynced:    storageClassInformer.Informer().HasSynced,
+		csiDriverLister:       csiDriverInformer.Lister(),
+		csiDriverSynced:       csiDriverInformer.Informer().HasSynced,
+		storageClassWorkQueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "StorageClasses"),
 	}
 
 	storageClassInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
@@ -113,13 +88,10 @@ func NewController(
 			}
 			controller.enqueueStorageClass(newStorageClass)
 		},
-		DeleteFunc: controller.enqueueStorageClass,
 	})
 
 	csiDriverInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
-		AddFunc:    controller.enqueueStorageClassByCSI,
-		UpdateFunc: nil,
-		DeleteFunc: controller.enqueueStorageClassByCSI,
+		AddFunc: controller.enqueueStorageClassByCSI,
 	})
 
 	return controller
@@ -131,7 +103,7 @@ func (c *StorageCapabilityController) Start(ctx context.Context) error {
 
 func (c *StorageCapabilityController) Run(threadCnt int, stopCh <-chan struct{}) error {
 	defer utilruntime.HandleCrash()
-	defer c.workQueue.ShutDown()
+	defer c.storageClassWorkQueue.ShutDown()
 
 	// Wait for the caches to be synced before starting workers
 	klog.Info("Waiting for informer caches to sync")
@@ -160,7 +132,7 @@ func (c *StorageCapabilityController) enqueueStorageClass(obj interface{}) {
 		utilruntime.HandleError(err)
 		return
 	}
-	c.workQueue.Add(key)
+	c.storageClassWorkQueue.Add(key)
 }
 
 func (c *StorageCapabilityController) enqueueStorageClassByCSI(csi interface{}) {
@@ -178,7 +150,7 @@ func (c *StorageCapabilityController) enqueueStorageClassByCSI(csi interface{})
 	}
 	for _, obj := range objs {
 		if obj.Provisioner == key {
-			c.workQueue.Add(obj.Name)
+			c.enqueueStorageClass(obj)
 		}
 	}
 	return
@@ -190,25 +162,25 @@ func (c *StorageCapabilityController) runWorker() {
 }
 
 func (c *StorageCapabilityController) processNextWorkItem() bool {
-	obj, shutdown := c.workQueue.Get()
+	obj, shutdown := c.storageClassWorkQueue.Get()
 	if shutdown {
 		return false
 	}
 
 	err := func(obj interface{}) error {
-		defer c.workQueue.Done(obj)
+		defer c.storageClassWorkQueue.Done(obj)
 		var key string
 		var ok bool
 		if key, ok = obj.(string); !ok {
-			c.workQueue.Forget(obj)
+			c.storageClassWorkQueue.Forget(obj)
 			utilruntime.HandleError(fmt.Errorf("expected string in workQueue but got %#v", obj))
 			return nil
 		}
 		if err := c.syncHandler(key); err != nil {
-			c.workQueue.AddRateLimited(key)
+			c.storageClassWorkQueue.AddRateLimited(key)
 			return fmt.Errorf("error syncing '%s': %s, requeuing", key, err.Error())
 		}
-		c.workQueue.Forget(obj)
+		c.storageClassWorkQueue.Forget(obj)
 		klog.Infof("Successfully synced '%s'", key)
 		return nil
 	}(obj)
@@ -232,55 +204,28 @@ func (c *StorageCapabilityController) syncHandler(key string) error {
 
 	// Get StorageClass
 	storageClass, err := c.storageClassLister.Get(name)
-	if err != nil {
-		// StorageClass has been deleted, delete StorageClassCapability and VolumeSnapshotClass
-		if errors.IsNotFound(err) && c.snapshotAllowed() {
-			err = c.deleteSnapshotClass(name)
-			if err != nil {
-				return err
-			}
-		}
-		return err
-	}
 
 	//Cloning and volumeSnapshot support only available for CSI drivers.
-	withCapability := c.supportCapability(storageClass)
-	// Handle VolumeSnapshotClass with same name of StorageClass
-	// annotate "support-snapshot" of StorageClass
-	if c.snapshotAllowed() && withCapability {
-		_, err = c.snapshotClassLister.Get(name)
-		if err != nil {
-			// If VolumeSnapshotClass not exist, create it
-			if errors.IsNotFound(err) {
-				volumeSnapshotClassCreate := &snapshotv1beta1.VolumeSnapshotClass{
-					ObjectMeta:     metav1.ObjectMeta{Name: name},
-					Driver:         storageClass.Provisioner,
-					DeletionPolicy: snapshotv1beta1.VolumeSnapshotContentDelete,
-				}
-				_, err = c.snapshotClassClient.Create(context.Background(), volumeSnapshotClassCreate, metav1.CreateOptions{})
-				if err != nil {
-					return err
-				}
-			}
-		}
-	}
+	isCSIStorage := c.hasCSIDriver(storageClass)
 
-	err = c.addStorageClassSnapshotAnnotation(storageClass, withCapability)
+	//Annotate storageClass
+	storageClassUpdated := storageClass.DeepCopy()
+	err = c.addStorageClassSnapshotAnnotation(storageClassUpdated, isCSIStorage)
 	if err != nil {
 		return err
 	}
-	err = c.addCloneVolumeAnnotation(storageClass, withCapability)
+	err = c.addCloneVolumeAnnotation(storageClassUpdated, isCSIStorage)
 	if err != nil {
-		return nil
+		return err
 	}
-	_, err = c.storageClassClient.Update(context.Background(), storageClass, metav1.UpdateOptions{})
+	_, err = c.storageClassClient.Update(context.Background(), storageClassUpdated, metav1.UpdateOptions{})
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func (c *StorageCapabilityController) supportCapability(storageClass *storagev1.StorageClass) bool {
+func (c *StorageCapabilityController) hasCSIDriver(storageClass *storagev1.StorageClass) bool {
 	driver := storageClass.Provisioner
 	if driver != "" {
 		if _, err := c.csiDriverLister.Get(driver); err != nil {
@@ -291,73 +236,29 @@ func (c *StorageCapabilityController) supportCapability(storageClass *storagev1.
 	return false
 }
 
-func (c *StorageCapabilityController) addStorageClassSnapshotAnnotation(storageClass *storagev1.StorageClass, snapshotSupported bool) error {
-	if snapshotSupported || !c.snapshotSupported {
+func (c *StorageCapabilityController) addStorageClassSnapshotAnnotation(storageClass *storagev1.StorageClass, snapshotAllow bool) error {
+	if snapshotAllow {
 		if storageClass.Annotations == nil {
 			storageClass.Annotations = make(map[string]string)
 		}
-		_, err := strconv.ParseBool(storageClass.Annotations[annotationSupportSnapshot])
-		// err != nil means annotationSupportSnapshot is not illegal, include empty
+		_, err := strconv.ParseBool(storageClass.Annotations[annotationAllowSnapshot])
+		// err != nil means annotationAllowSnapshot is not illegal, include empty
 		if err != nil {
-			storageClass.Annotations[annotationSupportSnapshot] = strconv.FormatBool(c.snapshotSupported)
-		}
-	} else {
-		if storageClass.Annotations != nil && c.snapshotSupported {
-			if _, ok := storageClass.Annotations[annotationSupportSnapshot]; ok {
-				delete(storageClass.Annotations, annotationSupportSnapshot)
-			}
+			storageClass.Annotations[annotationAllowSnapshot] = strconv.FormatBool(snapshotAllow)
 		}
 	}
 	return nil
 }
 
-func (c *StorageCapabilityController) addCloneVolumeAnnotation(storageClass *storagev1.StorageClass, cloneSupported bool) error {
-	if cloneSupported {
+func (c *StorageCapabilityController) addCloneVolumeAnnotation(storageClass *storagev1.StorageClass, cloneAllow bool) error {
+	if cloneAllow {
 		if storageClass.Annotations == nil {
 			storageClass.Annotations = make(map[string]string)
 		}
-		_, err := strconv.ParseBool(storageClass.Annotations[annotationSupportClone])
+		_, err := strconv.ParseBool(storageClass.Annotations[annotationAllowClone])
 		if err != nil {
-			storageClass.Annotations[annotationSupportClone] = strconv.FormatBool(cloneSupported)
-		}
-	} else {
-		if storageClass.Annotations != nil {
-			if _, ok := storageClass.Annotations[annotationSupportClone]; ok {
-				delete(storageClass.Annotations, annotationSupportClone)
-			}
+			storageClass.Annotations[annotationAllowClone] = strconv.FormatBool(cloneAllow)
 		}
 	}
 	return nil
 }
-
-func (c *StorageCapabilityController) deleteSnapshotClass(name string) error {
-	if !c.snapshotAllowed() {
-		return nil
-	}
-	_, err := c.snapshotClassLister.Get(name)
-	if err != nil {
-		if errors.IsNotFound(err) {
-			return nil
-		}
-		return err
-	}
-	klog.Infof("Delete SnapshotClass %s", name)
-	return c.snapshotClassClient.Delete(context.Background(), name, metav1.DeleteOptions{})
-}
-
-func (c *StorageCapabilityController) snapshotAllowed() bool {
-	return c.snapshotSupported && c.snapshotClassClient != nil && c.snapshotClassLister != nil && c.snapshotClassSynced != nil
-}
-
-func SnapshotSupported(discoveryInterface discovery.DiscoveryInterface) bool {
-	minVer := version.MustParseGeneric(minSnapshotSupportedVersion)
-	rawVer, err := discoveryInterface.ServerVersion()
-	if err != nil {
-		return false
-	}
-	ver, err := version.ParseSemantic(rawVer.String())
-	if err != nil {
-		return false
-	}
-	return ver.AtLeast(minVer)
-}