github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 12:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Use servicePatch methods from cloud-provider repo in service-controller

Browse Source
This commit is contained in:
Manohar Reddy 2020-02-25 16:27:36 +05:30
parent 390a54f737
commit 1c0a78a4fd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/controller/service/controller.go
View File

@ -804,8 +804,7 @@ func (s *Controller) addFinalizer(service *v1.Service) error {
updated.ObjectMeta.Finalizers = append(updated.ObjectMeta.Finalizers, servicehelper.LoadBalancerCleanupFinalizer)
klog.V(2).Infof("Adding finalizer to service %s/%s", updated.Namespace, updated.Name)
// TODO(87447) use PatchService from k8s.io/cloud-provider/service/helpers
_, err := patch(s.kubeClient.CoreV1(), service, updated)
_, err := servicehelper.PatchService(s.kubeClient.CoreV1(), service, updated)
return err
}
@ -820,7 +819,7 @@ func (s *Controller) removeFinalizer(service *v1.Service) error {
updated.ObjectMeta.Finalizers = removeString(updated.ObjectMeta.Finalizers, servicehelper.LoadBalancerCleanupFinalizer)
klog.V(2).Infof("Removing finalizer from service %s/%s", updated.Namespace, updated.Name)
_, err := patch(s.kubeClient.CoreV1(), service, updated)
_, err := servicehelper.PatchService(s.kubeClient.CoreV1(), service, updated)
return err
}
@ -846,7 +845,7 @@ func (s *Controller) patchStatus(service *v1.Service, previousStatus, newStatus
updated.Status.LoadBalancer = *newStatus
klog.V(2).Infof("Patching status for service %s/%s", updated.Namespace, updated.Name)
_, err := patch(s.kubeClient.CoreV1(), service, updated)
_, err := servicehelper.PatchService(s.kubeClient.CoreV1(), service, updated)
return err
}