chore: defaulting latest release version and v-prefix compatible (#137)

Signed-off-by: yue9944882 <[email protected]>

Author: yue9944882

pkg/cmd/init/cmd.go

@@ -51,7 +51,7 @@ func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, stream
 	cmd.Flags().StringVar(&o.registry, "image-registry", "quay.io/open-cluster-management",
 		"The name of the image registry serving OCM images, which will be applied to all the deploying OCM components.")
 	cmd.Flags().StringVar(&o.bundleVersion, "bundle-version", "default",
-		"the version of predefined compatible image versions")		
+		`the version of predefined compatible image versions. e.g. v0.6.0, defaulted to the latest release version. also, we can set "latest" to install latest develop version`)
 	cmd.Flags().StringVar(&o.outputJoinCommandFile, "output-join-command-file", "",
 		"If set, the generated join command be saved to the prescribed file.")
 	cmd.Flags().BoolVar(&o.wait, "wait", false,

pkg/cmd/init/options.go

@@ -19,7 +19,7 @@ type Options struct {
 	force bool
 	//Pulling image registry of OCM
 	registry string
-	//version of predefined compatible image versions 
+	//version of predefined compatible image versions
 	bundleVersion string
 	//If set, will be persisting the generated join command to a local file
 	outputJoinCommandFile string
@@ -28,22 +28,21 @@ type Options struct {
 }
 
 type BundleVersion struct {
-	// registation image version 
+	// registation image version
 	RegistrationImageVersion string
-	// placment image version 
+	// placment image version
 	PlacementImageVersion string
-	// work image version 
+	// work image version
 	WorkImageVersion string
-	// operator image version 
-	OperatorImageVersion string	
+	// operator image version
+	OperatorImageVersion string
 }
 
-
 //Valus: The values used in the template
 type Values struct {
 	//The values related to the hub
 	Hub Hub `json:"hub"`
-	//bundle version 
+	//bundle version
 	BundleVersion BundleVersion
 }
 
@@ -57,8 +56,6 @@ type Hub struct {
 	Registry string `json:"registry"`
 }
 
-
-
 func newOptions(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, streams genericclioptions.IOStreams) *Options {
 	return &Options{
 		ClusteradmFlags: clusteradmFlags,

pkg/cmd/join/cmd.go

@@ -49,7 +49,7 @@ func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, stream
 	cmd.Flags().StringVar(&o.outputFile, "output-file", "", "The generated resources will be copied in the specified file")
 	cmd.Flags().StringVar(&o.registry, "image-registry", "quay.io/open-cluster-management", "The name of the image registry serving OCM images.")
 	cmd.Flags().StringVar(&o.bundleVersion, "bundle-version", "default",
-		"version of predefined compatible image versions")	
+		"version of predefined compatible image versions")
 	cmd.Flags().BoolVar(&o.forceHubInClusterEndpointLookup, "force-internal-endpoint-lookup", false,
 		"If true, the installed klusterlet agent will be starting the cluster registration process by "+
 			"looking for the internal endpoint from the public cluster-info in the hub cluster instead of from --hub-apiserver.")

pkg/cmd/join/options.go

@@ -20,8 +20,8 @@ type Options struct {
 	values Values
 	//The file to output the resources will be sent to the file.
 	outputFile string
-	//version of predefined compatible image versions 
-	bundleVersion string 
+	//version of predefined compatible image versions
+	bundleVersion string
 	//Pulling image registry of OCM
 	registry string
 	//Runs the cluster joining in foreground
@@ -43,7 +43,7 @@ type Values struct {
 	Registry string
 	//ImageRegistry is the klusterlet related configuration
 	Klusterlet Klusterlet
-	//bundle version 
+	//bundle version
 	BundleVersion BundleVersion
 }
 
@@ -65,18 +65,16 @@ type Klusterlet struct {
 }
 
 type BundleVersion struct {
-	// registation image version 
+	// registation image version
 	RegistrationImageVersion string
-	// placment image version 
+	// placment image version
 	PlacementImageVersion string
-	// work image version 
+	// work image version
 	WorkImageVersion string
-	// operator image version 
-	OperatorImageVersion string	
+	// operator image version
+	OperatorImageVersion string
 }
 
-
-
 func newOptions(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, streams genericclioptions.IOStreams) *Options {
 	return &Options{
 		ClusteradmFlags: clusteradmFlags,

pkg/helpers/version/version.go

@@ -2,50 +2,55 @@
 package version
 
 import (
-	"errors"
+	"fmt"
+	"strings"
 )
 
-type VersionBundle struct {	
+type VersionBundle struct {
 	Registration string
-	Placement string
-	Work string
-	Operator string
-}	
+	Placement    string
+	Work         string
+	Operator     string
+}
 
+func GetVersionBundle(version string) (VersionBundle, error) {
 
-func GetVersionBundle(version string ) (VersionBundle ,error){
+	// supporting either "x.y.z" or "vx.y.z" format version
+	if strings.HasPrefix(version, "v") {
+		version = strings.TrimPrefix(version, "v")
+	}
 
 	versionBundleList := map[string]VersionBundle{}
 
-	// default 
-	versionBundleList["default"] = VersionBundle{
+	// latest
+	versionBundleList["latest"] = VersionBundle{
 		Registration: "latest",
-		Placement: "latest",
-		Work: "latest",
-		Operator: "latest",
+		Placement:    "latest",
+		Work:         "latest",
+		Operator:     "latest",
 	}
-	
-	// predifined bundle version 
-	versionBundleList["0.5.0"] = VersionBundle{
-		Registration: "0.5.0",
-		Placement: "0.2.0",
-		Work: "0.5.0",
-		Operator: "0.5.0",
 
+	// predifined bundle version
+	// TODO: automated version tracking
+	versionBundleList["0.5.0"] = VersionBundle{
+		Registration: "v0.5.0",
+		Placement:    "v0.2.0",
+		Work:         "v0.5.0",
+		Operator:     "v0.5.0",
 	}
 
 	versionBundleList["0.6.0"] = VersionBundle{
-		Registration: "0.6.0",
-		Placement: "0.3.0",
-		Work: "0.6.0",
-		Operator: "0.6.0",
+		Registration: "v0.6.0",
+		Placement:    "v0.3.0",
+		Work:         "v0.6.0",
+		Operator:     "v0.6.0",
 	}
 
+	// default
+	versionBundleList["default"] = versionBundleList["0.6.0"]
 
 	if val, ok := versionBundleList[version]; ok {
-		return val , nil
-	} 
-	no_version_error := errors.New("couldn't find the requested version bundle")
-	return  VersionBundle{}, no_version_error
+		return val, nil
+	}
+	return VersionBundle{}, fmt.Errorf("couldn't find the requested version bundle: %v", version)
 }
-