enable static pv to create in dynamic way

driver/.dockerignore

@@ -0,0 +1 @@
+examples

driver/csiplugin/connectors/connectors.go

@@ -129,14 +129,15 @@ const (
 	UserSpecifiedCacheMode        string = "cacheMode"
 	UserSpecifiedVolumeType       string = "volumeType"
 	UserSpecifiedVolNamePrefix    string = "volNamePrefix"
+	UserSpecifiedExistingData     string = "existingData"
 
 	// AFM tuning parameters to modify cache fileset
 	AfmReadSparseThreshold     string = "afmReadSparseThreshold"
-	AfmNumFlushThreads         string = "afmNumFlushThreads"        
-	AfmPrefetchThreshold       string = "afmPrefetchThreshold"       
-	AfmObjectFastReaddir       string = "afmObjectFastReaddir"       
+	AfmNumFlushThreads         string = "afmNumFlushThreads"
+	AfmPrefetchThreshold       string = "afmPrefetchThreshold"
+	AfmObjectFastReaddir       string = "afmObjectFastReaddir"
 	AfmFileOpenRefreshInterval string = "afmFileOpenRefreshInterval"
-	AfmNumReadThreads          string = "afmNumReadThreads"          
+	AfmNumReadThreads          string = "afmNumReadThreads"
 
 	// default value for AFM tuning parameters
 	AfmNumFlushThreadsDefault         = 4

driver/csiplugin/connectors/rest_v2.go

@@ -128,7 +128,6 @@ func (s *SpectrumRestV2) WaitForJobCompletionWithResp(ctx context.Context, statu
 	klog.V(4).Infof("[%s] rest_v2 WaitForJobCompletionWithResp. jobID: %d, statusCode: %d", utils.GetLoggerId(ctx), jobID, statusCode)
 
 	if s.checkAsynchronousJob(statusCode) {
-		response := GenericResponse{}
 		jobURL := fmt.Sprintf("scalemgmt/v2/jobs/%d?fields=:all:", jobID)
 		response, err := s.AsyncJobCompletion(ctx, jobURL)
 		if err != nil {
@@ -1778,7 +1777,7 @@ func (s *SpectrumRestV2) GetSnapshotCreateTimestamp(ctx context.Context, filesys
 		return "", fmt.Errorf("unable to list snapshot %v", snapName)
 	}
 
-	return fmt.Sprintf(getSnapshotResponse.Snapshots[0].Created), nil
+	return fmt.Sprintf("%v", getSnapshotResponse.Snapshots[0].Created), nil
 }
 
 //nolint:dupl

driver/csiplugin/gpfs_util.go

@@ -32,13 +32,14 @@ import (
 )
 
 const (
-	dependentFileset     = "dependent"
-	independentFileset   = "independent"
-	scversion1           = "1"
-	scversion2           = "2"
-	sharedPermissions    = "777"
-	defaultVolNamePrefix = "pvc"
-	VolNamePrefixEnvKey  = "VOLUME_NAME_PREFIX"
+	dependentFileset         = "dependent"
+	independentFileset       = "independent"
+	scversion1               = "1"
+	scversion2               = "2"
+	sharedPermissions        = "777"
+	defaultVolNamePrefix     = "pvc"
+	VolNamePrefixEnvKey      = "VOLUME_NAME_PREFIX"
+	existingDataAllowedVal   = "enabled"
 	AFMCacheSharedPermission = "0777"
 )
 
@@ -99,6 +100,8 @@ type scaleVolume struct {
 	VolumeType         string                            `json:"volumeType"`
 	CacheMode          string                            `json:"cacheMode"`
 	VolNamePrefix      string                            `json:"volNamePrefix"`
+	ExistingData       string                            `json:"existingData"`
+	IsStaticPVBased    bool                              `json:"isStaticPV"`
 }
 
 type scaleVolId struct {
@@ -113,6 +116,7 @@ type scaleVolId struct {
 	StorageClassType string
 	ConsistencyGroup string
 	VolType          string
+	IsStaticPVBased  bool
 }
 
 type scaleSnapId struct {
@@ -172,6 +176,13 @@ func getScaleVolumeOptions(ctx context.Context, volOptions map[string]string) (*
 	volumeType, volumeTypeSpecified := volOptions[connectors.UserSpecifiedVolumeType]
 	cacheMode, cacheModeSpecified := volOptions[connectors.UserSpecifiedCacheMode]
 
+	// for static pv
+	scaleVol.IsStaticPVBased = false
+	existingData, existingDataSpecified := volOptions[connectors.UserSpecifiedExistingData]
+	if existingDataSpecified && existingData == "enabled" {
+		scaleVol.IsStaticPVBased = true
+	}
+
 	// Handling empty values
 	scaleVol.VolDirBasePath = ""
 	scaleVol.InodeLimit = ""
@@ -192,10 +203,13 @@ func getScaleVolumeOptions(ctx context.Context, volOptions map[string]string) (*
 			return &scaleVolume{}, status.Error(codes.InvalidArgument, "The parameter \"version\" can have values only "+
 				"\""+scversion1+"\" or \""+scversion2+"\"")
 		}
-		if storageClassType == scversion2 {
+		if storageClassType == scversion2 && scaleVol.IsStaticPVBased {
+			return &scaleVolume{}, status.Error(codes.InvalidArgument, "The parameter \"existingData\" is not allowed for version "+""+scversion2+"\"")
+		} else if storageClassType == scversion2 {
 			isSCAdvanced = true
 			scaleVol.StorageClassType = STORAGECLASS_ADVANCED
 		}
+
 		if storageClassType == scversion1 {
 			scaleVol.StorageClassType = STORAGECLASS_CLASSIC
 		}
@@ -345,6 +359,18 @@ func getScaleVolumeOptions(ctx context.Context, volOptions map[string]string) (*
 		}
 	}
 
+	if scaleVol.IsStaticPVBased {
+		if uidSpecified || gidSpecified || isSharedSpecified || inodeLimSpecified || isPermissionsSpecified || isNodeClassSpecified {
+			return &scaleVolume{}, status.Error(codes.InvalidArgument, "The parameters \"uid\" , \"gid\" , \"inodeLimit\" , \"shared\" , \"nodeClass\" and \"permissions\" are not allowed in storageClass for static volumes i.e. with \"existingData\"")
+		}
+		if volDirPathSpecified {
+			return &scaleVolume{}, status.Error(codes.InvalidArgument, "volDirBasePath is not allowed in storageClass for static volumes i.e. with \"existingData\"")
+		}
+		if isCompressionSpecified || isTierSpecified {
+			return &scaleVolume{}, status.Error(codes.InvalidArgument, "The parameters \"compression\" and \"tier\" are not supported in storageClass for static volumes i.e. with \"existingData\"")
+		}
+	}
+
 	/* Get UID/GID */
 	if uidSpecified {
 		scaleVol.VolUid = uid
@@ -405,7 +431,13 @@ func getScaleVolumeOptions(ctx context.Context, volOptions map[string]string) (*
 		scaleVol.NodeClass = nodeClass
 	}
 
-	if isCGSpecified {
+	if scaleVol.IsStaticPVBased {
+		cgPrefix := utils.GetEnv("CSI_CG_PREFIX", notFound)
+		if cgPrefix == notFound {
+			return &scaleVolume{}, status.Error(codes.InvalidArgument, "Failed to extract the consistencyGroup prefix")
+		}
+		scaleVol.ConsistencyGroup = fmt.Sprintf("%s-%s", cgPrefix, volOptions["csi.storage.k8s.io/pvc/namespace"])
+	} else if isCGSpecified {
 		scaleVol.ConsistencyGroup = cg
 	} else {
 		cgPrefix := utils.GetEnv("CSI_CG_PREFIX", notFound)
@@ -658,6 +690,7 @@ func getVolIDMembers(vID string) (scaleVolId, error) {
 			} else {
 				vIdMem.IsFilesetBased = true
 			}
+
 		} else {
 			vIdMem.IsFilesetBased = true
 		}

driver/csiplugin/server.go

@@ -78,7 +78,7 @@ func (s *nonBlockingGRPCServer) serve(endpoint string, ids csi.IdentityServer, c
 	u, err := url.Parse(endpoint)
 
 	if err != nil {
-		klog.Fatalf(err.Error())
+		klog.Fatalf("%v", err.Error())
 	}
 
 	var addr string

driver/examples/staticVolume/dynamicprovisioning/snapshot/pvcfrmsnap_static.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: ibm-spectrum-scale-pvc-from-snapshot-static
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: ibm-spectrum-scale-csi-fileset
+  dataSource:
+    name: ibm-spectrum-scale-snapshot-static
+    kind: VolumeSnapshot
+    apiGroup: snapshot.storage.k8s.io

driver/examples/staticVolume/dynamicprovisioning/snapshot/volsnap_static.yaml

@@ -0,0 +1,8 @@
+apiVersion: snapshot.storage.k8s.io/v1
+kind: VolumeSnapshot
+metadata:
+  name: ibm-spectrum-scale-snapshot-static
+spec:
+  volumeSnapshotClassName: ibm-spectrum-scale-snapshotclass
+  source:
+    persistentVolumeClaimName: scale-static-pvc

driver/examples/staticVolume/dynamicprovisioning/volume/clonefrompvc_static_dependent.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: ibm-spectrum-scale-static-pvc-clone-from-pvc
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: ibm-spectrum-scale-csi-static-dependent
+  dataSource:
+    name: scale-static-pvc
+    kind: PersistentVolumeClaim

driver/examples/staticVolume/dynamicprovisioning/volume/clonefrompvc_static_independent.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: ibm-spectrum-scale-static-pvc-clone-from-pvc
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: ibm-spectrum-scale-csi-fileset
+  dataSource:
+    name: scale-static-pvc
+    kind: PersistentVolumeClaim

driver/examples/staticVolume/dynamicprovisioning/volume/pvc_static_dependent.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: scale-static-pvc
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: ibm-spectrum-scale-csi-static-dependent
+

driver/examples/staticVolume/dynamicprovisioning/volume/pvc_static_independent.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: scale-static-pvc
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: ibm-spectrum-scale-csi-static
+

driver/examples/staticVolume/dynamicprovisioning/volume/storageclass_static_dependent.yaml

@@ -0,0 +1,11 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+   name: ibm-spectrum-scale-csi-static-dependent
+provisioner: spectrumscale.csi.ibm.com
+parameters:
+    volBackendFs: "fs1"
+    existingData: "enabled"
+    filesetType: "dependent"
+    parentFileset: "scale-static-pvc-parent-1"
+reclaimPolicy: Delete

driver/examples/staticVolume/dynamicprovisioning/volume/storageclass_static_expansion_independent.yaml

@@ -0,0 +1,10 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+   name: ibm-spectrum-scale-csi-static-expansion
+provisioner: spectrumscale.csi.ibm.com
+parameters:
+    volBackendFs: "fs1"
+    existingData: "enabled"
+reclaimPolicy: Delete
+allowVolumeExpansion: true

driver/examples/staticVolume/dynamicprovisioning/volume/storageclass_static_independent.yaml

@@ -0,0 +1,9 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+   name: ibm-spectrum-scale-csi-static
+provisioner: spectrumscale.csi.ibm.com
+parameters:
+    volBackendFs: "fs1"
+    existingData: "enabled"
+reclaimPolicy: Delete

driver/examples/staticVolume/staticprovisioning/pvcfrmsnap.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: ibm-spectrum-scale-pvc-from-snapshot
+  namespace: default
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+  storageClassName: ibm-spectrum-scale-storageclass
+  dataSource:
+    name: ibm-spectrum-scale-snapshot
+    kind: VolumeSnapshot
+    apiGroup: snapshot.storage.k8s.io

driver/examples/version1/volume/dynamicprovisioning/fileset/independent/podfileset.yaml → driver/examples/staticVolume/staticprovisioning/volume/static_pod.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: csi-scale-fsetdemo-pod
+  name: csi-scale-staticdemo-pod
   labels:
     app: nginx
 spec:
@@ -16,6 +16,6 @@ spec:
   volumes:
    - name: mypvc
      persistentVolumeClaim:
-       claimName: scale-fset-pvc
+       claimName: scale-static-pvc
        readOnly: false
 

driver/examples/version1/snapshot/volsnapclass.yaml

@@ -0,0 +1,6 @@
+apiVersion: snapshot.storage.k8s.io/v1
+kind: VolumeSnapshotClass
+metadata:
+  name: ibm-spectrum-scale-snapshotclass
+driver: spectrumscale.csi.ibm.com
+deletionPolicy: Delete