Merge pull request #2241 from michaelbeaumont/conformance/cleanup-restclient

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

Author: k8s-ci-robot

conformance/conformance_test.go

@@ -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"
 )
@@ -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).

conformance/utils/echo/pod.go

@@ -42,7 +42,7 @@ type MeshPod struct {
 	Name      string
 	Namespace string
 	Address   string
-	rc        *rest.RESTClient
+	rc        rest.Interface
 	rcfg      *rest.Config
 }
 
@@ -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,
 	}
 }

conformance/utils/suite/experimental_suite.go

@@ -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,

conformance/utils/suite/suite.go

@@ -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
@@ -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,