From deb5edffed89fffe36024156445daa3e01a23136 Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Fri, 3 Nov 2023 13:24:22 +0200 Subject: [PATCH] test/e2e: fix incorrect Allocat[ion|or]Priority config key. And also use more consistent naming in the environment wrt. the actual configuration key. Signed-off-by: Krisztian Litkey --- .../policies.test-suite/balloons/balloons-configmap.yaml.in | 4 ++-- .../balloons/n4c16/test08-numa/balloons-numa.cfg | 2 +- test/e2e/policies.test-suite/balloons/nri-resource-policy.cfg | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/policies.test-suite/balloons/balloons-configmap.yaml.in b/test/e2e/policies.test-suite/balloons/balloons-configmap.yaml.in index ff9c927cf..74549e18b 100644 --- a/test/e2e/policies.test-suite/balloons/balloons-configmap.yaml.in +++ b/test/e2e/policies.test-suite/balloons/balloons-configmap.yaml.in @@ -24,7 +24,7 @@ data: - Name: btype0 MinCPUs: ${BTYPE0_MINCPUS:-2} MaxCPUs: ${BTYPE0_MAXCPUS:-2} - AllocationPriority: ${BTYPE0_ALLOCATIONPRIORITY:-0} + AllocatorPriority: ${BTYPE0_ALLOCATORPRIORITY:-0} CPUClass: ${BTYPE0_CPUCLASS:-classA} PreferNewBalloons: ${BTYPE0_PREFERNEWBALLOONS:-true} PreferSpreadingPods: ${BTYPE0_PREFERSPREADINGPODS:-false} @@ -36,7 +36,7 @@ data: - ${BTYPE1_NAMESPACE0:-btype1ns0} MinCPUs: ${BTYPE1_MINCPUS:-1} MaxCPUs: ${BTYPE1_MAXCPUS:-1} - AllocatorPriority: ${BTYPE1_ALLOCATIONPRIORITY:-1} + AllocatorPriority: ${BTYPE1_ALLOCATORPRIORITY:-1} CPUClass: ${BTYPE1_CPUCLASS:-classB} PreferNewBalloons: ${BTYPE1_PREFERNEWBALLOONS:-false} PreferSpreadingPods: ${BTYPE1_PREFERSPREADINGPODS:-true} diff --git a/test/e2e/policies.test-suite/balloons/n4c16/test08-numa/balloons-numa.cfg b/test/e2e/policies.test-suite/balloons/n4c16/test08-numa/balloons-numa.cfg index 4a8cf6b03..80d61534c 100644 --- a/test/e2e/policies.test-suite/balloons/n4c16/test08-numa/balloons-numa.cfg +++ b/test/e2e/policies.test-suite/balloons/n4c16/test08-numa/balloons-numa.cfg @@ -17,7 +17,7 @@ policy: # Prevent a balloon to be inflated larger than a NUMA node MinCPUs: 0 MaxCPUs: 4 - AllocationPriority: 0 + AllocatorPriority: 0 PreferNewBalloons: false instrumentation: HTTPEndpoint: ":8891" diff --git a/test/e2e/policies.test-suite/balloons/nri-resource-policy.cfg b/test/e2e/policies.test-suite/balloons/nri-resource-policy.cfg index 7fa1cb8e1..6d9f0c573 100644 --- a/test/e2e/policies.test-suite/balloons/nri-resource-policy.cfg +++ b/test/e2e/policies.test-suite/balloons/nri-resource-policy.cfg @@ -17,7 +17,7 @@ policy: - Name: two-cpu MinCPUs: 2 MaxCPUs: 2 - AllocationPriority: 0 + AllocatorPriority: 0 CPUClass: class2 PreferNewBalloons: true