Skip to content

Commit 4e83be8

Browse files
authored
Merge pull request kubernetes#81844 from yastij/remove-slice-dep
remove slice dependency from service_controller
2 parents 0eb1bfc + 6ad40ba commit 4e83be8

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

pkg/controller/service/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ go_library(
1919
"//pkg/controller:go_default_library",
2020
"//pkg/features:go_default_library",
2121
"//pkg/util/metrics:go_default_library",
22-
"//pkg/util/slice:go_default_library",
2322
"//staging/src/k8s.io/api/core/v1:go_default_library",
2423
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
2524
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",

pkg/controller/service/service_controller.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import (
4545
"k8s.io/kubernetes/pkg/controller"
4646
kubefeatures "k8s.io/kubernetes/pkg/features"
4747
"k8s.io/kubernetes/pkg/util/metrics"
48-
"k8s.io/kubernetes/pkg/util/slice"
4948
)
5049

5150
const (
@@ -818,13 +817,25 @@ func (s *ServiceController) removeFinalizer(service *v1.Service) error {
818817

819818
// Make a copy so we don't mutate the shared informer cache.
820819
updated := service.DeepCopy()
821-
updated.ObjectMeta.Finalizers = slice.RemoveString(updated.ObjectMeta.Finalizers, servicehelper.LoadBalancerCleanupFinalizer, nil)
820+
updated.ObjectMeta.Finalizers = removeString(updated.ObjectMeta.Finalizers, servicehelper.LoadBalancerCleanupFinalizer)
822821

823822
klog.V(2).Infof("Removing finalizer from service %s/%s", updated.Namespace, updated.Name)
824823
_, err := patch(s.kubeClient.CoreV1(), service, updated)
825824
return err
826825
}
827826

827+
// removeString returns a newly created []string that contains all items from slice that
828+
// are not equal to s.
829+
func removeString(slice []string, s string) []string {
830+
var newSlice []string
831+
for _, item := range slice {
832+
if item != s {
833+
newSlice = append(newSlice, item)
834+
}
835+
}
836+
return newSlice
837+
}
838+
828839
// patchStatus patches the service with the given LoadBalancerStatus.
829840
func (s *ServiceController) patchStatus(service *v1.Service, previousStatus, newStatus *v1.LoadBalancerStatus) error {
830841
if v1helper.LoadBalancerStatusEqual(previousStatus, newStatus) {

0 commit comments

Comments
 (0)