Skip to content

conformance: remove RESTClient in suite.Options, use interface where possible #2241

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 27, 2023
Merged

conformance: remove RESTClient in suite.Options, use interface where possible #2241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions conformance/conformance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (

"k8s.io/client-go/kubernetes"
_ "k8s.io/client-go/plugin/pkg/client/auth"
"k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/config"
)
Expand Down Expand Up @@ -60,7 +59,6 @@ func TestConformance(t *testing.T) {

cSuite := suite.New(suite.Options{
Client: client,
RESTClient: clientset.CoreV1().RESTClient().(*rest.RESTClient),
RestConfig: cfg,
// This clientset is needed in addition to the client only because
// controller-runtime client doesn't support non CRUD sub-resources yet (https://github.com/kubernetes-sigs/controller-runtime/issues/452).
Expand Down
4 changes: 2 additions & 2 deletions conformance/utils/echo/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ type MeshPod struct {
Name string
Namespace string
Address string
rc *rest.RESTClient
rc rest.Interface
rcfg *rest.Config
}

Expand Down Expand Up @@ -171,7 +171,7 @@ func ConnectToAppInNamespace(t *testing.T, s *suite.ConformanceTestSuite, app Me
Name: podName,
Namespace: podNamespace,
Address: pod.Status.PodIP,
rc: s.RESTClient,
rc: s.Clientset.CoreV1().RESTClient(),
rcfg: s.RestConfig,
}
}
1 change: 0 additions & 1 deletion conformance/utils/suite/experimental_suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ func NewExperimentalConformanceTestSuite(s ExperimentalConformanceOptions) (*Exp
suite.ConformanceTestSuite = ConformanceTestSuite{
Client: s.Client,
Clientset: s.Clientset,
RESTClient: s.RESTClient,
RestConfig: s.RestConfig,
RoundTripper: roundTripper,
GatewayClassName: s.GatewayClassName,
Expand Down
2 changes: 0 additions & 2 deletions conformance/utils/suite/suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ type ConformanceTestSuite struct {
type Options struct {
Client client.Client
Clientset clientset.Interface
RESTClient *rest.RESTClient
RestConfig *rest.Config
GatewayClassName string
Debug bool
Expand Down Expand Up @@ -111,7 +110,6 @@ func New(s Options) *ConformanceTestSuite {
suite := &ConformanceTestSuite{
Client: s.Client,
Clientset: s.Clientset,
RESTClient: s.RESTClient,
RestConfig: s.RestConfig,
RoundTripper: roundTripper,
GatewayClassName: s.GatewayClassName,
Expand Down