Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions modules/python/clusterloader2/slo/slo.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def calculate_config(cpu_per_node, node_count, max_pods, provider, service_test,

pods_per_node = DEFAULT_PODS_PER_NODE
if service_test:
pods_per_node = LOAD_PODS_PER_NODE
pods_per_node = max_pods

if cnp_test or ccnp_test:
pods_per_node = max_pods
Expand All @@ -54,7 +54,7 @@ def configure_clusterloader2(
provider,
cilium_enabled,
service_test,
cnp_test,
cnp_test,
ccnp_test,
num_cnps,
num_ccnps,
Expand All @@ -65,6 +65,7 @@ def configure_clusterloader2(
throughput, nodes_per_namespace, pods_per_node, cpu_request = calculate_config(cpu_per_node, node_per_step, max_pods, provider, service_test, cnp_test, ccnp_test)

with open(override_file, 'w') as file:
file.write(f"CL2_NODES: {node_count}\n")
file.write(f"CL2_LOAD_TEST_THROUGHPUT: {throughput}\n")
file.write(f"CL2_NODES_PER_NAMESPACE: {nodes_per_namespace}\n")
file.write(f"CL2_NODES_PER_STEP: {node_per_step}\n")
Expand Down Expand Up @@ -136,7 +137,7 @@ def collect_clusterloader2(
run_id,
run_url,
service_test,
cnp_test,
cnp_test,
ccnp_test,
num_cnps,
num_ccnps,
Expand Down Expand Up @@ -274,7 +275,7 @@ def main():
help="Description of test type")

args = parser.parse_args()

if args.command == "configure":
configure_clusterloader2(args.cpu_per_node, args.node_count, args.node_per_step, args.max_pods,
args.repeats, args.operation_timeout, args.provider, args.cilium_enabled,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ stages:
cpu_per_node: 4
node_count: 1000
node_per_step: 1000
max_pods: 110
max_pods: 20
repeats: 10
scale_timeout: "15m"
cilium_enabled: True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ stages:
cpu_per_node: 4
node_count: 1000
node_per_step: 1000
max_pods: 110
max_pods: 20
repeats: 10
scale_timeout: "15m"
cilium_enabled: True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ stages:
matrix:
azure_cilium:
cpu_per_node: 4
node_count: 1000
node_per_step: 1000
max_pods: 110
repeats: 10
node_count: $(NODES)
node_per_step: $(NODES)
max_pods: $(PODS)
repeats: $(NO_REPEATS)
scale_timeout: "15m"
cilium_enabled: True
network_policy: cilium
Expand Down
6 changes: 3 additions & 3 deletions pipelines/perf-eval/CNI Benchmark/slo-servicediscovery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ stages:
cpu_per_node: 4
node_count: 1000
node_per_step: 1000
max_pods: 110
max_pods: 20
repeats: 10
scale_timeout: "15m"
cilium_enabled: False
Expand All @@ -57,7 +57,7 @@ stages:
cpu_per_node: 4
node_count: 1000
node_per_step: 1000
max_pods: 110
max_pods: 20
repeats: 10
scale_timeout: "15m"
cilium_enabled: False
Expand All @@ -67,7 +67,7 @@ stages:
cpu_per_node: 4
node_count: 1000
node_per_step: 1000
max_pods: 110
max_pods: 20
repeats: 10
scale_timeout: "15m"
cilium_enabled: True
Expand Down
Loading