cnf core: use GetGVR() instead of GetServiceGVR()

openshift-kni · Oct 3, 2024 · a01dc55 · a01dc55
1 parent 65ad677
commit a01dc55
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 32 deletions.
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/nmstate/kubernetes-nmstate/api v0.0.0-20240605150941-df565dd7bf35
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
-	github.com/openshift-kni/eco-goinfra v0.0.0-20241001140145-4b805e11b245 // latest
+	github.com/openshift-kni/eco-goinfra v0.0.0-20241003151956-8f011e8f2d76 // latest
 	github.com/openshift-kni/k8sreporter v1.0.5
 	github.com/openshift/api v3.9.1-0.20191111211345-a27ff30ebf09+incompatible
 	github.com/openshift/cluster-nfd-operator v0.0.0-20240604082319-19bf50784aa7

diff --git a/go.sum b/go.sum
@@ -1264,8 +1264,8 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
 github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
 github.com/openshift-kni/cluster-group-upgrades-operator v0.0.0-20240423171335-f07cdbf8af2c h1:wAPCXsnAXOUAJ5DYlVgGUcV9YBSiVlH4o9tbQ9py8ZY=
 github.com/openshift-kni/cluster-group-upgrades-operator v0.0.0-20240423171335-f07cdbf8af2c/go.mod h1:hkzqKpmQvh7vgPx8Hw6IExJorKPM0dEeJdOXjIW3gNw=
-github.com/openshift-kni/eco-goinfra v0.0.0-20241001140145-4b805e11b245 h1:NX/QFJSdK6gqsPS/Cm/OnrbVNvHovpwLEX98U0PX+5U=
-github.com/openshift-kni/eco-goinfra v0.0.0-20241001140145-4b805e11b245/go.mod h1:yWno/75XOopIj/GlMgvm+dye+cwbaMQBVek1XNGl+SI=
+github.com/openshift-kni/eco-goinfra v0.0.0-20241003151956-8f011e8f2d76 h1:SjNTz1xYXjBLgoauDqVooIojx8IHBzqa3iGr0LtriU0=
+github.com/openshift-kni/eco-goinfra v0.0.0-20241003151956-8f011e8f2d76/go.mod h1:yWno/75XOopIj/GlMgvm+dye+cwbaMQBVek1XNGl+SI=
 github.com/openshift-kni/k8sreporter v1.0.5 h1:1GYBc/BTZyVoXilHef43v9A8BSzw700zAPZ6zsZvo6Y=
 github.com/openshift-kni/k8sreporter v1.0.5/go.mod h1:fg8HI9yxiKAi6UzR6NTtrmQmA2WKzUqmkRUHwQ1+Bj8=
 github.com/openshift-kni/lifecycle-agent v0.0.0-20240606123201-0c45cd13c2f1 h1:y+0Ecc+MSZA/GNS3VOpKq+XK9x8qoNA7TlyHvqbVbpw=

diff --git a/tests/cnf/core/network/metallb/tests/bfd-test.go b/tests/cnf/core/network/metallb/tests/bfd-test.go
@@ -203,7 +203,7 @@ var _ = Describe("BFD", Ordered, Label(tsparams.LabelBFDTestCases), ContinueOnFa
 			err = namespace.NewBuilder(APIClient, tsparams.TestNamespaceName).CleanObjects(
 				tsparams.DefaultTimeout,
 				pod.GetGVR(),
-				service.GetServiceGVR(),
+				service.GetGVR(),
 				configmap.GetGVR(),
 				nad.GetGVR())
 			Expect(err).ToNot(HaveOccurred(), "Failed to clean test namespace")

diff --git a/tests/cnf/core/network/metallb/tests/bgp-tests.go b/tests/cnf/core/network/metallb/tests/bgp-tests.go
@@ -94,7 +94,7 @@ var _ = Describe("BGP", Ordered, Label(tsparams.LabelBGPTestCases), ContinueOnFa
 		err = namespace.NewBuilder(APIClient, tsparams.TestNamespaceName).CleanObjects(
 			tsparams.DefaultTimeout,
 			pod.GetGVR(),
-			service.GetServiceGVR(),
+			service.GetGVR(),
 			configmap.GetGVR(),
 			nad.GetGVR())
 		Expect(err).ToNot(HaveOccurred(), "Failed to clean test namespace")
@@ -217,7 +217,7 @@ var _ = Describe("BGP", Ordered, Label(tsparams.LabelBGPTestCases), ContinueOnFa
 			err = namespace.NewBuilder(APIClient, tsparams.TestNamespaceName).CleanObjects(
 				tsparams.DefaultTimeout,
 				pod.GetGVR(),
-				service.GetServiceGVR(),
+				service.GetGVR(),
 				configmap.GetGVR(),
 				nad.GetGVR())
 			Expect(err).ToNot(HaveOccurred(), "Failed to clean test namespace")

diff --git a/tests/cnf/core/network/metallb/tests/layer2-test.go b/tests/cnf/core/network/metallb/tests/layer2-test.go
@@ -111,7 +111,7 @@ var _ = Describe("Layer2", Ordered, Label(tsparams.LabelLayer2TestCases), Contin
 		err = namespace.NewBuilder(APIClient, tsparams.TestNamespaceName).CleanObjects(
 			tsparams.DefaultTimeout,
 			pod.GetGVR(),
-			service.GetServiceGVR(),
+			service.GetGVR(),
 			nad.GetGVR())
 		Expect(err).ToNot(HaveOccurred(), "Failed to clean test namespace")
 	})

diff --git a/vendor/github.com/openshift-kni/eco-goinfra/pkg/clusterversion/clusterversion.go b/vendor/github.com/openshift-kni/eco-goinfra/pkg/clusterversion/clusterversion.go
diff --git a/vendor/github.com/openshift-kni/eco-goinfra/pkg/console/console.go b/vendor/github.com/openshift-kni/eco-goinfra/pkg/console/console.go
diff --git a/vendor/github.com/openshift-kni/eco-goinfra/pkg/infrastructure/infrastructure.go b/vendor/github.com/openshift-kni/eco-goinfra/pkg/infrastructure/infrastructure.go
diff --git a/vendor/github.com/openshift-kni/eco-goinfra/pkg/network/network.go b/vendor/github.com/openshift-kni/eco-goinfra/pkg/network/network.go
diff --git a/vendor/github.com/openshift-kni/eco-goinfra/pkg/proxy/proxy.go b/vendor/github.com/openshift-kni/eco-goinfra/pkg/proxy/proxy.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -521,7 +521,7 @@ github.com/onsi/gomega/types
 ## explicit; go 1.20
 github.com/openshift-kni/cluster-group-upgrades-operator/pkg/api/clustergroupupgrades
 github.com/openshift-kni/cluster-group-upgrades-operator/pkg/api/clustergroupupgrades/v1alpha1
-# github.com/openshift-kni/eco-goinfra v0.0.0-20241001140145-4b805e11b245
+# github.com/openshift-kni/eco-goinfra v0.0.0-20241003151956-8f011e8f2d76
 ## explicit; go 1.22
 github.com/openshift-kni/eco-goinfra/pkg/apiservers
 github.com/openshift-kni/eco-goinfra/pkg/argocd