Skip to content

Commit

Permalink
Merge b318f66 into 30fc20f
Browse files Browse the repository at this point in the history
  • Loading branch information
sivanzcw committed Nov 14, 2019
2 parents 30fc20f + b318f66 commit ee053d7
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
1 change: 1 addition & 0 deletions internal/testutils/endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ func SameEndpoints(a, b []*endpoint.Endpoint) bool {
return true
}

// SameEndpointLabels verifies that labels of the two slices of endpoints are the same
func SameEndpointLabels(a, b []*endpoint.Endpoint) bool {
if len(a) != len(b) {
return false
Expand Down
3 changes: 1 addition & 2 deletions provider/azure_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,8 @@ func testAzureApplyChangesInternal(t *testing.T, dryRun bool, client RecordSetsC
result := results[0]
results = nil
return result, nil
} else {
return dns.ZoneListResult{}, nil
}
return dns.ZoneListResult{}, nil
})
mockZoneClientIterator := dns.NewZoneListResultIterator(mockZoneListResultPage)

Expand Down
2 changes: 1 addition & 1 deletion provider/transip.go
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ func (p *TransIPProvider) dnsEntriesAreEqual(a, b transip.DNSEntries) bool {
continue
}

match += 1
match++
}
}

Expand Down
4 changes: 2 additions & 2 deletions source/ingress.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import (
)

const (
// The annotation used for determining if an ALB ingress is dualstack
// ALBDualstackAnnotationKey is the annotation used for determining if an ALB ingress is dualstack
ALBDualstackAnnotationKey = "alb.ingress.kubernetes.io/ip-address-type"
// The value of the ALB dualstack annotation that indicates it is dualstack
// ALBDualstackAnnotationValue is the value of the ALB dualstack annotation that indicates it is dualstack
ALBDualstackAnnotationValue = "dualstack"
)

Expand Down
2 changes: 1 addition & 1 deletion source/ingressroute.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ type ingressRouteSource struct {
ingressRouteInformer extinformers.IngressRouteInformer
}

// NewIngressRouteSource creates a new ingressRouteSource with the given config.
// NewContourIngressRouteSource creates a new contourIngressRouteSource with the given config.
func NewContourIngressRouteSource(
kubeClient kubernetes.Interface,
contourClient contour.Interface,
Expand Down

0 comments on commit ee053d7

Please sign in to comment.