Return new default GRPC client instantiation to every request (#3130)

kubernetes-sigs · Jun 14, 2024 · 5f400a8 · 5f400a8
1 parent 4622e74
commit 5f400a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/conformance/utils/grpc/grpc.go b/conformance/utils/grpc/grpc.go
@@ -270,6 +270,9 @@ func validateExpectedResponse(t *testing.T, expected ExpectedResponse) {
 func MakeRequestAndExpectEventuallyConsistentResponse(t *testing.T, c Client, timeoutConfig config.TimeoutConfig, gwAddr string, expected ExpectedResponse) {
 	t.Helper()
 	validateExpectedResponse(t, expected)
+	if c == nil {
+		c = &DefaultClient{Conn: nil}
+	}
 	defer c.Close()
 	sendRPC := func(elapsed time.Duration) bool {
 		resp, err := c.SendRPC(t, gwAddr, expected, timeoutConfig.MaxTimeToConsistency-elapsed)

diff --git a/conformance/utils/suite/suite.go b/conformance/utils/suite/suite.go
@@ -193,9 +193,6 @@ func NewConformanceTestSuite(options ConformanceOptions) (*ConformanceTestSuite,
 	}
 
 	grpcClient := options.GRPCClient
-	if grpcClient == nil {
-		grpcClient = &grpc.DefaultClient{Conn: nil}
-	}
 
 	installedCRDs := &apiextensionsv1.CustomResourceDefinitionList{}
 	err := options.Client.List(context.TODO(), installedCRDs)