github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Updated comment about ImplementedElsewhere

Browse Source 
Removed handling ImplementedElsewhere error in call to EnsureLoadBalancerDeleted.
This commit is contained in:
Pavithra Ramesh 2019-08-01 00:48:56 -07:00
parent 987677c201
commit da887e85e9
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,11 +311,6 @@ func (s *ServiceController) syncLoadBalancerIfNeeded(service *v1.Service, key st
klog.V(2).Infof("Deleting existing load balancer for service %s", key) klog.V(2).Infof("Deleting existing load balancer for service %s", key)
s.eventRecorder.Event(service, v1.EventTypeNormal, "DeletingLoadBalancer", "Deleting load balancer") s.eventRecorder.Event(service, v1.EventTypeNormal, "DeletingLoadBalancer", "Deleting load balancer")
if err := s.balancer.EnsureLoadBalancerDeleted(context.TODO(), s.clusterName, service); err != nil { if err := s.balancer.EnsureLoadBalancerDeleted(context.TODO(), s.clusterName, service); err != nil {
if err == cloudprovider.ImplementedElsewhere {
klog.V(4).Infof("LoadBalancer for service %s implemented by a different controller %s," +
"Ignoring error upon deletion", key, s.cloud.ProviderName())
return op, nil
}
return op, fmt.Errorf("failed to delete load balancer: %v", err) return op, fmt.Errorf("failed to delete load balancer: %v", err)
} }
} }

23
staging/src/k8s.io/cloud-provider/cloud.go
View File

@ -22,7 +22,7 @@ import (
"fmt" "fmt"
"strings" "strings"
v1 "k8s.io/api/core/v1" "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
@ -104,12 +104,21 @@ func GetInstanceProviderID(ctx context.Context, cloud Interface, nodeName types.
} }
// LoadBalancer is an abstract, pluggable interface for load balancers. // LoadBalancer is an abstract, pluggable interface for load balancers.
// PR https://github.com/kubernetes/kubernetes/pull/80660 added support for cloud providers to return an error //
// ImplementedElsewhere. This error is used to indicate that the loadbalancer implementation is handled outside of // Cloud provider may chose to implement the logic for
// cloud provider, maybe in a different controller. // constructing/destroying specific kinds of load balancers in a
// In order to use this correctly, the cloud-provider implementation needs to return "NotFound" // controller separate from the ServiceController. If this is the case,
// for GetLoadBalancer and empty string for GetLoadBalancerName. EnsureLoadBalancer and UpdateLoadBalancer need to // then {Ensure,Update}LoadBalancer must return the ImplementedElsewhere error.
// return ImplementedElsewhere error. EnsureLoadBalancerDeleted can return ImplementedElsewhere as well. // For the given LB service, the GetLoadBalancer must return "exists=True" if
// there exists a LoadBalancer instance created by ServiceController.
// In all other cases, GetLoadBalancer must return a NotFound error.
// EnsureLoadBalancerDeleted must not return ImplementedElsewhere to ensure
// proper teardown of resources that were allocated by the ServiceController.
// This can happen if a user changes the type of LB via an update to the resource
// or when migrating from ServiceController to alternate implementation.
// The finalizer on the service will be added and removed by ServiceController
// irrespective of the ImplementedElsewhere error. Additional finalizers for
// LB services must be managed in the alternate implementation.
type LoadBalancer interface { type LoadBalancer interface {
// TODO: Break this up into different interfaces (LB, etc) when we have more than one type of service // TODO: Break this up into different interfaces (LB, etc) when we have more than one type of service
// GetLoadBalancer returns whether the specified load balancer exists, and // GetLoadBalancer returns whether the specified load balancer exists, and