github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33570 from justinsb/aws_elb_more_logging

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 38260, 32811, 28458, 33570, 37096)

AWS: include ELB name in health-check logging
This commit is contained in:
Kubernetes Submit Queue 2016-12-08 02:11:24 -08:00 committed by GitHub
commit 44e25b1087
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
View File

@ -319,6 +319,8 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala
// Makes sure that the health check for an ELB matches the configured listeners // Makes sure that the health check for an ELB matches the configured listeners
func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDescription, listeners []*elb.Listener) error { func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDescription, listeners []*elb.Listener) error {
name := aws.StringValue(loadBalancer.LoadBalancerName)
actual := loadBalancer.HealthCheck actual := loadBalancer.HealthCheck
// Default AWS settings // Default AWS settings
@ -338,7 +340,7 @@ func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDesc
} }
if expectedTarget == "" { if expectedTarget == "" {
return fmt.Errorf("unable to determine health check port (no valid listeners)") return fmt.Errorf("unable to determine health check port for %q (no valid listeners)", name)
} }
if expectedTarget == orEmpty(actual.Target) && if expectedTarget == orEmpty(actual.Target) &&
@ -349,7 +351,7 @@ func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDesc
return nil return nil
} }
glog.V(2).Info("Updating load-balancer health-check") glog.V(2).Info("Updating load-balancer health-check for %q", name)
healthCheck := &elb.HealthCheck{} healthCheck := &elb.HealthCheck{}
healthCheck.HealthyThreshold = &expectedHealthyThreshold healthCheck.HealthyThreshold = &expectedHealthyThreshold
@ -364,7 +366,7 @@ func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDesc
_, err := c.elb.ConfigureHealthCheck(request) _, err := c.elb.ConfigureHealthCheck(request)
if err != nil { if err != nil {
return fmt.Errorf("error configuring load-balancer health-check: %v", err) return fmt.Errorf("error configuring load-balancer health-check for %q: %v", name, err)
} }
return nil return nil