Skip to content

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

Merge pull request #51020 from dunjut/master

Automatic merge from submit-queue (batch tested with PRs 50980, 46902, 51051, 51062, 51020) fix confusion in service_controller **What this PR does / why we need it**: Fix code and comment confusion in `service_controller`. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #51009 **Special notes for your reviewer**: **Release note**: ```release-note ```
parents 57ab7c6a c9941ff4
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
pkg/controller/service/service_controller.go
View file @ f354857b
......@@ -280,13 +280,12 @@ func (s *ServiceController) createLoadBalancerIfNeeded(key string, service *v1.S
// TODO: We could do a dry-run here if wanted to avoid the spurious cloud-calls & events when we restart
// The load balancer doesn't exist yet, so create it.
s.eventRecorder.Event(service, v1.EventTypeNormal, "CreatingLoadBalancer", "Creating load balancer")
newState, err = s.createLoadBalancer(service)
s.eventRecorder.Event(service, v1.EventTypeNormal, "EnsuringLoadBalancer", "Ensuring load balancer")
newState, err = s.ensureLoadBalancer(service)
if err != nil {
return fmt.Errorf("Failed to create load balancer for service %s: %v", key, err), retryable
return fmt.Errorf("Failed to ensure load balancer for service %s: %v", key, err), retryable
}
s.eventRecorder.Event(service, v1.EventTypeNormal, "CreatedLoadBalancer", "Created load balancer")
s.eventRecorder.Event(service, v1.EventTypeNormal, "EnsuredLoadBalancer", "Ensured load balancer")
}
// Write the state if changed
......@@ -340,7 +339,7 @@ func (s *ServiceController) persistUpdate(service *v1.Service) error {
return err
}
func (s *ServiceController) createLoadBalancer(service *v1.Service) (*v1.LoadBalancerStatus, error) {
func (s *ServiceController) ensureLoadBalancer(service *v1.Service) (*v1.LoadBalancerStatus, error) {
nodes, err := s.nodeLister.ListWithPredicate(getNodeConditionPredicate())
if err != nil {
return nil, err
......
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