From 8c0d4bfe2e63a801e4e21906d6b37a5173dadcbb Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Wed, 13 Dec 2017 17:20:31 -0700 Subject: [PATCH] Use helper method --- lifecycle/object.go | 6 ++---- store/crd/crd_store.go | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lifecycle/object.go b/lifecycle/object.go index 13dde755..6302d9ca 100644 --- a/lifecycle/object.go +++ b/lifecycle/object.go @@ -125,10 +125,8 @@ func (o *objectLifecycleAdapter) create(metadata metav1.Object, obj runtime.Obje } else if newObj != nil { _, err = o.objectClient.Update(metadata.GetName(), newObj) return false, err - } else { - _, err = o.objectClient.Update(metadata.GetName(), obj) - return false, err } - return false, nil + _, err = o.objectClient.Update(metadata.GetName(), obj) + return false, err } diff --git a/store/crd/crd_store.go b/store/crd/crd_store.go index 280e52c3..cd8f4df4 100644 --- a/store/crd/crd_store.go +++ b/store/crd/crd_store.go @@ -2,7 +2,6 @@ package crd import ( "context" - "net/http" "strings" "time" @@ -111,7 +110,7 @@ func (c *Store) AddSchemas(ctx context.Context, schemas ...*types.Schema) error var allSchemas []*types.Schema for _, schema := range schemas { - if schema.Store != nil || !contains(schema.CollectionMethods, http.MethodGet) { + if schema.Store != nil || !schema.CanList() { continue }