Merge pull request #11536 from k8s-infra-cherrypick-robot/cherry-pick-11508-to-release/2.0

AkihiroSuda · web-flow · commit e9989a2147ca · 2025-03-14T09:30:39.000+09:00
[release/2.0] Respect `client.WithTimeout` option on connect
diff --git a/client/client.go b/client/client.go
@@ -129,7 +129,8 @@ func New(address string, opts ...Opt) (*Client, error) {
 		backoffConfig := backoff.DefaultConfig
 		backoffConfig.MaxDelay = copts.timeout
 		connParams := grpc.ConnectParams{
-			Backoff: backoffConfig,
+			Backoff:           backoffConfig,
+			MinConnectTimeout: copts.timeout,
 		}
 		gopts := []grpc.DialOption{
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
