Skip to content

K
k3s
Commit bbee2da7 authored by Brice Figureau's avatar Brice Figureau
Browse files
Options

Fix #73479 AWS NLB target groups missing tags

`elbv2.AddTags` doesn't seem to support assigning the same set of tags to multiple resources at once leading to the following error: Error adding tags after modifying load balancer targets: "ValidationError: Only one resource can be tagged at a time" This can happen when using AWS NLB with multiple listeners pointing to different node ports. When k8s creates a NLB it creates a target group per listener along with installing security group ingress rules allowing the traffic to reach the k8s nodes. Unfortunately if those target groups are not tagged, k8s will not manage them, thinking it is not the owner. This small changes assigns tags one resource at a time instead of batching them as before. Signed-off-by: 's avatarBrice Figureau <brice@daysofwonder.com>
parent 529785e3
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 10 deletions
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
View file @ bbee2da7
...@@ -143,10 +143,7 @@ func (c *Cloud) ensureLoadBalancerv2(namespacedName types.NamespacedName, loadBa ...@@ -143,10 +143,7 @@ func (c *Cloud) ensureLoadBalancerv2(namespacedName types.NamespacedName, loadBa
loadBalancer = createResponse.LoadBalancers[0] loadBalancer = createResponse.LoadBalancers[0]
// Create Target Groups // Create Target Groups
addTagsInput := &elbv2.AddTagsInput{ resourceArns := make([]*string, 0, len(mappings))
ResourceArns: []*string{},
Tags: []*elbv2.Tag{},
}
for i := range mappings { for i := range mappings {
// It is easier to keep track of updates by having possibly // It is easier to keep track of updates by having possibly
...@@ -155,20 +152,28 @@ func (c *Cloud) ensureLoadBalancerv2(namespacedName types.NamespacedName, loadBa ...@@ -155,20 +152,28 @@ func (c *Cloud) ensureLoadBalancerv2(namespacedName types.NamespacedName, loadBa
if err != nil { if err != nil {
return nil, fmt.Errorf("Error creating listener: %q", err) return nil, fmt.Errorf("Error creating listener: %q", err)
} }
addTagsInput.ResourceArns = append(addTagsInput.ResourceArns, targetGroupArn) resourceArns = append(resourceArns, targetGroupArn)
} }
// Add tags to targets // Add tags to targets
targetGroupTags := make([]*elbv2.Tag, 0, len(tags))
for k, v := range tags { for k, v := range tags {
addTagsInput.Tags = append(addTagsInput.Tags, &elbv2.Tag{ targetGroupTags = append(targetGroupTags, &elbv2.Tag{
Key: aws.String(k), Value: aws.String(v), Key: aws.String(k), Value: aws.String(v),
}) })
} }
if len(addTagsInput.ResourceArns) > 0 && len(addTagsInput.Tags) > 0 { if len(resourceArns) > 0 && len(targetGroupTags) > 0 {
_, err = c.elbv2.AddTags(addTagsInput) // elbv2.AddTags doesn't allow to tag multiple resources at once
if err != nil { for _, arn := range resourceArns {
return nil, fmt.Errorf("Error adding tags after creating Load Balancer: %q", err) _, 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 { } else {
......
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