Merge pull request #66035 from krunaljain/automated-cherry-pick-of-#6…

…5499-upstream-release-1.10 Automatic merge from submit-queue. Automated cherry pick of #65499: Removes defaulting of CSI fsType to ext4 Cherry pick of #65499 on release-1.10. #65499: Removes defaulting of CSI fsType to ext4
kubernetes · Jul 13, 2018 · 0862ebd · 0862ebd
2 parents 93a2e8a + 570c9e6
commit 0862ebd
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 16 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json
diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html
diff --git a/pkg/apis/core/types.go b/pkg/apis/core/types.go
@@ -1631,7 +1631,7 @@ type CSIPersistentVolumeSource struct {
 
 	// Filesystem type to mount.
 	// Must be a filesystem type supported by the host operating system.
-	// Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+	// Ex. "ext4", "xfs", "ntfs".
 	// +optional
 	FSType string
 

diff --git a/pkg/volume/csi/csi_attacher.go b/pkg/volume/csi/csi_attacher.go
@@ -331,10 +331,6 @@ func (c *csiAttacher) MountDevice(spec *volume.Spec, devicePath string, deviceMo
 	}
 
 	fsType := csiSource.FSType
-	if len(fsType) == 0 {
-		fsType = defaultFSType
-	}
-
 	err = csi.NodeStageVolume(ctx,
 		csiSource.VolumeHandle,
 		publishVolumeInfo,

diff --git a/pkg/volume/csi/csi_mounter.go b/pkg/volume/csi/csi_mounter.go
@@ -34,8 +34,6 @@ import (
 	"k8s.io/kubernetes/pkg/volume/util"
 )
 
-const defaultFSType = "ext4"
-
 //TODO (vladimirvivien) move this in a central loc later
 var (
 	volDataKey = struct {
@@ -177,9 +175,6 @@ func (c *csiMountMgr) SetUpAt(dir string, fsGroup *int64) error {
 	}
 
 	fsType := csiSource.FSType
-	if len(fsType) == 0 {
-		fsType = defaultFSType
-	}
 	err = csi.NodePublishVolume(
 		ctx,
 		c.volumeID,

diff --git a/pkg/volume/csi/csi_mounter_test.go b/pkg/volume/csi/csi_mounter_test.go
@@ -144,6 +144,12 @@ func TestMounterSetUp(t *testing.T) {
 	if err := csiMounter.SetUp(&fsGroup); err != nil {
 		t.Fatalf("mounter.Setup failed: %v", err)
 	}
+
+	//Test the default value of file system type is not overridden
+	if len(csiMounter.spec.PersistentVolume.Spec.CSI.FSType) != 0 {
+		t.Errorf("default value of file system type was overridden by type %s", csiMounter.spec.PersistentVolume.Spec.CSI.FSType)
+	}
+
 	path := csiMounter.GetPath()
 	if _, err := os.Stat(path); err != nil {
 		if os.IsNotExist(err) {

diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto
diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go
@@ -1746,7 +1746,7 @@ type CSIPersistentVolumeSource struct {
 
 	// Filesystem type to mount.
 	// Must be a filesystem type supported by the host operating system.
-	// Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+	// Ex. "ext4", "xfs", "ntfs".
 	// +optional
 	FSType string `json:"fsType,omitempty" protobuf:"bytes,4,opt,name=fsType"`
 

diff --git a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go