Merge pull request #8392 from liggitt/ttlfunc

Pass correct update flag to TTLFunc
This commit is contained in:
Victor Marmol 2015-05-18 08:36:19 -07:00
commit 90d6080fe8

View File

@ -238,7 +238,7 @@ func (e *Etcd) UpdateWithName(ctx api.Context, name string, obj runtime.Object)
} }
ttl := uint64(0) ttl := uint64(0)
if e.TTLFunc != nil { if e.TTLFunc != nil {
ttl, err = e.TTLFunc(obj, false) ttl, err = e.TTLFunc(obj, true)
if err != nil { if err != nil {
return err return err
} }
@ -281,7 +281,7 @@ func (e *Etcd) Update(ctx api.Context, obj runtime.Object) (runtime.Object, bool
} }
ttl := uint64(0) ttl := uint64(0)
if e.TTLFunc != nil { if e.TTLFunc != nil {
ttl, err = e.TTLFunc(obj, true) ttl, err = e.TTLFunc(obj, false)
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }
@ -303,7 +303,7 @@ func (e *Etcd) Update(ctx api.Context, obj runtime.Object) (runtime.Object, bool
} }
ttl := uint64(0) ttl := uint64(0)
if e.TTLFunc != nil { if e.TTLFunc != nil {
ttl, err = e.TTLFunc(obj, false) ttl, err = e.TTLFunc(obj, true)
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }