Merge pull request #123423 from dims/fix-nfs-related-issues-on-gcp-ubuntu
Fix NFS related issues on GCP/Ubuntu
This commit is contained in:
		@@ -103,7 +103,7 @@ func InitNFSDriver() storageframework.TestDriver {
 | 
				
			|||||||
				"", // Default fsType
 | 
									"", // Default fsType
 | 
				
			||||||
			),
 | 
								),
 | 
				
			||||||
			SupportedMountOption: sets.NewString("relatime"),
 | 
								SupportedMountOption: sets.NewString("relatime"),
 | 
				
			||||||
			RequiredMountOption:  sets.NewString("vers=4.1"),
 | 
								RequiredMountOption:  sets.NewString("vers=4.0"),
 | 
				
			||||||
			Capabilities: map[storageframework.Capability]bool{
 | 
								Capabilities: map[storageframework.Capability]bool{
 | 
				
			||||||
				storageframework.CapPersistence:       true,
 | 
									storageframework.CapPersistence:       true,
 | 
				
			||||||
				storageframework.CapExec:              true,
 | 
									storageframework.CapExec:              true,
 | 
				
			||||||
@@ -152,7 +152,7 @@ func (n *nfsDriver) GetPersistentVolumeSource(readOnly bool, fsType string, e2ev
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
func (n *nfsDriver) GetDynamicProvisionStorageClass(ctx context.Context, config *storageframework.PerTestConfig, fsType string) *storagev1.StorageClass {
 | 
					func (n *nfsDriver) GetDynamicProvisionStorageClass(ctx context.Context, config *storageframework.PerTestConfig, fsType string) *storagev1.StorageClass {
 | 
				
			||||||
	provisioner := n.externalPluginName
 | 
						provisioner := n.externalPluginName
 | 
				
			||||||
	parameters := map[string]string{"mountOptions": "vers=4.1"}
 | 
						parameters := map[string]string{"mountOptions": "vers=4.0"}
 | 
				
			||||||
	ns := config.Framework.Namespace.Name
 | 
						ns := config.Framework.Namespace.Name
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return storageframework.GetStorageClass(provisioner, parameters, nil, ns)
 | 
						return storageframework.GetStorageClass(provisioner, parameters, nil, ns)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user