Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion tests/cnf/core/network/metallb/tests/bfd-test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions tests/cnf/core/network/metallb/tests/bgp-tests.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion tests/cnf/core/network/metallb/tests/layer2-test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
})
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading