Merge pull request #57747 from hzxuzhonghu/ep-cm

Automatic merge from submit-queue (batch tested with PRs 57747, 57749). 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>. no need delete endpoint explicitly in endpoint controller **What this PR does / why we need it**: It is no need to do delete in controller. Because in service restStorage, endpoint is deleted when delete service. See https://github.com/kubernetes/kubernetes/blob/master/pkg/registry/core/service/rest.go#L170~L180 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #57745 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #57747 from hzxuzhonghu/ep-cm
a052159b · Kubernetes Submit Queue · GitHub · ff584012 · ad067470 · a052159b
Unverified Commit a052159b authored Jan 02, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 02, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 9 deletions

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

No files found.
--- a/pkg/controller/endpoint/endpoints_controller.go
+++ b/pkg/controller/endpoint/endpoints_controller.go
@@ -394,15 +394,7 @@ func (e *EndpointController) syncService(key string) error {
 	}
 	service, err := e.serviceLister.Services(namespace).Get(name)
 	if err != nil {
-		// Delete the corresponding endpoint, as the service has been deleted.
+		// Service has been deleted. So no need to do any more operations.
-		// 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
 	}