github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Remove use of HugePages feature flag in test

Browse Source 
The flag was removed in 1.14, and huge pages are now enabled by
default.
This commit is contained in:
Odin Ugedal 2019-07-07 22:17:11 +02:00
parent 932487c744
commit 1c79157065
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
test/e2e_node/hugepages_test.go
View File

@ -28,7 +28,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/uuid"
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
"k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/cm"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log" e2elog "k8s.io/kubernetes/test/e2e/framework/log"
@ -85,28 +84,6 @@ func makePodToVerifyHugePages(baseName string, hugePagesLimit resource.Quantity)
return pod return pod
} }
// enableHugePagesInKubelet enables hugepages feature for kubelet
func enableHugePagesInKubelet(f *framework.Framework) *kubeletconfig.KubeletConfiguration {
oldCfg, err := getCurrentKubeletConfig()
framework.ExpectNoError(err)
newCfg := oldCfg.DeepCopy()
if newCfg.FeatureGates == nil {
newCfg.FeatureGates = make(map[string]bool)
newCfg.FeatureGates["HugePages"] = true
}
// Update the Kubelet configuration.
framework.ExpectNoError(setKubeletConfiguration(f, newCfg))
// Wait for the Kubelet to be ready.
Eventually(func() bool {
nodeList := framework.GetReadySchedulableNodesOrDie(f.ClientSet)
return len(nodeList.Items) == 1
}, time.Minute, time.Second).Should(BeTrue())
return oldCfg
}
// configureHugePages attempts to allocate 100Mi of 2Mi hugepages for testing purposes // configureHugePages attempts to allocate 100Mi of 2Mi hugepages for testing purposes
func configureHugePages() error { func configureHugePages() error {
err := exec.Command("/bin/sh", "-c", "echo 50 > /proc/sys/vm/nr_hugepages").Run() err := exec.Command("/bin/sh", "-c", "echo 50 > /proc/sys/vm/nr_hugepages").Run()
@ -198,8 +175,6 @@ var _ = SIGDescribe("HugePages [Serial] [Feature:HugePages][NodeFeature:HugePage
f := framework.NewDefaultFramework("hugepages-test") f := framework.NewDefaultFramework("hugepages-test")
Context("With config updated with hugepages feature enabled", func() { Context("With config updated with hugepages feature enabled", func() {
var oldCfg *kubeletconfig.KubeletConfiguration
BeforeEach(func() { BeforeEach(func() {
By("verifying hugepages are supported") By("verifying hugepages are supported")
if !isHugePageSupported() { if !isHugePageSupported() {
@ -214,8 +189,6 @@ var _ = SIGDescribe("HugePages [Serial] [Feature:HugePages][NodeFeature:HugePage
} }
return nil return nil
}, 30*time.Second, framework.Poll).Should(BeNil()) }, 30*time.Second, framework.Poll).Should(BeNil())
By("enabling hugepages in kubelet")
oldCfg = enableHugePagesInKubelet(f)
By("restarting kubelet to pick up pre-allocated hugepages") By("restarting kubelet to pick up pre-allocated hugepages")
restartKubelet() restartKubelet()
By("by waiting for hugepages resource to become available on the local node") By("by waiting for hugepages resource to become available on the local node")
@ -235,10 +208,6 @@ var _ = SIGDescribe("HugePages [Serial] [Feature:HugePages][NodeFeature:HugePage
} }
return nil return nil
}, 30*time.Second, framework.Poll).Should(BeNil()) }, 30*time.Second, framework.Poll).Should(BeNil())
if oldCfg != nil {
By("Restoring old kubelet config")
setOldKubeletConfig(f, oldCfg)
}
By("restarting kubelet to release hugepages") By("restarting kubelet to release hugepages")
restartKubelet() restartKubelet()
By("by waiting for hugepages resource to not appear available on the local node") By("by waiting for hugepages resource to not appear available on the local node")