Fixed merging of host aliases (#321)

Nikolas De Giorgis · web-flow · commit 8fbfee2236d5 · 2021-02-04T17:24:03.000+01:00
diff --git a/pkg/util/merge/merge_podtemplate_spec.go b/pkg/util/merge/merge_podtemplate_spec.go
@@ -1,6 +1,8 @@
 package merge
 
 import (
+	"sort"
+
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/util/contains"
 	corev1 "k8s.io/api/core/v1"
 )
@@ -208,6 +210,10 @@ func HostAliases(originalAliases, overrideAliases []corev1.HostAlias) []corev1.H
 		mergedHostAliases = append(mergedHostAliases, v)
 	}
 
+	sort.SliceStable(mergedHostAliases, func(i, j int) bool {
+		return mergedHostAliases[i].IP < mergedHostAliases[j].IP
+	})
+
 	return mergedHostAliases
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`package merge`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "sort"`
	`5`	`+`
`4`	`6`	`"github.com/mongodb/mongodb-kubernetes-operator/pkg/util/contains"`
`5`	`7`	`corev1 "k8s.io/api/core/v1"`
`6`	`8`	`)`
`@@ -208,6 +210,10 @@ func HostAliases(originalAliases, overrideAliases []corev1.HostAlias) []corev1.H`
`208`	`210`	`mergedHostAliases = append(mergedHostAliases, v)`
`209`	`211`	`}`
`210`	`212`
	`213`	`+ sort.SliceStable(mergedHostAliases, func(i, j int) bool {`
	`214`	`+ return mergedHostAliases[i].IP < mergedHostAliases[j].IP`
	`215`	`+ })`
	`216`	`+`
`211`	`217`	`return mergedHostAliases`
`212`	`218`	`}`
`213`	`219`