Merge pull request #1537 from KubeKyrie/fix-manifest-version-range

fix version range format

Author: ErikJiang

pkg/controllers/offlineversion/controller.go

@@ -14,6 +14,7 @@ import (
 	localartifactsetClientSet "github.com/kubean-io/kubean-api/generated/localartifactset/clientset/versioned"
 	manifestClientSet "github.com/kubean-io/kubean-api/generated/manifest/clientset/versioned"
 	"github.com/kubean-io/kubean/pkg/controllers/infomanifest"
+	"github.com/kubean-io/kubean/pkg/util"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -56,6 +57,9 @@ func (c *Controller) MergeManifestsStatus(localartifactset *localartifactsetv1al
 		if !updated {
 			continue
 		}
+		for _, component := range manifest.Status.LocalAvailable.Components {
+			component.VersionRange = util.UnifyVersions(component.VersionRange)
+		}
 		klog.Infof("Update manifest status for %s since %s", manifest.Name, localartifactset.Name)
 		if _, err := c.InfoManifestClientSet.KubeanV1alpha1().Manifests().UpdateStatus(context.Background(), manifest, metav1.UpdateOptions{}); err != nil {
 			return nil, fmt.Errorf("failed to merge status for manifest %s, %v", manifest.Name, err)

pkg/util/version.go

@@ -0,0 +1,18 @@
+package util
+
+import "strings"
+
+func UnifyVersions(versions []string) []string {
+	seen := make(map[string]struct{})
+	result := make([]string, 0)
+
+	for _, v := range versions {
+		cleaned := strings.TrimPrefix(v, "v")
+		if _, exists := seen[cleaned]; !exists {
+			seen[cleaned] = struct{}{}
+			result = append(result, cleaned)
+		}
+	}
+
+	return result
+}

pkg/util/version_test.go

@@ -0,0 +1,64 @@
+// Copyright 2023 Authors of kubean-io
+// SPDX-License-Identifier: Apache-2.0
+
+package util
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestUnifyVersions(t *testing.T) {
+	type args struct {
+		versions []string
+	}
+	tests := []struct {
+		name string
+		args args
+		want []string
+	}{
+		{
+			name: "normal with v prefix",
+			args: args{
+				versions: []string{"v1.0.0", "v1.0.1", "v2.0.0"},
+			},
+			want: []string{"1.0.0", "1.0.1", "2.0.0"},
+		},
+		{
+			name: "mixed v and no prefix",
+			args: args{
+				versions: []string{"v1.0.0", "1.0.0", "v2.0.0"},
+			},
+			want: []string{"1.0.0", "2.0.0"},
+		},
+		{
+			name: "no v prefix",
+			args: args{
+				versions: []string{"1.0.0", "2.0.0"},
+			},
+			want: []string{"1.0.0", "2.0.0"},
+		},
+		{
+			name: "duplicates only",
+			args: args{
+				versions: []string{"v1.0.0", "v1.0.0", "1.0.0"},
+			},
+			want: []string{"1.0.0"},
+		},
+		{
+			name: "empty input",
+			args: args{
+				versions: []string{},
+			},
+			want: []string{},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := UnifyVersions(tt.args.versions)
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("UnifyVersions() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}