DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove duplicated ingress check code

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-09-25 16:40:55 -03:00
parent e43641f7c0
commit 895fba386d
2 changed files with 36 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/pkg/ingress/status/status.go
View file

@ -297,7 +297,7 @@ func sliceToStatus(endpoints []string) []apiv1.LoadBalancerIngress {
}
}
sort.Slice(lbi, func(a, b int) bool {
sort.SliceStable(lbi, func(a, b int) bool {
return lbi[a].IP < lbi[b].IP
})
@ -342,10 +342,10 @@ func runUpdate(ing *extensions.Ingress, status []apiv1.LoadBalancerIngress,
if ca != nil {
addrs = ca
}
sort.Slice(addrs, lessLoadBalancerIngress(addrs))
sort.SliceStable(addrs, lessLoadBalancerIngress(addrs))
curIPs := ing.Status.LoadBalancer.Ingress
sort.Slice(curIPs, lessLoadBalancerIngress(curIPs))
sort.SliceStable(curIPs, lessLoadBalancerIngress(curIPs))
if ingressSliceEqual(addrs, curIPs) {
glog.V(3).Infof("skipping update of Ingress %v/%v (no change)", ing.Namespace, ing.Name)