From 7e66ca584fc928edb42c08bdac7203c2c6d7e665 Mon Sep 17 00:00:00 2001 From: xiangpengzhao Date: Sat, 28 Oct 2017 15:41:10 +0800 Subject: [PATCH] Make HugePages const name consistent. --- pkg/volume/empty_dir/empty_dir.go | 4 ++-- pkg/volume/empty_dir/empty_dir_test.go | 2 +- staging/src/k8s.io/api/core/v1/types.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/volume/empty_dir/empty_dir.go b/pkg/volume/empty_dir/empty_dir.go index 68cd56727b8..fdba51c1ec4 100644 --- a/pkg/volume/empty_dir/empty_dir.go +++ b/pkg/volume/empty_dir/empty_dir.go @@ -227,7 +227,7 @@ func (ed *emptyDir) SetUpAt(dir string, fsGroup *int64) error { err = ed.setupDir(dir) case v1.StorageMediumMemory: err = ed.setupTmpfs(dir) - case v1.StorageMediumHugepages: + case v1.StorageMediumHugePages: err = ed.setupHugepages(dir) default: err = fmt.Errorf("unknown storage medium %q", ed.medium) @@ -392,7 +392,7 @@ func (ed *emptyDir) TearDownAt(dir string) error { ed.medium = v1.StorageMediumMemory return ed.teardownTmpfsOrHugetlbfs(dir) } else if medium == mediumHugepages { - ed.medium = v1.StorageMediumHugepages + ed.medium = v1.StorageMediumHugePages return ed.teardownTmpfsOrHugetlbfs(dir) } } diff --git a/pkg/volume/empty_dir/empty_dir_test.go b/pkg/volume/empty_dir/empty_dir_test.go index 076684246a2..cd4e9b618f0 100644 --- a/pkg/volume/empty_dir/empty_dir_test.go +++ b/pkg/volume/empty_dir/empty_dir_test.go @@ -83,7 +83,7 @@ func TestPluginEmptyRootContext(t *testing.T) { func TestPluginHugetlbfs(t *testing.T) { doTestPlugin(t, pluginTestConfig{ - medium: v1.StorageMediumHugepages, + medium: v1.StorageMediumHugePages, expectedSetupMounts: 1, expectedTeardownMounts: 0, shouldBeMountedBeforeTeardown: true, diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index 3c369858da0..27f161b22b3 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -989,7 +989,7 @@ type StorageMedium string const ( StorageMediumDefault StorageMedium = "" // use whatever the default is for the node StorageMediumMemory StorageMedium = "Memory" // use memory (tmpfs) - StorageMediumHugepages StorageMedium = "HugePages" // use hugepages + StorageMediumHugePages StorageMedium = "HugePages" // use hugepages ) // Protocol defines network protocols supported for things like container ports.