Merge pull request #52338 from PiotrProkop/fix-hugepages

pkg/volume/empty_dir/empty_dir.go

@@ -54,7 +54,8 @@ type emptyDirPlugin struct {
 var _ volume.VolumePlugin = &emptyDirPlugin{}
 
 const (
-	emptyDirPluginName = "kubernetes.io/empty-dir"
+	emptyDirPluginName           = "kubernetes.io/empty-dir"
+	hugePagesPageSizeMountOption = "pagesize"
 )
 
 func getPath(uid types.UID, volName string, host volume.VolumeHost) string {
@@ -321,7 +322,7 @@ func getPageSizeMountOptionFromPod(pod *v1.Pod) (string, error) {
 		return "", fmt.Errorf("hugePages storage requested, but there is no resource request for huge pages.")
 	}
 
-	return fmt.Sprintf("pageSize=%s", pageSize.String()), nil
+	return fmt.Sprintf("%s=%s", hugePagesPageSizeMountOption, pageSize.String()), nil
 
 }
 

pkg/volume/empty_dir/empty_dir_test.go

@@ -323,7 +323,7 @@ func TestGetHugePagesMountOptions(t *testing.T) {
 				},
 			},
 			shouldFail:     false,
-			expectedResult: "pageSize=2Mi",
+			expectedResult: "pagesize=2Mi",
 		},
 		"testWithProperValuesAndDifferentPageSize": {
 			pod: &v1.Pod{
@@ -347,7 +347,7 @@ func TestGetHugePagesMountOptions(t *testing.T) {
 				},
 			},
 			shouldFail:     false,
-			expectedResult: "pageSize=1Gi",
+			expectedResult: "pagesize=1Gi",
 		},
 		"InitContainerAndContainerHasProperValues": {
 			pod: &v1.Pod{
@@ -371,7 +371,7 @@ func TestGetHugePagesMountOptions(t *testing.T) {
 				},
 			},
 			shouldFail:     false,
-			expectedResult: "pageSize=1Gi",
+			expectedResult: "pagesize=1Gi",
 		},
 		"InitContainerAndContainerHasDifferentPageSizes": {
 			pod: &v1.Pod{