github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating EndpointSliceMirroring controller to listen for Service changes

Browse Source 
This fixes a bug that could occur if a custom Endpoints resource was
created before a Service was created.
This commit is contained in:
Rob Scott
2020-08-21 16:31:57 -07:00
parent 1c548c328a
commit 3c804502d7
4 changed files with 169 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/controller/endpointslicemirroring/utils.go
View File

@@ -185,14 +185,35 @@ func objectRefPtrEqual(ref1, ref2 *corev1.ObjectReference) bool {
return true
}
// getServiceFromDeleteAction parses a Service resource from a delete
// action.
func getServiceFromDeleteAction(obj interface{}) *corev1.Service {
if service, ok := obj.(*corev1.Service); ok {
return service
}
// If we reached here it means the Service was deleted but its final state
// is unrecorded.
tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
if !ok {
utilruntime.HandleError(fmt.Errorf("Couldn't get object from tombstone %#v", obj))
return nil
}
service, ok := tombstone.Obj.(*corev1.Service)
if !ok {
utilruntime.HandleError(fmt.Errorf("Tombstone contained object that is not a Service resource: %#v", obj))
return nil
}
return service
}
// getEndpointsFromDeleteAction parses an Endpoints resource from a delete
// action.
func getEndpointsFromDeleteAction(obj interface{}) *corev1.Endpoints {
if endpointSlice, ok := obj.(*corev1.Endpoints); ok {
return endpointSlice
if endpoints, ok := obj.(*corev1.Endpoints); ok {
return endpoints
}
// If we reached here it means the EndpointSlice was deleted but its final
// state is unrecorded.
// If we reached here it means the Endpoints resource was deleted but its
// final state is unrecorded.
tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
if !ok {
utilruntime.HandleError(fmt.Errorf("Couldn't get object from tombstone %#v", obj))