add clean pools and pools CR to reporter for functional tests

Signed-off-by: Sebastian Sch <[email protected]>

Author: SchSeba

test/util/k8sreporter/reporter.go

@@ -6,13 +6,13 @@ import (
 	"strings"
 
 	kniK8sReporter "github.com/openshift-kni/k8sreporter"
+	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
+	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
+
 	sriovv1 "github.com/k8snetworkplumbingwg/sriov-network-operator/api/v1"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/test/util/namespaces"
-
-	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
-	rbacv1 "k8s.io/api/rbac/v1"
 )
 
 func New(reportPath string) (*kniK8sReporter.KubernetesReporter, error) {
@@ -63,6 +63,7 @@ func New(reportPath string) (*kniK8sReporter.KubernetesReporter, error) {
 		{Cr: &sriovv1.SriovNetworkNodePolicyList{}},
 		{Cr: &sriovv1.SriovNetworkList{}},
 		{Cr: &sriovv1.SriovOperatorConfigList{}},
+		{Cr: &sriovv1.SriovNetworkPoolConfigList{}},
 		{Cr: &monitoringv1.ServiceMonitorList{}, Namespace: &operatorNamespace},
 		{Cr: &monitoringv1.PrometheusRuleList{}, Namespace: &operatorNamespace},
 		{Cr: &rbacv1.RoleList{}, Namespace: &operatorNamespace},

test/util/namespaces/namespaces.go

@@ -129,6 +129,25 @@ func CleanNetworks(operatorNamespace string, cs *testclient.ClientSet) error {
 	return waitForSriovNetworkDeletion(operatorNamespace, cs, 15*time.Second)
 }
 
+func CleanPools(operatorNamespace string, cs *testclient.ClientSet) error {
+	pools := sriovv1.SriovNetworkPoolConfigList{}
+	err := cs.List(context.Background(),
+		&pools,
+		runtimeclient.InNamespace(operatorNamespace))
+	if err != nil {
+		return err
+	}
+	for _, p := range pools.Items {
+		if strings.HasPrefix(p.Name, "test-") {
+			err := cs.Delete(context.Background(), &p)
+			if err != nil {
+				return fmt.Errorf("failed to delete networkPoolConfig %v", err)
+			}
+		}
+	}
+	return err
+}
+
 func waitForSriovNetworkDeletion(operatorNamespace string, cs *testclient.ClientSet, timeout time.Duration) error {
 	return wait.PollImmediate(time.Second, timeout, func() (bool, error) {
 		networks := sriovv1.SriovNetworkList{}
@@ -164,7 +183,8 @@ func Clean(operatorNamespace, namespace string, cs *testclient.ClientSet, discov
 	if err != nil {
 		return err
 	}
-	return nil
+
+	return CleanPools(operatorNamespace, cs)
 }
 
 func AddLabel(cs corev1client.NamespacesGetter, ctx context.Context, namespaceName, key, value string) error {