fix delete err

Author: tataruty

tests/framework/prometheus.go

@@ -191,7 +191,6 @@ func (ins *PrometheusInstance) PortForward(config *rest.Config, stopCh <-chan st
 }
 
 func (ins *PrometheusInstance) getAPIClient() (v1.API, error) {
-	GinkgoWriter.Printf("Creating Prometheus API client for pod %q in namespace %q\n", ins.podName, ins.podNamespace)
 	var endpoint string
 	if ins.portForward {
 		endpoint = fmt.Sprintf("http://localhost:%d", PrometheusPortForwardPort)
@@ -231,7 +230,6 @@ func (ins *PrometheusInstance) ensureAPIClient() error {
 
 // Query sends a query to Prometheus.
 func (ins *PrometheusInstance) Query(query string) (model.Value, error) {
-	GinkgoWriter.Printf("Querying Prometheus with query: %q\n", query)
 	ctx, cancel := context.WithTimeout(context.Background(), ins.queryTimeout)
 	defer cancel()
 

tests/framework/resourcemanager.go

@@ -265,7 +265,7 @@ func (rm *ResourceManager) DeleteNamespace(name string, opts ...Option) error {
 }
 
 func (rm *ResourceManager) DeleteNamespaces(names []string, opts ...Option) error {
-	GinkgoWriter.Printf("Deleting namespaces: %v\n", names)
+	GinkgoWriter.Printf("Deleting %d namespaces\n", len(names))
 	ctx, cancel := context.WithTimeout(context.Background(), rm.TimeoutConfig.DeleteNamespaceTimeout*2)
 	defer cancel()
 
@@ -288,7 +288,7 @@ func (rm *ResourceManager) DeleteNamespaces(names []string, opts ...Option) erro
 		true, /* poll immediately */
 		func(ctx context.Context) (bool, error) {
 			nsList := &core.NamespaceList{}
-			if err := rm.List(ctx, nsList, nil); err != nil {
+			if err := rm.List(ctx, nsList); err != nil {
 				return false, nil //nolint:nilerr // retry on error
 			}
 
@@ -1288,12 +1288,11 @@ func (rm *ResourceManager) Delete(
 	options := LogOptions(opts...)
 	err := rm.K8sClient.Delete(ctx, obj, deleteOpts...)
 	if err != nil {
-		deleteErr := fmt.Errorf("error deleting k8s resource %q: %w", obj.GetName(), err)
 		if options.logEnabled {
-			GinkgoWriter.Printf("%v\n", deleteErr)
+			GinkgoWriter.Printf("Could not delete k8s resource %q: %w\n", obj.GetName(), err)
 		}
 
-		return deleteErr
+		return err
 	}
 	return nil
 }

tests/suite/dataplane_perf_test.go

@@ -63,7 +63,7 @@ var _ = Describe("Dataplane performance", Ordered, Label("nfr", "performance"),
 		}
 
 		Expect(resourceManager.Apply([]client.Object{&ns})).To(Succeed())
-		Expect(resourceManager.ApplyFromFiles(files, ns.Name)).To(Succeed())
+		Expect(resourceManager.ApplyFromFiles(files, ns.Name, framework.WithLoggingDisabled())).To(Succeed())
 		Expect(resourceManager.WaitForAppsToBeReady(ns.Name, framework.WithLoggingDisabled())).To(Succeed())
 
 		nginxPodNames, err := resourceManager.GetReadyNginxPodNames(

tests/suite/longevity_test.go

@@ -84,7 +84,7 @@ var _ = Describe("Longevity", Label("longevity-setup", "longevity-teardown"), fu
 
 		framework.AddNginxLogsAndEventsToReport(resourceManager, ns.Name, framework.WithLoggingDisabled())
 		Expect(resourceManager.DeleteFromFiles(files, ns.Name)).To(Succeed())
-		Expect(resourceManager.DeleteNamespace(ns.Name)).To(Succeed())
+		Expect(resourceManager.DeleteNamespace(ns.Name, framework.WithLoggingDisabled())).To(Succeed())
 	})
 })
 

tests/suite/reconfig_test.go

@@ -137,7 +137,7 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
 			Expect(resourceManager.Create(ctx, &ns)).To(Succeed())
 		}
 
-		Expect(resourceManager.Apply([]client.Object{&reconfigNamespace})).To(Succeed())
+		Expect(resourceManager.Apply([]client.Object{&reconfigNamespace}, framework.WithLoggingDisabled())).To(Succeed())
 		Expect(resourceManager.ApplyFromFiles(
 			[]string{
 				"reconfig/cafe-secret.yaml",
@@ -271,6 +271,7 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
 					q,
 					getStartTime,
 					modifyStartTime,
+					framework.WithLoggingDisabled(),
 				),
 			).WithTimeout(metricExistTimeout).WithPolling(metricExistPolling).Should(Succeed())
 		}
@@ -299,6 +300,7 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
 					q,
 					getEndTime,
 					noOpModifier,
+					framework.WithLoggingDisabled(),
 				),
 			).WithTimeout(metricExistTimeout).WithPolling(metricExistPolling).Should(Succeed())
 		}
@@ -404,7 +406,7 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("nfr", "r
 				Expect(podNames).To(HaveLen(1))
 				ngfPodName := podNames[0]
 
-				Expect(resourceManager.Apply([]client.Object{&reconfigNamespace})).To(Succeed())
+				Expect(resourceManager.Apply([]client.Object{&reconfigNamespace}, framework.WithLoggingDisabled())).To(Succeed())
 				Expect(resourceManager.ApplyFromFiles([]string{"reconfig/gateway.yaml"}, reconfigNamespace.Name)).To(Succeed())
 
 				var nginxPodNames []string

tests/suite/scale_test.go

@@ -506,12 +506,12 @@ The logs are attached only if there are errors.
 	}
 
 	runScaleUpstreams := func() {
-		Expect(resourceManager.ApplyFromFiles(upstreamsManifests, namespace)).To(Succeed())
-		Expect(resourceManager.WaitForAppsToBeReady(namespace)).To(Succeed())
+		Expect(resourceManager.ApplyFromFiles(upstreamsManifests, namespace, framework.WithLoggingDisabled())).To(Succeed())
+		Expect(resourceManager.WaitForAppsToBeReady(namespace, framework.WithLoggingDisabled())).To(Succeed())
 
 		// apply HTTPRoute after upstreams are ready
-		Expect(resourceManager.ApplyFromFiles(httpRouteManifests, namespace)).To(Succeed())
-		Expect(resourceManager.WaitForAppsToBeReady(namespace)).To(Succeed())
+		Expect(resourceManager.ApplyFromFiles(httpRouteManifests, namespace, framework.WithLoggingDisabled())).To(Succeed())
+		Expect(resourceManager.WaitForAppsToBeReady(namespace, framework.WithLoggingDisabled())).To(Succeed())
 
 		var nginxPodNames []string
 		var err error
@@ -754,7 +754,7 @@ The logs are attached only if there are errors.
 			framework.WithLoggingDisabled(),
 		)
 		cleanUpPortForward()
-		Expect(resourceManager.DeleteNamespace(namespace)).To(Succeed())
+		Expect(resourceManager.DeleteNamespace(namespace, framework.WithLoggingDisabled())).To(Succeed())
 		teardown(releaseName)
 	})
 
@@ -947,7 +947,7 @@ var _ = Describe("Zero downtime scale test", Ordered, Label("nfr", "zero-downtim
 				cfg.nfr = true
 				setup(cfg, "--values", test.valuesFile)
 
-				Expect(resourceManager.Apply([]client.Object{&ns})).To(Succeed())
+				Expect(resourceManager.Apply([]client.Object{&ns}, framework.WithLoggingDisabled())).To(Succeed())
 				Expect(resourceManager.ApplyFromFiles(files, ns.Name)).To(Succeed())
 				Expect(resourceManager.WaitForAppsToBeReady(ns.Name, framework.WithLoggingDisabled())).To(Succeed())
 

tests/suite/upgrade_test.go

@@ -63,7 +63,7 @@ var _ = Describe("Upgrade testing", Label("nfr", "upgrade"), func() {
 			},
 		}
 
-		Expect(resourceManager.Apply([]client.Object{&ns})).To(Succeed())
+		Expect(resourceManager.Apply([]client.Object{&ns}, framework.WithLoggingDisabled())).To(Succeed())
 		Expect(resourceManager.ApplyFromFiles(files, ns.Name)).To(Succeed())
 		Expect(resourceManager.WaitForAppsToBeReady(ns.Name)).To(Succeed())