Merge pull request #54748 from xiangpengzhao/fix-const

Automatic merge from submit-queue (batch tested with PRs 54761, 54748, 53991, 54485, 46951). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Make HugePages const name consistent. **What this PR does / why we need it**: Make HugePages const name in v1 be consistent with the name in api. https://github.com/kubernetes/kubernetes/blob/f9e6142f925a33a9d8a252ab79b9dabbee596ea2/pkg/api/types.go#L686 **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #54748 from xiangpengzhao/fix-const
cdc92e12 · Kubernetes Submit Queue · GitHub · e19d401d · 7e66ca58 · cdc92e12
Unverified Commit cdc92e12 authored Oct 30, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

empty_dir.go pkg/volume/empty_dir/empty_dir.go +2 -2

empty_dir_test.go pkg/volume/empty_dir/empty_dir_test.go +1 -1

types.go staging/src/k8s.io/api/core/v1/types.go +1 -1

No files found.
--- 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)
 		}
 	}

--- 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,

--- 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.