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
af17925f
Unverified
Commit
af17925f
authored
Feb 07, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Feb 07, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #73594 from masterzen/bugfix/73479-nlb-target-groups-tags
Fix #73479 AWS NLB target groups missing tags
parents
0b224c4b
bbee2da7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
10 deletions
+15
-10
aws_loadbalancer.go
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
+15
-10
No files found.
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
View file @
af17925f
...
...
@@ -143,10 +143,7 @@ func (c *Cloud) ensureLoadBalancerv2(namespacedName types.NamespacedName, loadBa
loadBalancer
=
createResponse
.
LoadBalancers
[
0
]
// Create Target Groups
addTagsInput
:=
&
elbv2
.
AddTagsInput
{
ResourceArns
:
[]
*
string
{},
Tags
:
[]
*
elbv2
.
Tag
{},
}
resourceArns
:=
make
([]
*
string
,
0
,
len
(
mappings
))
for
i
:=
range
mappings
{
// It is easier to keep track of updates by having possibly
...
...
@@ -155,20 +152,28 @@ func (c *Cloud) ensureLoadBalancerv2(namespacedName types.NamespacedName, loadBa
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"Error creating listener: %q"
,
err
)
}
addTagsInput
.
ResourceArns
=
append
(
addTagsInput
.
R
esourceArns
,
targetGroupArn
)
resourceArns
=
append
(
r
esourceArns
,
targetGroupArn
)
}
// Add tags to targets
targetGroupTags
:=
make
([]
*
elbv2
.
Tag
,
0
,
len
(
tags
))
for
k
,
v
:=
range
tags
{
addTagsInput
.
Tags
=
append
(
addTagsInput
.
Tags
,
&
elbv2
.
Tag
{
targetGroupTags
=
append
(
targetGroup
Tags
,
&
elbv2
.
Tag
{
Key
:
aws
.
String
(
k
),
Value
:
aws
.
String
(
v
),
})
}
if
len
(
addTagsInput
.
ResourceArns
)
>
0
&&
len
(
addTagsInput
.
Tags
)
>
0
{
_
,
err
=
c
.
elbv2
.
AddTags
(
addTagsInput
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"Error adding tags after creating Load Balancer: %q"
,
err
)
if
len
(
resourceArns
)
>
0
&&
len
(
targetGroupTags
)
>
0
{
// elbv2.AddTags doesn't allow to tag multiple resources at once
for
_
,
arn
:=
range
resourceArns
{
_
,
err
=
c
.
elbv2
.
AddTags
(
&
elbv2
.
AddTagsInput
{
ResourceArns
:
[]
*
string
{
arn
},
Tags
:
targetGroupTags
,
})
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"Error adding tags after creating Load Balancer: %q"
,
err
)
}
}
}
}
else
{
...
...
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