jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #898 from parente/config-timeout-check-connectivity 

Use config.CallTimeout() in APIClient
mine
Fernand Galiana 2020-10-26 20:38:18 -06:00 committed by GitHub
parent e752cc1433 ce0afa539e
commit 6f1b18fba6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/client/client.go
View File

@ -231,7 +231,7 @@ func (a *APIClient) CheckConnectivity() bool {
a.connOK = false a.connOK = false
return a.connOK return a.connOK
} }
cfg.Timeout = defaultCallTimeoutDuration cfg.Timeout = a.config.CallTimeout()
client, err := kubernetes.NewForConfig(cfg) client, err := kubernetes.NewForConfig(cfg)
if err != nil { if err != nil {
log.Error().Err(err).Msgf("Unable to connect to api server") log.Error().Err(err).Msgf("Unable to connect to api server")
@ -277,11 +277,7 @@ func (a *APIClient) HasMetrics() bool {
return flag return flag
} }
timeout, err := time.ParseDuration(*a.config.flags.Timeout) ctx, cancel := context.WithTimeout(context.Background(), a.config.CallTimeout())
if err != nil {
timeout = defaultCallTimeoutDuration
}
ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel() defer cancel()
if _, err := dial.MetricsV1beta1().NodeMetricses().List(ctx, metav1.ListOptions{Limit: 1}); err == nil { if _, err := dial.MetricsV1beta1().NodeMetricses().List(ctx, metav1.ListOptions{Limit: 1}); err == nil {
flag = true flag = true