Wait for namespace deletion (cloud-bulldozer#142)

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
jtaleric · May 22, 2024 · be41e10 · be41e10
1 parent 45ecb8f
commit be41e10
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 100 deletions.
diff --git a/cmd/k8s-netperf/k8s-netperf.go b/cmd/k8s-netperf/k8s-netperf.go
@@ -27,7 +27,6 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 )
 
-const namespace = "netperf"
 const index = "k8s-netperf"
 const retry = 3
 
@@ -306,32 +305,7 @@ var rootCmd = &cobra.Command{
 }
 
 func cleanup(client *kubernetes.Clientset) {
-	log.Info("Cleaning resources created by k8s-netperf")
-	svcList, err := k8s.GetServices(client, namespace)
-	if err != nil {
-		log.Fatal(err)
-	}
-	for svc := range svcList.Items {
-		err = k8s.DestroyService(client, svcList.Items[svc])
-		if err != nil {
-			log.Error(err)
-		}
-	}
-	dpList, err := k8s.GetDeployments(client, namespace)
-	if err != nil {
-		log.Fatal(err)
-	}
-	for dp := range dpList.Items {
-		err = k8s.DestroyDeployment(client, dpList.Items[dp])
-		if err != nil {
-			log.Error(err)
-		}
-		_, err := k8s.WaitForDelete(client, dpList.Items[dp])
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-	err = k8s.DestroyNamespace(client)
+	err := k8s.DestroyNamespace(client)
 	if err != nil {
 		log.Error(err)
 		os.Exit(1)

diff --git a/pkg/drivers/iperf.go b/pkg/drivers/iperf.go
@@ -56,7 +56,7 @@ func (i *iperf3) Run(c *kubernetes.Clientset, rc rest.Config, nc config.Config,
 	id := uuid.New()
 	file := fmt.Sprintf("/tmp/iperf-%s", id.String())
 	pod := client.Items[0]
-	log.Debugf("🔥 Client (%s,%s) starting iperf3 against server : %s", pod.Name, pod.Status.PodIP, serverIP)
+	log.Debugf("🔥 Client (%s,%s) starting iperf3 against server: %s", pod.Name, pod.Status.PodIP, serverIP)
 	config.Show(nc, i.driverName)
 	tcp := true
 	if !strings.Contains(nc.Profile, "STREAM") {

diff --git a/pkg/drivers/netperf.go b/pkg/drivers/netperf.go
@@ -38,7 +38,7 @@ const omniOptions = "rt_latency,p99_latency,throughput,throughput_units,remote_r
 func (n *netperf) Run(c *kubernetes.Clientset, rc rest.Config, nc config.Config, client apiv1.PodList, serverIP string) (bytes.Buffer, error) {
 	var stdout, stderr bytes.Buffer
 	pod := client.Items[0]
-	log.Debugf("🔥 Client (%s,%s) starting netperf against server : %s", pod.Name, pod.Status.PodIP, serverIP)
+	log.Debugf("🔥 Client (%s,%s) starting netperf against server: %s", pod.Name, pod.Status.PodIP, serverIP)
 	config.Show(nc, n.driverName)
 	cmd := []string{superNetperf, strconv.Itoa(nc.Parallelism), strconv.Itoa(k8s.NetperfServerDataPort), "-H",
 		serverIP, "-l",

diff --git a/pkg/drivers/uperf.go b/pkg/drivers/uperf.go
@@ -142,7 +142,7 @@ func (u *uperf) Run(c *kubernetes.Clientset, rc rest.Config, nc config.Config, c
 	var exec remotecommand.Executor
 
 	pod := client.Items[0]
-	log.Debugf("🔥 Client (%s,%s) starting uperf against server : %s", pod.Name, pod.Status.PodIP, serverIP)
+	log.Debugf("🔥 Client (%s,%s) starting uperf against server: %s", pod.Name, pod.Status.PodIP, serverIP)
 	config.Show(nc, u.driverName)
 
 	filePath, err := createUperfProfile(c, rc, nc, pod, serverIP)