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
f78c7d3d
Commit
f78c7d3d
authored
Mar 20, 2018
by
hangaoshuai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use function aws.Int64Value replace of deprecated function orZero
parent
99d71456
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
8 deletions
+2
-8
aws_loadbalancer.go
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
+2
-2
aws_utils.go
pkg/cloudprovider/providers/aws/aws_utils.go
+0
-6
No files found.
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
View file @
f78c7d3d
...
@@ -1027,10 +1027,10 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala
...
@@ -1027,10 +1027,10 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala
if
elbProtocolsAreEqual
(
actual
.
InstanceProtocol
,
expected
.
InstanceProtocol
)
{
if
elbProtocolsAreEqual
(
actual
.
InstanceProtocol
,
expected
.
InstanceProtocol
)
{
continue
continue
}
}
if
orZero
(
actual
.
InstancePort
)
!=
orZero
(
expected
.
InstancePort
)
{
if
aws
.
Int64Value
(
actual
.
InstancePort
)
!=
aws
.
Int64Value
(
expected
.
InstancePort
)
{
continue
continue
}
}
if
orZero
(
actual
.
LoadBalancerPort
)
!=
orZero
(
expected
.
LoadBalancerPort
)
{
if
aws
.
Int64Value
(
actual
.
LoadBalancerPort
)
!=
aws
.
Int64Value
(
expected
.
LoadBalancerPort
)
{
continue
continue
}
}
if
awsArnEquals
(
actual
.
SSLCertificateId
,
expected
.
SSLCertificateId
)
{
if
awsArnEquals
(
actual
.
SSLCertificateId
,
expected
.
SSLCertificateId
)
{
...
...
pkg/cloudprovider/providers/aws/aws_utils.go
View file @
f78c7d3d
...
@@ -42,9 +42,3 @@ func stringSetFromPointers(in []*string) sets.String {
...
@@ -42,9 +42,3 @@ func stringSetFromPointers(in []*string) sets.String {
}
}
return
out
return
out
}
}
// orZero returns the value, or 0 if the pointer is nil
// Deprecated: prefer aws.Int64Value
func
orZero
(
v
*
int64
)
int64
{
return
aws
.
Int64Value
(
v
)
}
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