Merge pull request kubernetes#85521 from gaorong/check-return-value

k8s-ci-robot · web-flow · commit 41757d673ed9 · 2019-11-25T22:51:10.000-08:00
check service status value returned by EnsureLoadBalancer
diff --git a/pkg/controller/service/controller.go b/pkg/controller/service/controller.go
@@ -351,6 +351,10 @@ func (s *Controller) syncLoadBalancerIfNeeded(service *v1.Service, key string) (
 			}
 			return op, fmt.Errorf("failed to ensure load balancer: %v", err)
 		}
+		if newStatus == nil {
+			return op, fmt.Errorf("service status returned by EnsureLoadBalancer is nil")
+		}
+
 		s.eventRecorder.Event(service, v1.EventTypeNormal, "EnsuredLoadBalancer", "Ensured load balancer")
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -351,6 +351,10 @@ func (s Controller) syncLoadBalancerIfNeeded(service v1.Service, key string) (`
`351`	`351`	`}`
`352`	`352`	`return op, fmt.Errorf("failed to ensure load balancer: %v", err)`
`353`	`353`	`}`
	`354`	`+ if newStatus == nil {`
	`355`	`+ return op, fmt.Errorf("service status returned by EnsureLoadBalancer is nil")`
	`356`	`+ }`
	`357`	`+`
`354`	`358`	`s.eventRecorder.Event(service, v1.EventTypeNormal, "EnsuredLoadBalancer", "Ensured load balancer")`
`355`	`359`	`}`
`356`	`360`