github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

promote HugePageStorageMediumSize to GA

Browse Source
This commit is contained in:
Ed Bartosh
2021-02-17 08:27:02 +02:00
parent 7b2776b89f
commit c12aa0f6b7
6 changed files with 30 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
pkg/volume/emptydir/empty_dir_test.go
View File

@@ -108,24 +108,17 @@ func TestPluginEmptyRootContext(t *testing.T) {
func TestPluginHugetlbfs(t *testing.T) {
testCases := map[string]struct {
medium v1.StorageMedium
enableHugePageStorageMediumSize bool
medium v1.StorageMedium
}{
"HugePageStorageMediumSize enabled: medium without size": {
medium: "HugePages",
enableHugePageStorageMediumSize: true,
},
"HugePageStorageMediumSize disabled: medium without size": {
"medium without size": {
medium: "HugePages",
},
"HugePageStorageMediumSize enabled: medium with size": {
medium: "HugePages-2Mi",
enableHugePageStorageMediumSize: true,
"medium with size": {
medium: "HugePages-2Mi",
},
}
for tcName, tc := range testCases {
t.Run(tcName, func(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.HugePageStorageMediumSize, tc.enableHugePageStorageMediumSize)()
doTestPlugin(t, pluginTestConfig{
medium: tc.medium,
expectedSetupMounts: 1,
@@ -381,11 +374,10 @@ func TestMetrics(t *testing.T) {
func TestGetHugePagesMountOptions(t *testing.T) {
testCases := map[string]struct {
pod *v1.Pod
medium v1.StorageMedium
shouldFail bool
expectedResult string
enableHugePageStorageMediumSize bool
pod *v1.Pod
medium v1.StorageMedium
shouldFail bool
expectedResult string
}{
"ProperValues": {
pod: &v1.Pod{
@@ -501,10 +493,9 @@ func TestGetHugePagesMountOptions(t *testing.T) {
},
},
},
medium: v1.StorageMediumHugePages,
shouldFail: true,
expectedResult: "",
enableHugePageStorageMediumSize: true,
medium: v1.StorageMediumHugePages,
shouldFail: true,
expectedResult: "",
},
"PodWithNoHugePagesRequest": {
pod: &v1.Pod{},
@@ -527,10 +518,9 @@ func TestGetHugePagesMountOptions(t *testing.T) {
},
},
},
medium: v1.StorageMediumHugePagesPrefix + "1Gi",
shouldFail: false,
expectedResult: "pagesize=1Gi",
enableHugePageStorageMediumSize: true,
medium: v1.StorageMediumHugePagesPrefix + "1Gi",
shouldFail: false,
expectedResult: "pagesize=1Gi",
},
"InitContainerAndContainerHasProperValuesMultipleSizes": {
pod: &v1.Pod{
@@ -555,10 +545,9 @@ func TestGetHugePagesMountOptions(t *testing.T) {
},
},
},
medium: v1.StorageMediumHugePagesPrefix + "2Mi",
shouldFail: false,
expectedResult: "pagesize=2Mi",
enableHugePageStorageMediumSize: true,
medium: v1.StorageMediumHugePagesPrefix + "2Mi",
shouldFail: false,
expectedResult: "pagesize=2Mi",
},
"MediumWithoutSizeMultipleSizes": {
pod: &v1.Pod{
@@ -621,7 +610,6 @@ func TestGetHugePagesMountOptions(t *testing.T) {
for testCaseName, testCase := range testCases {
t.Run(testCaseName, func(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.HugePageStorageMediumSize, testCase.enableHugePageStorageMediumSize)()
value, err := getPageSizeMountOption(testCase.medium, testCase.pod)
if testCase.shouldFail && err == nil {
t.Errorf("%s: Unexpected success", testCaseName)