Keep Namespace labels order in tags

Signed-off-by: Yanjun Zhou <yanjun.zhou@broadcom.com>

pkg/nsx/services/subnet/subnet.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"sort"
 	"strings"
 	"sync"
 
@@ -366,9 +367,14 @@ func (service *SubnetService) GenerateSubnetNSTags(obj client.Object) []model.Ta
 				model.Tag{Scope: common.String(common.TagScopeVMNamespace), Tag: common.String(obj.GetNamespace())})
 		}
 	}
-	// Append Namespace labels as tags
-	for k, v := range namespace.Labels {
-		tags = append(tags, model.Tag{Scope: common.String(k), Tag: common.String(v)})
+	// Append Namespace labels in order as tags
+	labelKeys := make([]string, 0, len(namespace.Labels))
+	for k := range namespace.Labels {
+		labelKeys = append(labelKeys, k)
+	}
+	sort.Strings(labelKeys)
+	for _, k := range labelKeys {
+		tags = append(tags, model.Tag{Scope: common.String(k), Tag: common.String(namespace.Labels[k])})
 	}
 	return tags
 }

pkg/nsx/services/subnetport/builder.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"fmt"
 	"slices"
+	"sort"
 
 	"github.com/google/uuid"
 	corev1 "k8s.io/api/core/v1"
@@ -65,8 +66,14 @@ func (service *SubnetPortService) buildSubnetPort(obj interface{}, nsxSubnet *mo
 	namespace_uid := namespace.UID
 	tags := util.BuildBasicTags(getCluster(service), obj, namespace_uid)
 	if labelTags != nil {
-		for k, v := range *labelTags {
-			tags = append(tags, model.Tag{Scope: String(k), Tag: String(v)})
+		// Append Namespace labels in order as tags
+		labelKeys := make([]string, 0, len(*labelTags))
+		for k := range *labelTags {
+			labelKeys = append(labelKeys, k)
+		}
+		sort.Strings(labelKeys)
+		for _, k := range labelKeys {
+			tags = append(tags, model.Tag{Scope: common.String(k), Tag: common.String((*labelTags)[k])})
 		}
 	}
 	nsxSubnetPort := &model.VpcSubnetPort{