github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use function aws.Int64Value replace of deprecated function orZero

Browse Source
This commit is contained in:
hangaoshuai
2018-03-20 17:27:20 +08:00
parent 99d7145653
commit f78c7d3db0
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
View File

@@ -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) {

6
pkg/cloudprovider/providers/aws/aws_utils.go
View File

@@ -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)
}