Skip to content

K
k3s
Commit 4a01539d authored by Jerome Touffe-Blin's avatar Jerome Touffe-Blin
Browse files
Options

Fix #17647 - AWS add tag to SG only if existing tag

parent 147b6911
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
pkg/cloudprovider/providers/aws/aws.go
View file @ 4a01539d
...@@ -1552,12 +1552,14 @@ func (s *AWSCloud) ensureSecurityGroup(name string, description string, vpcID st ...@@ -1552,12 +1552,14 @@ func (s *AWSCloud) ensureSecurityGroup(name string, description string, vpcID st
tags = append(tags, tag) tags = append(tags, tag)
} }
tagRequest := &ec2.CreateTagsInput{} if len(tags) > 0 {
tagRequest.Resources = []*string{&groupID} tagRequest := &ec2.CreateTagsInput{}
tagRequest.Tags = tags tagRequest.Resources = []*string{&groupID}
if _, err := s.createTags(tagRequest); err != nil { tagRequest.Tags = tags
// Not clear how to recover fully from this; we're OK because we don't match on tags, but that is a little odd if _, err := s.createTags(tagRequest); err != nil {
return "", fmt.Errorf("error tagging security group: %v", err) // Not clear how to recover fully from this; we're OK because we don't match on tags, but that is a little odd
return "", fmt.Errorf("error tagging security group: %v", err)
}
} }
return groupID, nil return groupID, nil
} }
......
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