Skip to content

Commit 07c846c

Browse files
committed
resolve conflicts
1 parent 1f3ab0a commit 07c846c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

client/nginx.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,9 @@ func WithCheckAPI() Option {
591591
// WithMaxAPIVersion sets the API version to the max API version.
592592
func WithMaxAPIVersion() Option {
593593
return func(o *NginxClient) {
594-
version, err := o.GetMaxAPIVersion()
594+
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
595+
defer cancel()
596+
version, err := o.GetMaxAPIVersion(ctx)
595597
if err != nil {
596598
return
597599
}

0 commit comments

Comments
 (0)