Update Kube-burner dependency to v2.1.0 (#364)

rsevilla87 · web-flow · commit b2f7bb36c969 · 2025-12-18T11:47:28.000+01:00
* Kube-burner v2.1.0

Signed-off-by: Raul Sevilla &lt;rsevilla@redhat.com&gt;

* Increase number of iterations to enhance churning testing

Signed-off-by: Raul Sevilla &lt;rsevilla@redhat.com&gt;

---------

Signed-off-by: Raul Sevilla &lt;rsevilla@redhat.com&gt;
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.23.4
 require (
 	github.com/cloud-bulldozer/go-commons/v2 v2.2.0
 	github.com/google/uuid v1.6.0
-	github.com/kube-burner/kube-burner/v2 v2.0.1
+	github.com/kube-burner/kube-burner/v2 v2.1.0
 	github.com/openshift/api v0.0.0-20240527133614-ba11c1587003
 	github.com/openshift/client-go v0.0.0-20240821135114-75c118605d5f
 	github.com/praserx/ipconv v1.2.1
diff --git a/go.sum b/go.sum
@@ -240,8 +240,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kube-burner/kube-burner/v2 v2.0.1 h1:4Pu/pz3UPYyI2dBitRpsyoRcgd9g45vUuHJGJ+ywH4o=
-github.com/kube-burner/kube-burner/v2 v2.0.1/go.mod h1:UN8CJ51Kt6W5ugjRVZesdv6cZIVxSpixKbm7cHsmoUs=
+github.com/kube-burner/kube-burner/v2 v2.1.0 h1:ggRBIhAe1d16SvEScDu/LT1fPxwf4SpNXsRnFmUqegM=
+github.com/kube-burner/kube-burner/v2 v2.1.0/go.mod h1:UN8CJ51Kt6W5ugjRVZesdv6cZIVxSpixKbm7cHsmoUs=
 github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 h1:nHHjmvjitIiyPlUHk/ofpgvBcNcawJLtf4PYHORLjAA=
 github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0/go.mod h1:YBCo4DoEeDndqvAn6eeu0vWM7QdXmHEeI9cFWplmBys=
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
diff --git a/pkg/workloads/anp-density-pods.go b/pkg/workloads/anp-density-pods.go
@@ -306,8 +306,8 @@ func NewANPDensityPods(wh *workloads.WorkloadHelper, variant string) *cobra.Comm
 			AdditionalVars["JOB_ITERATIONS"] = iterations
 			AdditionalVars["POD_READY_THRESHOLD"] = podReadyThreshold
 			AdditionalVars["SVC_LATENCY"] = svcLatency
-
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 
 			sourceNsPrefix := "anp-cidr"
 			targetNsPrefix := "openshift-monitoring"
diff --git a/pkg/workloads/cluster-density.go b/pkg/workloads/cluster-density.go
@@ -64,7 +64,8 @@ func NewClusterDensity(wh *workloads.WorkloadHelper, variant string) *cobra.Comm
 			AdditionalVars["INGRESS_DOMAIN"] = ingressDomain
 			AdditionalVars["CHURN_MODE"] = churnMode
 
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/crd-scale.go b/pkg/workloads/crd-scale.go
@@ -34,7 +34,8 @@ func NewCrdScale(wh *workloads.WorkloadHelper) *cobra.Command {
 			setMetrics(cmd, metricsProfiles)
 			AdditionalVars["JOB_ITERATIONS"] = iterations
 
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/custom-workload.go b/pkg/workloads/custom-workload.go
@@ -69,7 +69,8 @@ func CustomWorkload(wh *workloads.WorkloadHelper) *cobra.Command {
 			AdditionalVars["POD_READY_THRESHOLD"] = podReadyThreshold
 			AdditionalVars["SVC_LATENCY"] = svcLatency
 
-			rc = wh.RunWithAdditionalVars(configFile, AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(configFile)
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/dv-clone.go b/pkg/workloads/dv-clone.go
@@ -74,7 +74,8 @@ func NewDVClone(wh *workloads.WorkloadHelper) *cobra.Command {
 			AdditionalVars["clonesPerIteration"] = clonesPerIteration
 
 			setMetrics(cmd, metricsProfiles)
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/egressip.go b/pkg/workloads/egressip.go
@@ -160,7 +160,8 @@ func NewEgressIP(wh *workloads.WorkloadHelper, variant string) *cobra.Command {
 			AdditionalVars["ADDRESSES_PER_ITERATION"] = addressesPerIteration
 			AdditionalVars["EXTERNAL_SERVER_IP"] = externalServerIP
 			AdditionalVars["EIP_ADDRESSES"] = eipAddresses
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/helpers.go b/pkg/workloads/helpers.go
@@ -305,7 +305,7 @@ func cleanupTestNamespaces(ctx context.Context, labelSelector string) {
 		return
 	}
 
-	kubeburnerutil.CleanupNamespaces(ctx, k8sConnector.ClientSet(), labelSelector)
+	kubeburnerutil.CleanupNamespacesByLabel(ctx, k8sConnector.ClientSet(), labelSelector)
 
 	namespaceNamesMap := make(map[string]struct{}, len(ns.Items))
 	for _, ns := range ns.Items {
diff --git a/pkg/workloads/kueue-operator.go b/pkg/workloads/kueue-operator.go
@@ -53,7 +53,8 @@ func NewKueueOperator(wh *workloads.WorkloadHelper, variant string) *cobra.Comma
 			AdditionalVars["QPS"] = QPS
 			AdditionalVars["BURST"] = burst
 			setMetrics(cmd, metricsProfiles)
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/network-policy.go b/pkg/workloads/network-policy.go
@@ -63,7 +63,8 @@ func NewNetworkPolicy(wh *workloads.WorkloadHelper, variant string) *cobra.Comma
 			AdditionalVars["NETPOL_LATENCY"] = netpolLatency
 			AdditionalVars["NETPOL_READY_THRESHOLD"] = netpolReadyThreshold
 
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/node-density.go b/pkg/workloads/node-density.go
@@ -64,7 +64,8 @@ func NewNodeDensity(wh *workloads.WorkloadHelper, variant string) *cobra.Command
 				AdditionalVars["JOB_ITERATIONS"] = (totalPods - podCount) / 2
 			}
 			setMetrics(cmd, metricsProfiles)
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/node-scale.go b/pkg/workloads/node-scale.go
@@ -51,7 +51,8 @@ func NewNodeScale(wh *workloads.WorkloadHelper, variant string) *cobra.Command {
 			AdditionalVars["TAG"] = tag
 			AdditionalVars["MAX_PODS"] = maxPods
 			setMetrics(cmd, metricsProfiles)
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/olmv1.go b/pkg/workloads/olmv1.go
@@ -60,7 +60,8 @@ func NewOLMv1(wh *workloads.WorkloadHelper, variant string) *cobra.Command {
 			AdditionalVars["PREFIX_PKG_NAME_V1"] = prefixPkgName
 			AdditionalVars["PREFIX_IMG_NAME"] = prefixImgName
 
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/pvc-density.go b/pkg/workloads/pvc-density.go
@@ -42,7 +42,8 @@ func NewPVCDensity(wh *workloads.WorkloadHelper) *cobra.Command {
 			AdditionalVars["STORAGE_CLASS_NAME"] = storageClassName
 
 			setMetrics(cmd, metricsProfiles)
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/rds-core.go b/pkg/workloads/rds-core.go
@@ -58,7 +58,8 @@ func NewRDSCore(wh *workloads.WorkloadHelper) *cobra.Command {
 			AdditionalVars["POD_READY_THRESHOLD"] = podReadyThreshold
 			AdditionalVars["SVC_LATENCY"] = svcLatency
 			AdditionalVars["INGRESS_DOMAIN"] = ingressDomain
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/udn-bgp.go b/pkg/workloads/udn-bgp.go
@@ -41,8 +41,9 @@ func NewUdnBgp(wh *workloads.WorkloadHelper, variant string) *cobra.Command {
 			setMetrics(cmd, metricsProfiles)
 			AdditionalVars["JOB_ITERATIONS"] = iterations
 			AdditionalVars["NAMESPACES_PER_CUDN"] = namespacePerCudn
-
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, additionalMeasurementFactoryMap)
+			wh.SetMeasurements(additionalMeasurementFactoryMap)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/udn-density-pods.go b/pkg/workloads/udn-density-pods.go
@@ -61,7 +61,8 @@ func NewUDNDensityPods(wh *workloads.WorkloadHelper) *cobra.Command {
 			AdditionalVars["JOB_ITERATIONS"] = iterations
 			AdditionalVars["POD_READY_THRESHOLD"] = podReadyThreshold
 			AdditionalVars["ENABLE_LAYER_3"] = l3
-			rc = wh.RunWithAdditionalVars("udn-density-pods.yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/virt-capacity-benchmark.go b/pkg/workloads/virt-capacity-benchmark.go
@@ -139,7 +139,8 @@ func NewVirtCapacityBenchmark(wh *workloads.WorkloadHelper) *cobra.Command {
 				AdditionalVars["storageClassName"] = storageClassName
 
 				os.Setenv("counter", fmt.Sprint(counter))
-				rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+				wh.SetVariables(AdditionalVars, nil)
+				rc = wh.Run(cmd.Name() + ".yml")
 				if rc != 0 {
 					log.Infof("Capacity failed in loop #%d", counter)
 					break
diff --git a/pkg/workloads/virt-clone.go b/pkg/workloads/virt-clone.go
@@ -85,7 +85,8 @@ func NewVirtClone(wh *workloads.WorkloadHelper) *cobra.Command {
 			AdditionalVars["dataVolumeCounters"] = generateLoopCounterSlice(dataVolumeCount, 1)
 
 			setMetrics(cmd, metricsProfiles)
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/virt-density-udn.go b/pkg/workloads/virt-density-udn.go
@@ -74,7 +74,8 @@ func NewVirtUDNDensity(wh *workloads.WorkloadHelper) *cobra.Command {
 				log.Info("Layer 2 is enabled")
 				AddVirtMetadata(wh, vmImage, "layer2", bindingMethod)
 			}
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/virt-density.go b/pkg/workloads/virt-density.go
@@ -59,7 +59,8 @@ func NewVirtDensity(wh *workloads.WorkloadHelper) *cobra.Command {
 			setMetrics(cmd, metricsProfiles)
 			AddVirtMetadata(wh, vmImage, "", "")
 
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/virt-ephemeral-restart.go b/pkg/workloads/virt-ephemeral-restart.go
@@ -74,7 +74,8 @@ func NewVirtEphemeralRestart(wh *workloads.WorkloadHelper) *cobra.Command {
 			AdditionalVars["vmGroups"] = generateLoopCounterSlice(iterations, 0)
 
 			setMetrics(cmd, metricsProfiles)
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/virt-migration.go b/pkg/workloads/virt-migration.go
@@ -87,7 +87,8 @@ func NewVirtMigration(wh *workloads.WorkloadHelper) *cobra.Command {
 			AdditionalVars["migrationQPS"] = migrationQPS
 
 			setMetrics(cmd, metricsProfiles)
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/web-burner.go b/pkg/workloads/web-burner.go
@@ -46,7 +46,8 @@ func NewWebBurner(wh *workloads.WorkloadHelper, variant string) *cobra.Command {
 			AdditionalVars["SCALE"] = scale
 			AdditionalVars["SRIOV"] = sriov
 
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/pkg/workloads/whereabouts.go b/pkg/workloads/whereabouts.go
@@ -41,7 +41,8 @@ func NewWhereabouts(wh *workloads.WorkloadHelper) *cobra.Command {
 			AdditionalVars["CONTAINER_IMAGE"] = containerImage
 			AdditionalVars["FAST"] = fast
 			setMetrics(cmd, metricsProfiles)
-			rc = wh.RunWithAdditionalVars(cmd.Name()+".yml", AdditionalVars, nil)
+			wh.SetVariables(AdditionalVars, nil)
+			rc = wh.Run(cmd.Name() + ".yml")
 		},
 		PostRun: func(cmd *cobra.Command, args []string) {
 			os.Exit(rc)
diff --git a/test/test-ocp.bats b/test/test-ocp.bats
@@ -68,7 +68,7 @@ teardown_file() {
 }
 
 @test "cluster-density-v2: profile-type=both; user-metadata=true; es-indexing=true; churning=true; svcLatency=true" {
-  run_cmd ${KUBE_BURNER_OCP} cluster-density-v2 --iterations=2 --churn-cycles=1 --churn-delay=5s --profile-type=both ${INDEXING_FLAGS} --user-metadata=user-metadata.yml --service-latency --uuid=${UUID}
+  run_cmd ${KUBE_BURNER_OCP} cluster-density-v2 --iterations=12 --churn-cycles=1 --churn-percent=25 --churn-delay=5s --profile-type=both ${INDEXING_FLAGS} --user-metadata=user-metadata.yml --service-latency --uuid=${UUID}
   check_metric_value cpu-kubelet jobSummary podLatencyMeasurement podLatencyQuantilesMeasurement svcLatencyMeasurement svcLatencyQuantilesMeasurement etcdVersion
 }
 

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ func cleanupTestNamespaces(ctx context.Context, labelSelector string) {`
`305`	`305`	`return`
`306`	`306`	`}`
`307`	`307`
`308`		`- kubeburnerutil.CleanupNamespaces(ctx, k8sConnector.ClientSet(), labelSelector)`
	`308`	`+ kubeburnerutil.CleanupNamespacesByLabel(ctx, k8sConnector.ClientSet(), labelSelector)`
`309`	`309`
`310`	`310`	`namespaceNamesMap := make(map[string]struct{}, len(ns.Items))`
`311`	`311`	`for _, ns := range ns.Items {`