Merge pull request #4409 from ProNic-QY/master

sort ingress by namespace and name when ingress.CreationTimestamp identical
kubernetes · Aug 19, 2019 · 6697203 · 6697203
2 parents 75d65bb + 70614f4
commit 6697203
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/internal/ingress/controller/store/store.go b/internal/ingress/controller/store/store.go
@@ -777,6 +777,12 @@ func (s *k8sStore) ListIngresses(filter IngressFilterFunc) []*ingress.Ingress {
 	sort.SliceStable(ingresses, func(i, j int) bool {
 		ir := ingresses[i].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)
 	})