TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

plugin/kubernetes: handle tombstones in default processor (#3890)

Browse source 
* handle deletion tombstones in default processor

Signed-off-by: Chris O'Haver <cohaver@infoblox.com>

* fix terminating pod exclusion

Signed-off-by: Chris O'Haver <cohaver@infoblox.com>
This commit is contained in:
Chris O'Haver 2020-05-15 12:47:29 -04:00 • committed by GitHub
parent bb7ee5010e
commit a3aeb3d503
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

19
plugin/kubernetes/object/informer.go
View file

@ -25,11 +25,12 @@ func DefaultProcessor(convert ToFunc) ProcessorBuilder {
return func(clientState cache.Indexer, h cache.ResourceEventHandler) cache.ProcessFunc {
return func(obj interface{}) error {
for _, d := range obj.(cache.Deltas) {
obj := convert(d.Object)
switch d.Type {
case cache.Sync, cache.Added, cache.Updated:
obj, err := convert(d.Object)
if err != nil {
return err
}
if old, exists, err := clientState.Get(obj); err == nil && exists {
if err := clientState.Update(obj); err != nil {
return err
@ -42,6 +43,18 @@ func DefaultProcessor(convert ToFunc) ProcessorBuilder {
h.OnAdd(obj)
}
case cache.Deleted:
var obj interface{}
var err error
tombstone, ok := d.Object.(cache.DeletedFinalStateUnknown)
if ok {
obj, err = convert(tombstone.Obj)
} else {
obj, err = convert(d.Object)
}
if err != nil && err != errPodTerminating {
return err
}
if err := clientState.Delete(obj); err != nil {
return err
}