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

e2e: topomgr: explicit save the kubelet config

Browse Source 
For the sake of readability, save the old Kubelet config
once.

Signed-off-by: Francesco Romani <fromani@redhat.com>
This commit is contained in:
Francesco Romani 2020-01-17 13:30:31 +01:00
parent 7a506ff342
commit 1fdf262137
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e_node/topology_manager_test.go
View File

@ -76,10 +76,8 @@ func makeTopologyManagerPod(podName string, tmCtnAttributes []tmCtnAttribute) *v
} }
} }
func configureTopologyManagerInKubelet(f *framework.Framework, policy string) { func configureTopologyManagerInKubelet(f *framework.Framework, oldCfg *kubeletconfig.KubeletConfiguration, policy string) {
// Configure Topology Manager in Kubelet with policy. // Configure Topology Manager in Kubelet with policy.
oldCfg, err := getCurrentKubeletConfig()
framework.ExpectNoError(err)
newCfg := oldCfg.DeepCopy() newCfg := oldCfg.DeepCopy()
if newCfg.FeatureGates == nil { if newCfg.FeatureGates == nil {
newCfg.FeatureGates = make(map[string]bool) newCfg.FeatureGates = make(map[string]bool)
@ -92,7 +90,6 @@ func configureTopologyManagerInKubelet(f *framework.Framework, policy string) {
// Set the Topology Manager policy // Set the Topology Manager policy
newCfg.TopologyManagerPolicy = policy newCfg.TopologyManagerPolicy = policy
//newCfg.TopologyManagerPolicy = topologymanager.PolicySingleNumaNode
// Set the CPU Manager policy to static. // Set the CPU Manager policy to static.
newCfg.CPUManagerPolicy = string(cpumanager.PolicyStatic) newCfg.CPUManagerPolicy = string(cpumanager.PolicyStatic)
@ -351,18 +348,19 @@ func runTopologyManagerSuiteTests(f *framework.Framework) {
} }
func runTopologyManagerTests(f *framework.Framework) { func runTopologyManagerTests(f *framework.Framework) {
var oldCfg *kubeletconfig.KubeletConfiguration
ginkgo.It("run Topology Manager test suite", func() { ginkgo.It("run Topology Manager test suite", func() {
oldCfg, err := getCurrentKubeletConfig()
framework.ExpectNoError(err)
var policies = []string{topologymanager.PolicySingleNumaNode, topologymanager.PolicyRestricted, var policies = []string{topologymanager.PolicySingleNumaNode, topologymanager.PolicyRestricted,
topologymanager.PolicyBestEffort, topologymanager.PolicyNone} topologymanager.PolicyBestEffort, topologymanager.PolicyNone}
for _, policy := range policies { for _, policy := range policies {
// Configure Topology Manager // Configure Topology Manager
ginkgo.By("by configuring Topology Manager policy to xxx") ginkgo.By(fmt.Sprintf("by configuring Topology Manager policy to %s", policy))
framework.Logf("Configuring topology Manager policy to %s", policy) framework.Logf("Configuring topology Manager policy to %s", policy)
configureTopologyManagerInKubelet(f, policy)
configureTopologyManagerInKubelet(f, oldCfg, policy)
// Run the tests // Run the tests
runTopologyManagerSuiteTests(f) runTopologyManagerSuiteTests(f)
} }