Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
5bfd15e4
Commit
5bfd15e4
authored
Sep 27, 2016
by
Justin Santa Barbara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
AWS: include ELB name in health-check logging
Makes more supportable
parent
8d72f66e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
aws_loadbalancer.go
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
+5
-3
No files found.
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
View file @
5bfd15e4
...
@@ -317,6 +317,8 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala
...
@@ -317,6 +317,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
...
@@ -336,7 +338,7 @@ func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDesc
...
@@ -336,7 +338,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
)
&&
...
@@ -347,7 +349,7 @@ func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDesc
...
@@ -347,7 +349,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
...
@@ -362,7 +364,7 @@ func (c *Cloud) ensureLoadBalancerHealthCheck(loadBalancer *elb.LoadBalancerDesc
...
@@ -362,7 +364,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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment