Merge branch v2.11 into v3.6
This commit is contained in:
commit
67fef270af
2 changed files with 9 additions and 2 deletions
|
|
@ -121,8 +121,9 @@ func createClient(ctx context.Context, cfg ClientConfig) (*client.Client, error)
|
|||
}
|
||||
|
||||
opts = append(opts,
|
||||
client.WithHTTPHeaders(httpHeaders),
|
||||
client.WithAPIVersionNegotiation())
|
||||
client.FromEnv,
|
||||
client.WithAPIVersionNegotiation(),
|
||||
client.WithHTTPHeaders(httpHeaders))
|
||||
|
||||
return client.NewClientWithOpts(opts...)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue