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
f10c9eed
Commit
f10c9eed
authored
Jun 13, 2017
by
Justin Santa Barbara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Follow our go code style: error -> err
Issue #47394
parent
54f628ad
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
30 deletions
+24
-30
aws.go
pkg/cloudprovider/providers/aws/aws.go
+24
-30
No files found.
pkg/cloudprovider/providers/aws/aws.go
View file @
f10c9eed
...
...
@@ -1037,39 +1037,36 @@ func (c *Cloud) NodeAddresses(name types.NodeName) ([]v1.NodeAddress, error) {
// This method will not be called from the node that is requesting this ID. i.e. metadata service
// and other local methods cannot be used here
func
(
c
*
Cloud
)
NodeAddressesByProviderID
(
providerID
string
)
([]
v1
.
NodeAddress
,
error
)
{
instanceID
,
error
:=
instanceIDFromProviderID
(
providerID
)
if
error
!=
nil
{
return
nil
,
error
instanceID
,
err
:=
instanceIDFromProviderID
(
providerID
)
if
err
!=
nil
{
return
nil
,
err
}
addresses
,
error
:=
c
.
describeAddressesByInstanceID
(
instanceID
)
if
error
!=
nil
{
return
nil
,
error
addresses
,
err
:=
c
.
describeAddressesByInstanceID
(
instanceID
)
if
err
!=
nil
{
return
nil
,
err
}
instances
,
error
:=
c
.
describeInstancesByInstanceID
(
instanceID
)
if
error
!=
nil
{
return
nil
,
error
instances
,
err
:=
c
.
describeInstancesByInstanceID
(
instanceID
)
if
err
!=
nil
{
return
nil
,
err
}
nodeAddresses
:=
[]
v1
.
NodeAddress
{}
for
_
,
address
:=
range
addresses
{
convertedAddress
,
err
or
:=
convertAwsAddress
(
address
)
if
err
or
!=
nil
{
return
nil
,
err
or
convertedAddress
,
err
:=
convertAwsAddress
(
address
)
if
err
!=
nil
{
return
nil
,
err
}
nodeAddresses
=
append
(
nodeAddresses
,
convertedAddress
...
)
}
for
_
,
instance
:=
range
instances
{
addresses
,
err
or
:=
instanceAddresses
(
instance
)
if
err
or
!=
nil
{
return
nil
,
err
or
addresses
,
err
:=
instanceAddresses
(
instance
)
if
err
!=
nil
{
return
nil
,
err
}
nodeAddresses
=
append
(
nodeAddresses
,
addresses
...
)
...
...
@@ -1114,16 +1111,14 @@ func (c *Cloud) InstanceID(nodeName types.NodeName) (string, error) {
// This method will not be called from the node that is requesting this ID. i.e. metadata service
// and other local methods cannot be used here
func
(
c
*
Cloud
)
InstanceTypeByProviderID
(
providerID
string
)
(
string
,
error
)
{
instanceID
,
error
:=
instanceIDFromProviderID
(
providerID
)
if
error
!=
nil
{
return
""
,
error
instanceID
,
err
:=
instanceIDFromProviderID
(
providerID
)
if
err
!=
nil
{
return
""
,
err
}
instance
,
error
:=
c
.
describeInstanceByInstanceID
(
instanceID
)
if
error
!=
nil
{
return
""
,
error
instance
,
err
:=
c
.
describeInstanceByInstanceID
(
instanceID
)
if
err
!=
nil
{
return
""
,
err
}
return
aws
.
StringValue
(
instance
.
InstanceType
),
nil
...
...
@@ -3452,10 +3447,9 @@ func (c *Cloud) describeAddressesByInstanceID(instanceID string) ([]*ec2.Address
Filters
:
filters
,
}
addresses
,
error
:=
c
.
ec2
.
DescribeAddresses
(
params
)
if
error
!=
nil
{
return
nil
,
error
addresses
,
err
:=
c
.
ec2
.
DescribeAddresses
(
params
)
if
err
!=
nil
{
return
nil
,
err
}
return
addresses
,
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