Added new PVC annotations to specify block size and file system type

Added PVC annotation trident.netapp.io/blockSize to specify block/sector size for SolidFire backends. Possible values are 512 (for 512-byte sector emulation) and 4096. If unspecified, the default value of 512 is used.
Added PVC annotation trident.netapp.io/fileSystem to specify the file system type for iSCSI volumes. If unspecified, ext4 is used for the file system type.
Closes #33
Closes #37

README.md

@@ -707,6 +707,9 @@ Volume configurations are unique to Trident and are unused in the nDVP.
 | exportPolicy | string | No | For ONTAP backends, specifies the export policy to use.  Ignored for SolidFire and E-Series. |
 | snapshotDirectory | bool | No | For ONTAP backends, specifies whether the snapshot directory should be visible.  Ignored for SolidFire and E-Series. |
 | unixPermissions | string | No | For ONTAP backends, initial NFS permissions to set on the created volume.  Ignored for SolidFire and E-Series. |
+| blockSize | string | No | For SolidFire backends, specifies the block/sector size for the created volume. Possible values are 512 and 4096. If not specified, 512 will be used to enable 512B sector emulation. Ignored for ONTAP and E-Series. |
+| fileSystem | string | No | For ONTAP SAN, SolidFire, and E-Series backends, specifies the file system for the created volume. If not specified, `ext4` will be set as the file system. Ignored for ONTAP NAS. |
+
 
 As mentioned, Trident generates internalName when creating the volume.  This
 consists of two steps.  First, it prepends the storage prefix--either the
@@ -972,13 +975,16 @@ corresponding PV, Trident follows the following rules:
 * Other volume configuration parameters can be specified using the following
   PVC annotations:
 
-| Annotation | Volume Parameter |
-| ---------- | ---------------- |
-| `trident.netapp.io/protocol` |  `protocol` |
-| `trident.netapp.io/exportPolicy` |  `exportPolicy`|
-| `trident.netapp.io/snapshotPolicy` |  `snapshotPolicy`|
-| `trident.netapp.io/snapshotDirectory` |  `snapshotDirectory`|
-| `trident.netapp.io/unixPermissions` |  `unixPermissions`|
+| Annotation | Volume Parameter | Supported Drivers |
+| ---------- | ---------------- | ----------------- |
+| `trident.netapp.io/protocol` |  `protocol` | `ontap-nas`, `ontap-san`, `solidfire-san` |
+| `trident.netapp.io/exportPolicy` |  `exportPolicy`| `ontap-nas`, `ontap-san` |
+| `trident.netapp.io/snapshotPolicy` |  `snapshotPolicy`| `ontap-nas`, `ontap-san` |
+| `trident.netapp.io/snapshotDirectory` |  `snapshotDirectory`| `ontap-nas` |
+| `trident.netapp.io/unixPermissions` |  `unixPermissions`| `ontap-nas` |
+| `trident.netapp.io/blockSize` |  `blockSize`| `solidfire-san` |
+| `trident.netapp.io/fileSystem` |  `fileSystem` | `ontap-san`, `solidfire-san`, `eseries-iscsi` |
+| `trident.netapp.io/reclaimPolicy` | N/A | N/A |
 
 The reclaim policy for the created PV can be determined by setting the
 annotation `trident.netapp.io/reclaimPolicy` in the PVC to either `Delete` or

frontend/kubernetes/config.go

@@ -30,6 +30,8 @@ const (
 	AnnVendor          = AnnPrefix + "/vendor"
 	AnnBackendID       = AnnPrefix + "/backendID"
 	AnnExportPolicy    = AnnPrefix + "/exportPolicy"
+	AnnBlockSize       = AnnPrefix + "/blockSize"
+	AnnFileSystem      = AnnPrefix + "/fileSystem"
 
 	// Minimum and maximum supported Kubernetes versions
 	KubernetesVersionMin = "v1.4.0"

frontend/kubernetes/volumes.go

@@ -77,6 +77,9 @@ func getVolumeConfig(
 	} else {
 		accessMode = config.AccessMode(accessModes[0])
 	}
+	if getAnnotation(annotations, AnnFileSystem) == "" {
+		annotations[AnnFileSystem] = "ext4"
+	}
 	return &storage.VolumeConfig{
 		Name:            name,
 		Size:            fmt.Sprintf("%d", size.Value()),
@@ -86,6 +89,8 @@ func getVolumeConfig(
 		SnapshotDir:     getAnnotation(annotations, AnnSnapshotDir),
 		UnixPermissions: getAnnotation(annotations, AnnUnixPermissions),
 		StorageClass:    getAnnotation(annotations, AnnClass),
+		BlockSize:       getAnnotation(annotations, AnnBlockSize),
+		FileSystem:      getAnnotation(annotations, AnnFileSystem),
 		AccessMode:      accessMode,
 	}
 }
@@ -103,6 +108,6 @@ func CreateISCSIVolumeSource(volConfig *storage.VolumeConfig) *v1.ISCSIVolumeSou
 		IQN:            volConfig.AccessInfo.IscsiTargetIQN,
 		Lun:            volConfig.AccessInfo.IscsiLunNumber,
 		ISCSIInterface: volConfig.AccessInfo.IscsiInterface,
-		FSType:         "ext4",
+		FSType:         volConfig.FileSystem,
 	}
 }

glide.yaml

@@ -93,7 +93,7 @@ import:
   - jlexer
   - jwriter
 - package: github.com/netapp/netappdvp
-  version: b5b73c6d71b91c7c9c86acc317bd181cbe5453db
+  version: b37188a9ddf361ab7ea0d7acfe29f9f5acc9a2df
   subpackages:
   - apis/eseries
   - apis/ontap

storage/solidfire/solidfire_san.go

@@ -133,7 +133,9 @@ func (d *SolidfireSANStorageDriver) GetVolumeOpts(
 ) (map[string]string, error) {
 	opts := make(map[string]string)
 	opts["type"] = pool.Name
-
+	if volConfig.BlockSize != "" {
+		opts["blocksize"] = volConfig.BlockSize
+	}
 	return opts, nil
 }
 

storage/volume.go

@@ -22,6 +22,8 @@ type VolumeConfig struct {
 	StorageClass    string            `json:"storageClass,omitempty"`
 	AccessMode      config.AccessMode `json:"accessMode,omitempty"`
 	AccessInfo      VolumeAccessInfo  `json:"accessInformation"`
+	BlockSize       string            `json:"blockSize"`
+	FileSystem      string            `json:"fileSystem"`
 }
 
 type VolumeAccessInfo struct {