From 78871859848df1d270b5b7b4cb1271a0e3e0b813 Mon Sep 17 00:00:00 2001 From: "fengyun.pan" Date: Wed, 10 May 2017 15:38:47 +0800 Subject: [PATCH] Add check for getting kubeclient --- pkg/kube/client.go | 6 +++++- pkg/kube/wait.go | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/kube/client.go b/pkg/kube/client.go index 333e3ab37..96db3d9c7 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -429,7 +429,11 @@ func updateResource(c *Client, target *resource.Info, currentObj runtime.Object, if err != nil { return nil } - client, _ := c.ClientSet() + + client, err := c.ClientSet() + if err != nil { + return err + } pods, err := client.Core().Pods(target.Namespace).List(metav1.ListOptions{ FieldSelector: fields.Everything().String(), diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go index e10f4997f..4326525f7 100644 --- a/pkg/kube/wait.go +++ b/pkg/kube/wait.go @@ -46,7 +46,10 @@ type deployment struct { func (c *Client) waitForResources(timeout time.Duration, created Result) error { log.Printf("beginning wait for resources with timeout of %v", timeout) - cs, _ := c.ClientSet() + cs, err := c.ClientSet() + if err != nil { + return err + } client := versionedClientsetForDeployment(cs) return wait.Poll(2*time.Second, timeout, func() (bool, error) { pods := []v1.Pod{}