From 1b31382d9cf97f4a5e11821519cbc73de1bffeee Mon Sep 17 00:00:00 2001 From: Michelle Noorali Date: Fri, 5 Aug 2016 11:15:37 -0600 Subject: [PATCH] chore(glide): add kube pkgs to glide.yaml * Thanks for the reminder adam :) --- glide.yaml | 4 ++++ pkg/kube/client.go | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glide.yaml b/glide.yaml index 2b32855e8..03917acf4 100644 --- a/glide.yaml +++ b/glide.yaml @@ -27,6 +27,8 @@ import: - pkg/api - pkg/api/meta - pkg/api/error + - pkg/api/unversioned + - pkg/apimachinery/registered - pkg/client/restclient - pkg/client/unversioned - pkg/apis/batch @@ -40,6 +42,8 @@ import: - pkg/labels - pkg/runtime - pkg/watch + - pkg/util/strategicpatch + - pkg/util/yaml - package: github.com/gosuri/uitable - package: speter.net/go/exp/math/dec/inf version: ^0.9.0 diff --git a/pkg/kube/client.go b/pkg/kube/client.go index 5fde74344..da073d173 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -251,8 +251,7 @@ func updateResource(modified *resource.Info, currentObj runtime.Object) error { // send patch to server helper := resource.NewHelper(modified.Client, modified.Mapping) - _, err = helper.Patch(modified.Namespace, modified.Name, api.StrategicMergePatchType, patch) - if err != nil { + if _, err = helper.Patch(modified.Namespace, modified.Name, api.StrategicMergePatchType, patch); err != nil { return err }