github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Make HugePages const name consistent.

Browse Source
This commit is contained in:
xiangpengzhao 2017-10-28 15:41:10 +08:00
parent afe40ae875
commit 7e66ca584f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/empty_dir/empty_dir.go
View File

@ -227,7 +227,7 @@ func (ed *emptyDir) SetUpAt(dir string, fsGroup *int64) error {
err = ed.setupDir(dir) err = ed.setupDir(dir)
case v1.StorageMediumMemory: case v1.StorageMediumMemory:
err = ed.setupTmpfs(dir) err = ed.setupTmpfs(dir)
case v1.StorageMediumHugepages: case v1.StorageMediumHugePages:
err = ed.setupHugepages(dir) err = ed.setupHugepages(dir)
default: default:
err = fmt.Errorf("unknown storage medium %q", ed.medium) err = fmt.Errorf("unknown storage medium %q", ed.medium)
@ -392,7 +392,7 @@ func (ed *emptyDir) TearDownAt(dir string) error {
ed.medium = v1.StorageMediumMemory ed.medium = v1.StorageMediumMemory
return ed.teardownTmpfsOrHugetlbfs(dir) return ed.teardownTmpfsOrHugetlbfs(dir)
} else if medium == mediumHugepages { } else if medium == mediumHugepages {
ed.medium = v1.StorageMediumHugepages ed.medium = v1.StorageMediumHugePages
return ed.teardownTmpfsOrHugetlbfs(dir) return ed.teardownTmpfsOrHugetlbfs(dir)
} }
} }

2
pkg/volume/empty_dir/empty_dir_test.go
View File

@ -83,7 +83,7 @@ func TestPluginEmptyRootContext(t *testing.T) {
func TestPluginHugetlbfs(t *testing.T) { func TestPluginHugetlbfs(t *testing.T) {
doTestPlugin(t, pluginTestConfig{ doTestPlugin(t, pluginTestConfig{
medium: v1.StorageMediumHugepages, medium: v1.StorageMediumHugePages,
expectedSetupMounts: 1, expectedSetupMounts: 1,
expectedTeardownMounts: 0, expectedTeardownMounts: 0,
shouldBeMountedBeforeTeardown: true, shouldBeMountedBeforeTeardown: true,

2
staging/src/k8s.io/api/core/v1/types.go
View File

@ -989,7 +989,7 @@ type StorageMedium string
const ( const (
StorageMediumDefault StorageMedium = "" // use whatever the default is for the node StorageMediumDefault StorageMedium = "" // use whatever the default is for the node
StorageMediumMemory StorageMedium = "Memory" // use memory (tmpfs) 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. // Protocol defines network protocols supported for things like container ports.