Skip to content

K
k3s
Unverified Commit 72860eb2 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #66958 from yue9944882/chore/homogenize-controller-keyfunc

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>. Reference common keyfunc in endpoints controller **What this PR does / why we need it**: As the title **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 # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 6afd783d 5a4455db
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
pkg/controller/endpoint/endpoints_controller.go
View file @ 72860eb2
...@@ -68,10 +68,6 @@ const ( ...@@ -68,10 +68,6 @@ const (
TolerateUnreadyEndpointsAnnotation = "service.alpha.kubernetes.io/tolerate-unready-endpoints" TolerateUnreadyEndpointsAnnotation = "service.alpha.kubernetes.io/tolerate-unready-endpoints"
) )
var (
keyFunc = cache.DeletionHandlingMetaNamespaceKeyFunc
)
// NewEndpointController returns a new *EndpointController. // NewEndpointController returns a new *EndpointController.
func NewEndpointController(podInformer coreinformers.PodInformer, serviceInformer coreinformers.ServiceInformer, func NewEndpointController(podInformer coreinformers.PodInformer, serviceInformer coreinformers.ServiceInformer,
endpointsInformer coreinformers.EndpointsInformer, client clientset.Interface) *EndpointController { endpointsInformer coreinformers.EndpointsInformer, client clientset.Interface) *EndpointController {
...@@ -178,7 +174,7 @@ func (e *EndpointController) getPodServiceMemberships(pod *v1.Pod) (sets.String, ...@@ -178,7 +174,7 @@ func (e *EndpointController) getPodServiceMemberships(pod *v1.Pod) (sets.String,
return set, nil return set, nil
} }
for i := range services { for i := range services {
key, err := keyFunc(services[i]) key, err := controller.KeyFunc(services[i])
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -334,7 +330,7 @@ func (e *EndpointController) deletePod(obj interface{}) { ...@@ -334,7 +330,7 @@ func (e *EndpointController) deletePod(obj interface{}) {
// obj could be an *v1.Service, or a DeletionFinalStateUnknown marker item. // obj could be an *v1.Service, or a DeletionFinalStateUnknown marker item.
func (e *EndpointController) enqueueService(obj interface{}) { func (e *EndpointController) enqueueService(obj interface{}) {
key, err := keyFunc(obj) key, err := controller.KeyFunc(obj)
if err != nil { if err != nil {
utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %+v: %v", obj, err)) utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %+v: %v", obj, err))
return return
...@@ -552,7 +548,7 @@ func (e *EndpointController) checkLeftoverEndpoints() { ...@@ -552,7 +548,7 @@ func (e *EndpointController) checkLeftoverEndpoints() {
// as leader-election only have endpoints without service // as leader-election only have endpoints without service
continue continue
} }
key, err := keyFunc(ep) key, err := controller.KeyFunc(ep)
if err != nil { if err != nil {
utilruntime.HandleError(fmt.Errorf("Unable to get key for endpoint %#v", ep)) utilruntime.HandleError(fmt.Errorf("Unable to get key for endpoint %#v", ep))
continue continue
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment