Merge pull request #58033 from hzxuzhonghu/revert-57747-ep-cm

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Revert "no need delete endpoint explicitly in endpoint controller" Reverts kubernetes/kubernetes#57747 For: 1. `checkLeftoverEndpoints` does not work any more. 2. service delete auto trigger endpoint delete in apiserver, if service is successfully deleted but fail on endpoint delete. Then this endpoint will be garbage resource.

Merge pull request #58033 from hzxuzhonghu/revert-57747-ep-cm
807dab6f · Kubernetes Submit Queue · GitHub · e96162e8 · b2613f15 · 807dab6f
Unverified Commit 807dab6f authored Jan 11, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

endpoints_controller.go pkg/controller/endpoint/endpoints_controller.go +9 -1

No files found.
--- a/pkg/controller/endpoint/endpoints_controller.go
+++ b/pkg/controller/endpoint/endpoints_controller.go
@@ -394,7 +394,15 @@ func (e *EndpointController) syncService(key string) error {
 	}
 	service, err := e.serviceLister.Services(namespace).Get(name)
 	if err != nil {
-		// Service has been deleted. So no need to do any more operations.
+		// Delete the corresponding endpoint, as the service has been deleted.
+		// TODO: Please note that this will delete an endpoint when a
+		// service is deleted. However, if we're down at the time when
+		// the service is deleted, we will miss that deletion, so this
+		// doesn't completely solve the problem. See #6877.
+		err = e.client.CoreV1().Endpoints(namespace).Delete(name, nil)
+		if err != nil && !errors.IsNotFound(err) {
+			return err
+		}
 		return nil
 	}