added group as a matchlabel and made adjustments to cnptest, ccnptest…

… variables
Azure · Jan 9, 2025 · c4c737b · c4c737b
1 parent 64f4c93
commit c4c737b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/modules/python/clusterloader2/slo/config/ccnp_template.yaml b/modules/python/clusterloader2/slo/config/ccnp_template.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   endpointSelector:
     matchLabels:
-      env: "a"
+      group: {{.Group}}
   egress:
   - toEndpoints:
     - {}

diff --git a/modules/python/clusterloader2/slo/config/cnp_template.yaml b/modules/python/clusterloader2/slo/config/cnp_template.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   endpointSelector:
     matchLabels:
-      env: "a"
+      group: {{.Group}}
   egress:
   - toEndpoints:
     - {}
diff --git a/modules/python/clusterloader2/slo/config/load-config.yaml b/modules/python/clusterloader2/slo/config/load-config.yaml
@@ -98,6 +98,7 @@ steps:
       params:
         actionName: "Creating"
         namespaces: {{$namespaces}}
+        Group: {{$groupName}}
         cnpsPerNamespace: {{$CNPS_PER_NAMESPACE}}
 {{end}}
 
@@ -106,6 +107,7 @@ steps:
       path: /modules/ciliumclusternetworkpolicy.yaml
       params:
         actionName: "Creating"
+        Group: {{$groupName}}
         ccnps: {{$CCNPS}}
 {{end}}
 
@@ -119,6 +121,8 @@ steps:
     {{if or $CCNP_TEST $CNP_TEST}}
         bigDeploymentSize: 0
         bigDeploymentsPerNamespace: 0
+        cnp_test: {{$CNP_TEST}}
+        ccnp_test: {{$CCNP_TEST}}
     {{else}}
         bigDeploymentSize: {{$BIG_GROUP_SIZE}}
         bigDeploymentsPerNamespace: {{$bigDeploymentsPerNamespace}}
@@ -140,6 +144,8 @@ steps:
     {{if or $CCNP_TEST $CNP_TEST}}
         bigDeploymentSize: 0
         bigDeploymentsPerNamespace: 0
+        cnp_test: {{$CNP_TEST}}
+        ccnp_test: {{$CCNP_TEST}}
     {{else}}
         bigDeploymentSize: {{$BIG_GROUP_SIZE}}
         bigDeploymentsPerNamespace: {{$bigDeploymentsPerNamespace}}
@@ -161,6 +167,8 @@ steps:
     {{if or $CCNP_TEST $CNP_TEST}}
         bigDeploymentSize: 0
         bigDeploymentsPerNamespace: 0
+        cnp_test: {{$CNP_TEST}}
+        ccnp_test: {{$CCNP_TEST}}
     {{else}}
         bigDeploymentSize: {{$BIG_GROUP_SIZE}}
         bigDeploymentsPerNamespace: 0

diff --git a/modules/python/clusterloader2/slo/config/modules/ciliumclusternetworkpolicy.yaml b/modules/python/clusterloader2/slo/config/modules/ciliumclusternetworkpolicy.yaml
@@ -3,6 +3,7 @@
 ## Input params
 {{$actionName := .actionName}}
 {{$ccnps := .ccnps}}
+{{$Group := .Group}}
 
 steps:
 - name: "{{$actionName}} k8s CCNPs"
@@ -12,4 +13,6 @@ steps:
     tuningSet: Sequence
     objectBundle:
     - basename: ccnp
-      objectTemplatePath: ccnp_template.yaml
+      objectTemplatePath: ccnp_template.yaml
+      parameters:
+        Group: {{$Group}}
diff --git a/modules/python/clusterloader2/slo/config/modules/ciliumnetworkpolicy.yaml b/modules/python/clusterloader2/slo/config/modules/ciliumnetworkpolicy.yaml
@@ -4,6 +4,7 @@
 {{$actionName := .actionName}}
 {{$namespaces := .namespaces}}
 {{$cnpsPerNamespace := .cnpsPerNamespace}}
+{{$Group := .Group}}
 
 steps:
 - name: "{{$actionName}} k8s CNPs"
@@ -16,4 +17,5 @@ steps:
     objectBundle:
     - basename: cnp
       objectTemplatePath: cnp_template.yaml
-
+      parameters:
+        Group: {{$Group}}
diff --git a/modules/python/clusterloader2/slo/config/modules/reconcile-objects.yaml b/modules/python/clusterloader2/slo/config/modules/reconcile-objects.yaml
@@ -14,11 +14,8 @@
 {{$smallDeploymentSize := .smallDeploymentSize}}
 {{$smallDeploymentsPerNamespace := .smallDeploymentsPerNamespace}}
 
-{{$cnpsPerNamespace := .cnpsPerNamespace}}
-{{$ccnps := .ccnps}}
 {{$cnp_test:= .cnp_test}}
 {{$ccnp_test:= .ccnp_test}}
-{{$dualstack:= .dualstack}}
 
 steps:
 - name: Starting measurement for '{{$actionName}}'
@@ -64,7 +61,6 @@ steps:
   {{if or $cnp_test $ccnp_test}}
         cnp_test: {{$cnp_test}}
         ccnp_test: {{$ccnp_test}}
-        dualstack: {{$dualstack}}
   {{else}}
         SvcName: small-service
   {{end}}