Merge pull request #1252 from k8s-infra-cherrypick-robot/cherry-pick-…

…1244-to-release-1.26

[release-1.26] fix: default actimeo option should respect acregmax and acdirmax

pkg/azurefile/azurefile.go

@@ -435,6 +435,10 @@ func appendDefaultMountOptions(mountOptions []string) []string {
 				included[k] = true
 			}
 		}
+		// actimeo would set both acregmax and acdirmax, so we only need to check one of them
+		if strings.Contains(mountOption, "acregmax") || strings.Contains(mountOption, "acdirmax") {
+			included[actimeo] = true
+		}
 	}
 
 	allMountOptions := mountOptions
@@ -449,11 +453,6 @@ func appendDefaultMountOptions(mountOptions []string) []string {
 		}
 	}
 
-	/* todo: looks like fsGroup is not included in CSI
-	if !gidFlag && fsGroup != nil {
-		allMountOptions = append(allMountOptions, fmt.Sprintf("%s=%d", gid, *fsGroup))
-	}
-	*/
 	return allMountOptions
 }
 

pkg/azurefile/azurefile_test.go

@@ -138,6 +138,24 @@ func TestAppendDefaultMountOptions(t *testing.T) {
 				mfsymlinks,
 			},
 		},
+		{
+			options: []string{"acregmax=1"},
+			expected: []string{
+				"acregmax=1",
+				fmt.Sprintf("%s=%s", fileMode, defaultFileMode),
+				fmt.Sprintf("%s=%s", dirMode, defaultDirMode),
+				mfsymlinks,
+			},
+		},
+		{
+			options: []string{"acdirmax=2"},
+			expected: []string{
+				"acdirmax=2",
+				fmt.Sprintf("%s=%s", fileMode, defaultFileMode),
+				fmt.Sprintf("%s=%s", dirMode, defaultDirMode),
+				mfsymlinks,
+			},
+		},
 		{
 			options: []string{mfsymlinks},
 			expected: []string{