Merge pull request #8392 from liggitt/ttlfunc

Pass correct update flag to TTLFunc

Merge pull request #8392 from liggitt/ttlfunc
90d6080f · Victor Marmol · dc587b7a · a2d6dd04 · 90d6080f
Commit 90d6080f authored May 18, 2015 by Victor Marmol
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

etcd.go pkg/registry/generic/etcd/etcd.go +3 -3

No files found.
--- a/pkg/registry/generic/etcd/etcd.go
+++ b/pkg/registry/generic/etcd/etcd.go
@@ -238,7 +238,7 @@ func (e *Etcd) UpdateWithName(ctx api.Context, name string, obj runtime.Object) 
 	}
 	ttl := uint64(0)
 	if e.TTLFunc != nil {
-		ttl, err = e.TTLFunc(obj, false)
+		ttl, err = e.TTLFunc(obj, true)
 		if err != nil {
 			return err
 		}
@@ -281,7 +281,7 @@ func (e *Etcd) Update(ctx api.Context, obj runtime.Object) (runtime.Object, bool
 			}
 			ttl := uint64(0)
 			if e.TTLFunc != nil {
-				ttl, err = e.TTLFunc(obj, true)
+				ttl, err = e.TTLFunc(obj, false)
 				if err != nil {
 					return nil, 0, err
 				}
@@ -303,7 +303,7 @@ func (e *Etcd) Update(ctx api.Context, obj runtime.Object) (runtime.Object, bool
 		}
 		ttl := uint64(0)
 		if e.TTLFunc != nil {
-			ttl, err = e.TTLFunc(obj, false)
+			ttl, err = e.TTLFunc(obj, true)
 			if err != nil {
 				return nil, 0, err
 			}