Sort commatrix

openshift-kni · Apr 25, 2024 · 1ad046b · 1ad046b
1 parent ee48bff
commit 1ad046b
Show file tree

Hide file tree

Showing 8 changed files with 542 additions and 512 deletions.
diff --git a/Makefile b/Makefile
@@ -13,6 +13,7 @@ build:
 
 # TODO: check if oc is installed
 generate: build
+	rm -rf $(DEST_DIR)/communication-matrix
 	mkdir -p $(DEST_DIR)/communication-matrix
 	./$(EXECUTABLE) -format=$(FORMAT) -env=$(CLUSTER_ENV) -destDir=$(DEST_DIR)/communication-matrix -deployment=$(DEPLOYMENT)
 

diff --git a/commatrix/commatrix.go b/commatrix/commatrix.go
@@ -6,6 +6,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"slices"
 
 	"github.com/openshift-kni/commatrix/client"
 	"github.com/openshift-kni/commatrix/endpointslices"
@@ -69,6 +70,8 @@ func New(kubeconfigPath string, customEntriesPath string, e Env, d Deployment) (
 		res = append(res, customComDetails...)
 	}
 
+	slices.SortFunc(res, types.CmpComDetails)
+
 	return &types.ComMatrix{Matrix: res}, nil
 }