Make l4lb-class configuration generic for LBs

Author: 08volt

clusterloader2/testing/l4lb-class/config.yaml

@@ -1,14 +1,14 @@
 {{$LARGE_BACKEND_LB_SERVICE_COUNT := DefaultParam .CL2_LARGE_BACKEND_LB_SERVICE_COUNT 2}}
 {{$MEDIUM_BACKEND_LB_SERVICE_COUNT := DefaultParam .CL2_MEDIUM_BACKEND_LB_SERVICE_COUNT 2}}
 {{$SMALL_BACKEND_LB_SERVICE_COUNT := DefaultParam .CL2_SMALL_BACKEND_LB_SERVICE_COUNT 2}}
-{{$lbQPS := DefaultParam .CL2_ILB_TEST_QPS 20}}
+{{$lbQPS := DefaultParam .CL2_LB_TEST_QPS 20}}
 {{$LOAD_BALANCER_CLASS := DefaultParam .CL2_LOAD_BALANCER_CLASS "invalid.scalability.gke.io"}}
 
 name: l4lbload
 namespace:
   number: 1
 tuningSets:
-- name: ILBConstantQPS
+- name: LBConstantQPS
   qpsLoad:
     qps: {{$lbQPS}}
 steps:

clusterloader2/testing/l4lb-class/modules/measurements.yaml

@@ -1,6 +1,6 @@
 # Valid actions: "start", "waitForReady" and "gather"
 {{$action := .action}}
-{{$ilbWaitTimeout := DefaultParam .CL2_ILB_WAIT_TIMEOUT "10m"}}
+{{$lbWaitTimeout := DefaultParam .CL2_LB_WAIT_TIMEOUT "10m"}}
 
 steps:
 - name: Service creation latency measurements - '{{$action}}'
@@ -9,17 +9,17 @@ steps:
     Method: ServiceCreationLatency
     Params:
       action: {{$action}}
-      waitTimeout: {{$ilbWaitTimeout}}
-      labelSelector: size = ilb-large
+      waitTimeout: {{$lbWaitTimeout}}
+      labelSelector: size = lb-large
   - Identifier: ServiceCreationLatencyMedium
     Method: ServiceCreationLatency
     Params:
       action: {{$action}}
-      waitTimeout: {{$ilbWaitTimeout}}
-      labelSelector: size = ilb-medium
+      waitTimeout: {{$lbWaitTimeout}}
+      labelSelector: size = lb-medium
   - Identifier: ServiceCreationLatencySmall
     Method: ServiceCreationLatency
     Params:
       action: {{$action}}
-      waitTimeout: {{$ilbWaitTimeout}}
-      labelSelector: size = ilb-small
+      waitTimeout: {{$lbWaitTimeout}}
+      labelSelector: size = lb-small

clusterloader2/testing/l4lb-class/modules/services.yaml

@@ -16,14 +16,14 @@ steps:
       min: 1
       max: {{$namespaces}}
     replicasPerNamespace: {{$LARGE_BACKEND_LB_SERVICE_COUNT}}
-    tuningSet: ILBConstantQPS
+    tuningSet: LBConstantQPS
     objectBundle:
     - basename: large-backends-service
       objectTemplatePath: service.yaml
       templateFillMap:
         DeploymentBaseName: large-backends-dep
         ExternalTrafficPolicy: {{$EXTERNAL_TRAFFIC_POLICY}}
-        LBSizeLabel: ilb-large
+        LBSizeLabel: lb-large
         LoadBalancerClass: {{$LOAD_BALANCER_CLASS}}
     - basename: large-backends-dep
       objectTemplatePath: dep.yaml
@@ -33,14 +33,14 @@ steps:
       min: 1
       max: {{$namespaces}}
     replicasPerNamespace: {{$MEDIUM_BACKEND_LB_SERVICE_COUNT}}
-    tuningSet: ILBConstantQPS
+    tuningSet: LBConstantQPS
     objectBundle:
     - basename: medium-backends-service
       objectTemplatePath: service.yaml
       templateFillMap:
         DeploymentBaseName: medium-backends-dep
         ExternalTrafficPolicy: {{$EXTERNAL_TRAFFIC_POLICY}}
-        LBSizeLabel: ilb-medium
+        LBSizeLabel: lb-medium
         LoadBalancerClass: {{$LOAD_BALANCER_CLASS}}
     - basename: medium-backends-dep
       objectTemplatePath: dep.yaml
@@ -50,14 +50,14 @@ steps:
       min: 1
       max: {{$namespaces}}
     replicasPerNamespace: {{$SMALL_BACKEND_LB_SERVICE_COUNT}}
-    tuningSet: ILBConstantQPS
+    tuningSet: LBConstantQPS
     objectBundle:
     - basename: small-backends-service
       objectTemplatePath: service.yaml
       templateFillMap:
         DeploymentBaseName: small-backends-dep
         ExternalTrafficPolicy: {{$EXTERNAL_TRAFFIC_POLICY}}
-        LBSizeLabel: ilb-small
+        LBSizeLabel: lb-small
         LoadBalancerClass: {{$LOAD_BALANCER_CLASS}}
     - basename: small-backends-dep
       objectTemplatePath: dep.yaml