github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82996 from tnqn/endpointslice-deletion

Browse Source 
Fix EndpointSliceController service deletion processing
This commit is contained in:
Kubernetes Prow Robot 2019-10-08 15:42:27 -07:00 committed by GitHub
commit b00f009316
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/endpointslice/endpointslice_controller.go
View File

@ -251,6 +251,8 @@ func (c *Controller) syncService(key string) error {
if err != nil { if err != nil {
if apierrors.IsNotFound(err) { if apierrors.IsNotFound(err) {
c.triggerTimeTracker.DeleteService(namespace, name) c.triggerTimeTracker.DeleteService(namespace, name)
// The service has been deleted, return nil so that it won't be retried.
return nil
} }
return err return err
} }

5
pkg/controller/endpointslice/endpointslice_controller_test.go
View File

@ -140,9 +140,8 @@ func TestSyncServiceMissing(t *testing.T) {
err := esController.syncService(fmt.Sprintf("%s/%s", namespace, missingServiceName)) err := esController.syncService(fmt.Sprintf("%s/%s", namespace, missingServiceName))
// Since the service doesn't exist, we should get a not found error // nil should be returned when the service doesn't exist
assert.NotNil(t, err, "Expected no error syncing service") assert.Nil(t, err, "Expected no error syncing service")
assert.Equal(t, err.Error(), "service \"notthere\" not found")
// That should mean no client actions were performed // That should mean no client actions were performed
assert.Len(t, client.Actions(), 0) assert.Len(t, client.Actions(), 0)