Merge pull request #423 from jcmoraisjr/jm-sort

Improve sorting of internal state
jcmoraisjr · Oct 26, 2019 · c233335 · c233335
2 parents 77687d2 + 5ed945e
commit c233335
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -258,8 +258,13 @@ func (hc *HAProxyController) SyncIngress(item interface{}) error {
 			ingress = append(ingress, ing)
 		}
 	}
-	sort.SliceStable(ingress, func(i, j int) bool {
-		return ingress[i].CreationTimestamp.Before(&ingress[j].CreationTimestamp)
+	sort.Slice(ingress, func(i, j int) bool {
+		i1 := ingress[i]
+		i2 := ingress[j]
+		if i1.CreationTimestamp != i2.CreationTimestamp {
+			return i1.CreationTimestamp.Before(&i2.CreationTimestamp)
+		}
+		return i1.Namespace+"/"+i1.Name < i2.Namespace+"/"+i2.Name
 	})
 	var globalConfig map[string]string
 	if hc.configMap != nil {

diff --git a/pkg/haproxy/config.go b/pkg/haproxy/config.go
@@ -198,6 +198,9 @@ func (c *config) AddUserlist(name string, users []hatypes.User) *hatypes.Userlis
 		Name:  name,
 		Users: users,
 	}
+	sort.Slice(users, func(i, j int) bool {
+		return users[i].Name < users[j].Name
+	})
 	c.userlists = append(c.userlists, userlist)
 	sort.Slice(c.userlists, func(i, j int) bool {
 		return c.userlists[i].Name < c.userlists[j].Name