Remove terminating pods from endpoints

pkg/endpoints/controller/endpoints_manager.go

@@ -5,6 +5,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"strconv"
 	"sync"
 
 	"github.com/deislabs/osiris/pkg/kubernetes"
@@ -18,6 +19,14 @@ import (
 	endpointsv1 "k8s.io/kubernetes/pkg/api/v1/endpoints"
 )
 
+const (
+
+	// tolerateAnnoration backport annotation
+	// TolerateUnreadyEndpointsAnnotation definition from
+	// k8s.io/kubernetes/pkg/controller/endpoint
+	tolerateAnnoration = "service.alpha.kubernetes.io/tolerate-unready-endpoints"
+)
+
 // endpointsManager is a controller responsible for the on-going management of
 // the endpoints resource corresponding to a single Osiris-enabled service
 type endpointsManager struct {
@@ -127,6 +136,27 @@ func (e *endpointsManager) syncAppPod(obj interface{}) {
 			break
 		}
 	}
+
+	// If the user specified the older (deprecated) annotation,
+	// we have to respect it.
+	tolerateUnreadyEndpoints := e.service.Spec.PublishNotReadyAddresses
+	v, ok := e.service.Annotations[tolerateAnnoration]
+	if ok {
+		b, err := strconv.ParseBool(v)
+		if err == nil {
+			tolerateUnreadyEndpoints = b
+		} else {
+			glog.Errorf(
+				"Failed to parse annotation %v: %v",
+				tolerateAnnoration,
+				err,
+			)
+		}
+	}
+
+	if !tolerateUnreadyEndpoints && pod.DeletionTimestamp != nil {
+		ready = false
+	}
 	glog.Infof(
 		"Informed about pod %s for service %s in namespace %s; its IP is %s and "+
 			"its ready condition is %t",