Normalize canonicalMaxClusterVersion (e.g. v4.15.0-0 instead of v4.15.0)

Signed-off-by: Jenny Zhu <[email protected]>

Author: zhuje

pkg/controllers/uiplugin/compatibility_matrix.go

@@ -3,6 +3,7 @@ package uiplugin
 import (
 	"context"
 	"fmt"
+	// "log"
 	"strings"
 
 	"golang.org/x/mod/semver"
@@ -160,7 +161,7 @@ func lookupImageAndFeatures(pluginType uiv1alpha1.UIPluginType, clusterVersion s
 
 func compareClusterVersion(entry CompatibilityEntry, clusterVersion string, pluginType uiv1alpha1.UIPluginType) (CompatibilityEntry, error) {
 	canonicalMinClusterVersion := fmt.Sprintf("%s-0", semver.Canonical(entry.MinClusterVersion))
-	canonicalMaxClusterVersion := semver.Canonical(entry.MaxClusterVersion)
+	canonicalMaxClusterVersion := fmt.Sprintf("%s-0", semver.Canonical(entry.MaxClusterVersion))
 
 	if entry.MaxClusterVersion == "" && semver.Compare(clusterVersion, canonicalMinClusterVersion) >= 0 {
 		return entry, nil

pkg/controllers/uiplugin/compatibility_matrix_test.go

@@ -122,6 +122,28 @@ func TestLookupImageAndFeatures(t *testing.T) {
 				"dev-alerts",
 			},
 		},
+		{
+			pluginType:     uiv1alpha1.TypeLogging,
+			clusterVersion: "v4.15.0-0.nightly-2024-06-06-064349",
+			expectedKey:    "ui-logging",
+			expectedErr:    nil,
+			expectedFeatures: []string{
+				"dev-console",
+				"alerts",
+				"dev-alerts",
+			},
+		},
+		{
+			pluginType:     uiv1alpha1.TypeLogging,
+			clusterVersion: "4.15.46",
+			expectedKey:    "ui-logging",
+			expectedErr:    nil,
+			expectedFeatures: []string{
+				"dev-console",
+				"alerts",
+				"dev-alerts",
+			},
+		},
 		{
 			pluginType:     uiv1alpha1.TypeLogging,
 			clusterVersion: "v4.16.9",
@@ -183,6 +205,18 @@ func TestLookupImageAndFeatures(t *testing.T) {
 			expectedKey:    "ui-distributed-tracing",
 			expectedErr:    nil,
 		},
+		{
+			pluginType:     uiv1alpha1.TypeDistributedTracing,
+			clusterVersion: "v4.15.0-0.nightly-2024-06-06-064349",
+			expectedKey:    "ui-distributed-tracing",
+			expectedErr:    nil,
+		},
+		{
+			pluginType:     uiv1alpha1.TypeDistributedTracing,
+			clusterVersion: "v4.15.46",
+			expectedKey:    "ui-distributed-tracing",
+			expectedErr:    nil,
+		},
 		{
 			pluginType:     uiv1alpha1.TypeDistributedTracing,
 			clusterVersion: "4.24.0-0.nightly-2024-03-11-200348",
@@ -231,6 +265,8 @@ func TestLookupImageAndFeatures(t *testing.T) {
 		t.Run(fmt.Sprintf("%s/%s", tc.pluginType, tc.clusterVersion), func(t *testing.T) {
 			info, err := lookupImageAndFeatures(tc.pluginType, tc.clusterVersion)
 
+			t.Log(info)
+
 			if tc.expectedErr != nil {
 				assert.Error(t, err, tc.expectedErr.Error())
 				return