github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-29 21:29:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81348 from yastij/code-org-service-controller

Browse Source 
move service helpers to k8s.io/cloud-provider
This commit is contained in:
Kubernetes Prow Robot
2019-10-17 00:20:38 -07:00
committed by GitHub
parent bc25814fb9 d796baea27
commit 6a5f0e6eda
7 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/service/BUILD
View File

@@ -10,7 +10,6 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/controller/service",
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/core/v1/helper:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",

5
pkg/controller/service/service_controller.go
View File

@@ -42,7 +42,6 @@ import (
servicehelper "k8s.io/cloud-provider/service/helpers"
"k8s.io/component-base/metrics/prometheus/ratelimiter"
"k8s.io/klog"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
)
const (
@@ -316,7 +315,7 @@ func (s *ServiceController) syncLoadBalancerIfNeeded(service *v1.Service, key st
// which may involve service interruption. Also, we would like user-friendly events.
// Save the state so we can avoid a write if it doesn't change
previousStatus := v1helper.LoadBalancerStatusDeepCopy(&service.Status.LoadBalancer)
previousStatus := service.Status.LoadBalancer.DeepCopy()
var newStatus *v1.LoadBalancerStatus
var op loadBalancerOperation
var err error
@@ -866,7 +865,7 @@ func removeString(slice []string, s string) []string {
// patchStatus patches the service with the given LoadBalancerStatus.
func (s *ServiceController) patchStatus(service *v1.Service, previousStatus, newStatus *v1.LoadBalancerStatus) error {
if v1helper.LoadBalancerStatusEqual(previousStatus, newStatus) {
if servicehelper.LoadBalancerStatusEqual(previousStatus, newStatus) {
return nil
}