Merge pull request #699 from dinhxuanvu/minkube-fix

openshift-merge-robot · web-flow · commit 274df58592c2 · 2019-02-09T02:24:44.000+01:00
fix(olm): Remove the "v" prefix in minKubeVersion if presents
diff --git a/Documentation/design/building-your-csv.md b/Documentation/design/building-your-csv.md
@@ -232,7 +232,7 @@ The metadata section contains general metadata around the name, version and othe
 
 **Description**: A markdown blob that describes the Operator. Important information to include: features, limitations and common use-cases for the Operator. If your Operator manages different types of installs, eg. standalone vs clustered, it is useful to give an overview of how each differs from each other, or which ones are supported for production use.
 
-**MinKubeVersion**: A minimum version of Kubernetes that server is supposed to have so operator(s) can be deployed.
+**MinKubeVersion**: A minimum version of Kubernetes that server is supposed to have so operator(s) can be deployed. The Kubernetes version must be in "Major.Major.Patch" format (e.g: 1.11.0).
 
 **Labels** (optional): Any key/value pairs used to organize and categorize this CSV object.
 
diff --git a/pkg/controller/operators/olm/requirements.go b/pkg/controller/operators/olm/requirements.go
@@ -50,7 +50,7 @@ func (a *Operator) minKubeVersionStatus(name string, minKubeVersion string) (met
 		return
 	}
 
-	csvVersionInfo, err := semver.NewVersion(minKubeVersion)
+	csvVersionInfo, err := semver.NewVersion(strings.TrimPrefix(minKubeVersion, "v"))
 	if err != nil {
 		status.Status = v1alpha1.RequirementStatusReasonPresentNotSatisfied
 		status.Message = "CSV version parsing error"

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func (a *Operator) minKubeVersionStatus(name string, minKubeVersion string) (met`
`50`	`50`	`return`
`51`	`51`	`}`
`52`	`52`
`53`		`- csvVersionInfo, err := semver.NewVersion(minKubeVersion)`
	`53`	`+ csvVersionInfo, err := semver.NewVersion(strings.TrimPrefix(minKubeVersion, "v"))`
`54`	`54`	`if err != nil {`
`55`	`55`	`status.Status = v1alpha1.RequirementStatusReasonPresentNotSatisfied`
`56`	`56`	`status.Message = "CSV version parsing error"`