Merge pull request #6984 from openshift-cherrypick-robot/cherry-pick-…

…6983-to-release-4.12

[release-4.12] OCPBUGS-10439: Sort userTags in Machine and Machineset manifests

pkg/asset/machines/aws/machines.go

@@ -3,6 +3,7 @@ package aws
 
 import (
 	"fmt"
+	"sort"
 
 	v1 "github.com/openshift/api/config/v1"
 	machinev1 "github.com/openshift/api/machine/v1"
@@ -221,11 +222,18 @@ func tagsFromUserTags(clusterID string, usertags map[string]string) ([]machineap
 	for idx := range tags {
 		forbiddenTags.Insert(tags[idx].Name)
 	}
-	for k, v := range usertags {
+
+	userTagKeys := make([]string, 0, len(usertags))
+	for key := range usertags {
+		userTagKeys = append(userTagKeys, key)
+	}
+	sort.Strings(userTagKeys)
+
+	for _, k := range userTagKeys {
 		if forbiddenTags.Has(k) {
 			return nil, fmt.Errorf("user tags may not clobber %s", k)
 		}
-		tags = append(tags, machineapi.TagSpecification{Name: k, Value: v})
+		tags = append(tags, machineapi.TagSpecification{Name: k, Value: usertags[k]})
 	}
 	return tags, nil
 }