Add matrix for k8s version 1.30

Azure · Feb 4, 2025 · 8a43815 · 8a43815
1 parent 769bb92
commit 8a43815
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 7 deletions.
diff --git a/pipelines/perf-eval/CRI Benchmark/cri-resource-consume.yml b/pipelines/perf-eval/CRI Benchmark/cri-resource-consume.yml
@@ -26,42 +26,90 @@ stages:
             image: "ghcr.io/azure/clusterloader2:v20241016"
           topology: cri-resource-consume
           matrix:
-            n10-p300-memory:
+            n10-p300-memory-1-31:
               node_count: 10
               max_pods: 30
               repeats: 1
               operation_timeout: 3m
               load_type: memory
-            n10-p700-memory:
+              kubernetes_version: "1.31"
+            n10-p700-memory-1-31:
               node_count: 10
               max_pods: 70
               repeats: 1
               operation_timeout: 7m
               load_type: memory
-            n10-p1100-memory:
+              kubernetes_version: "1.31"
+            n10-p1100-memory-1-31:
               node_count: 10
               max_pods: 110
               repeats: 1
               operation_timeout: 11m
               load_type: memory
-            n10-p300-cpu:
+              kubernetes_version: "1.31"
+            n10-p300-cpu-1-31:
               node_count: 10
               max_pods: 30
               repeats: 1
               operation_timeout: 3m
               load_type: cpu
-            n10-p700-cpu:
+              kubernetes_version: "1.31"
+            n10-p700-cpu-1-31:
               node_count: 10
               max_pods: 70
               repeats: 1
               operation_timeout: 7m
               load_type: cpu
-            n10-p1100-cpu:
+              kubernetes_version: "1.31"
+            n10-p1100-cpu-1-31:
+              node_count: 10
+              max_pods: 110
+              repeats: 1
+              operation_timeout: 11m
+              load_type: cpu
+              kubernetes_version: "1.31"
+            n10-p300-memory-1-30:
+              node_count: 10
+              max_pods: 30
+              repeats: 1
+              operation_timeout: 3m
+              load_type: memory
+              kubernetes_version: "1.30"
+            n10-p700-memory-1-30:
+              node_count: 10
+              max_pods: 70
+              repeats: 1
+              operation_timeout: 7m
+              load_type: memory
+              kubernetes_version: "1.30"
+            n10-p1100-memory-1-30:
+              node_count: 10
+              max_pods: 110
+              repeats: 1
+              operation_timeout: 11m
+              load_type: memory
+              kubernetes_version: "1.30"
+            n10-p300-cpu-1-30:
+              node_count: 10
+              max_pods: 30
+              repeats: 1
+              operation_timeout: 3m
+              load_type: cpu
+              kubernetes_version: "1.30"
+            n10-p700-cpu-1-30:
+              node_count: 10
+              max_pods: 70
+              repeats: 1
+              operation_timeout: 7m
+              load_type: cpu
+              kubernetes_version: "1.30"
+            n10-p1100-cpu-1-30:
               node_count: 10
               max_pods: 110
               repeats: 1
               operation_timeout: 11m
               load_type: cpu
+              kubernetes_version: "1.30"
           max_parallel: 3
           timeout_in_minutes: 120
           credential_type: service_connection

diff --git a/scenarios/perf-eval/cri-resource-consume/terraform-inputs/azure.tfvars b/scenarios/perf-eval/cri-resource-consume/terraform-inputs/azure.tfvars
@@ -59,6 +59,5 @@ aks_config_list = [
         node_labels          = { "cri-resource-consume" = "true" }
       }
     ]
-    kubernetes_version = "1.31"
   }
 ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,6 +59,5 @@ aks_config_list = [ @@
             node_labels          = { "cri-resource-consume" = "true" }
           }
         ]
-        kubernetes_version = "1.31"
       }
     ]