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

Merge pull request #4409 from ProNic-QY/master

Browse source 
sort ingress by namespace and name when ingress.CreationTimestamp identical
This commit is contained in:
Kubernetes Prow Robot 2019-08-18 17:30:03 -07:00 committed by GitHub
commit 6697203891
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/ingress/controller/store/store.go
View file

@ -777,6 +777,12 @@ func (s *k8sStore) ListIngresses(filter IngressFilterFunc) []*ingress.Ingress {
sort.SliceStable(ingresses, func(i, j int) bool { sort.SliceStable(ingresses, func(i, j int) bool {
ir := ingresses[i].CreationTimestamp ir := ingresses[i].CreationTimestamp
jr := ingresses[j].CreationTimestamp jr := ingresses[j].CreationTimestamp
if ir.Equal(&jr) {
in := fmt.Sprintf("%v/%v", ingresses[i].Namespace, ingresses[i].Name)
jn := fmt.Sprintf("%v/%v", ingresses[j].Namespace, ingresses[j].Name)
klog.Warningf("Ingress %v and %v have identical CreationTimestamp", in, jn)
return in > jn
}
return ir.Before(&jr) return ir.Before(&jr)
}) })