capo: make conversion deterministic

chrischdi · chrischdi · commit 32808488af24 · 2025-11-14T16:23:08.000+01:00
diff --git a/pkg/conversion/mapi2capi/openstack.go b/pkg/conversion/mapi2capi/openstack.go
@@ -17,6 +17,7 @@ package mapi2capi
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 
 	configv1 "github.com/openshift/api/config/v1"
@@ -789,6 +790,10 @@ func convertMAPOServerMetadataToCAPO(mapoServerMetadata map[string]string) []ope
 		capoServerMetadata = append(capoServerMetadata, openstackv1.ServerMetadata{Key: k, Value: v})
 	}
 
+	sort.SliceStable(capoServerMetadata, func(i, j int) bool {
+		return capoServerMetadata[i].Key < capoServerMetadata[j].Key
+	})
+
 	return capoServerMetadata
 }
 

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ package mapi2capi`
`17`	`17`
`18`	`18`	`import (`
`19`	`19`	`"fmt"`
	`20`	`+ "sort"`
`20`	`21`	`"strings"`
`21`	`22`
`22`	`23`	`configv1 "github.com/openshift/api/config/v1"`
`@@ -789,6 +790,10 @@ func convertMAPOServerMetadataToCAPO(mapoServerMetadata map[string]string) []ope`
`789`	`790`	`capoServerMetadata = append(capoServerMetadata, openstackv1.ServerMetadata{Key: k, Value: v})`
`790`	`791`	`}`
`791`	`792`
	`793`	`+ sort.SliceStable(capoServerMetadata, func(i, j int) bool {`
	`794`	`+ return capoServerMetadata[i].Key < capoServerMetadata[j].Key`
	`795`	`+ })`
	`796`	`+`
`792`	`797`	`return capoServerMetadata`
`793`	`798`	`}`
`794`	`799`