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
6be4417a
Commit
6be4417a
authored
Feb 18, 2016
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #17649 from jtblin/jtblin/17647-aws-elb-creation-no-tags
Auto commit by PR queue bot
parents
4151e96a
4a01539d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
aws.go
pkg/cloudprovider/providers/aws/aws.go
+8
-6
No files found.
pkg/cloudprovider/providers/aws/aws.go
View file @
6be4417a
...
@@ -1746,12 +1746,14 @@ func (s *AWSCloud) ensureSecurityGroup(name string, description string, vpcID st
...
@@ -1746,12 +1746,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
}
}
...
...
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