fix(olm): Provide correct format of kube version in CSV

The format of kube version in CSV should be Major.Minor.Patch. For example, 1.1.1 is correct. Signed-off-by: Vu Dinh <vdinh@redhat.com>
operator-framework · Jan 12, 2019 · 1bad5c0 · 1bad5c0
1 parent 4c91431
commit 1bad5c0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/pkg/controller/operators/olm/requirements_test.go b/pkg/controller/operators/olm/requirements_test.go
@@ -38,7 +38,7 @@ func TestRequirementAndPermissionStatus(t *testing.T) {
 			description: "BadInstallStrategy",
 			csv: csv("csv1",
 				namespace,
-				"0.0",
+				"0.0.0",
 				"",
 				v1alpha1.NamedInstallStrategy{"deployment", json.RawMessage{}},
 				nil,
@@ -55,7 +55,7 @@ func TestRequirementAndPermissionStatus(t *testing.T) {
 			description: "AllPermissionsMet",
 			csv: csv("csv1",
 				namespace,
-				"0.0",
+				"0.0.0",
 				"",
 				installStrategy(
 					"csv1-dep",
@@ -186,7 +186,7 @@ func TestRequirementAndPermissionStatus(t *testing.T) {
 			description: "OnePermissionNotMet",
 			csv: csv("csv1",
 				namespace,
-				"0.0",
+				"0.0.0",
 				"",
 				installStrategy(
 					"csv1-dep",
@@ -317,7 +317,7 @@ func TestRequirementAndPermissionStatus(t *testing.T) {
 			description: "AllRequirementsMet",
 			csv: csv("csv1",
 				namespace,
-				"0.0",
+				"0.0.0",
 				"",
 				installStrategy(
 					"csv1-dep",
@@ -435,7 +435,7 @@ func TestRequirementAndPermissionStatus(t *testing.T) {
 			description: "RequirementNotMet/NonServedCRDVersion",
 			csv: csv("csv1",
 				namespace,
-				"0.0",
+				"0.0.0",
 				"",
 				installStrategy("csv1-dep", nil, nil),
 				[]*v1beta1.CustomResourceDefinition{crd("c1", "v2")},
@@ -462,7 +462,7 @@ func TestRequirementAndPermissionStatus(t *testing.T) {
 			description: "RequirementNotMet/NotEstablishedCRDVersion",
 			csv: csv("csv1",
 				namespace,
-				"0.0",
+				"0.0.0",
 				"",
 				installStrategy("csv1-dep", nil, nil),
 				[]*v1beta1.CustomResourceDefinition{crd("c1", "version-not-found")},
@@ -489,7 +489,7 @@ func TestRequirementAndPermissionStatus(t *testing.T) {
 			description: "RequirementNotMet/NamesConflictedCRD",
 			csv: csv("csv1",
 				namespace,
-				"0.0",
+				"0.0.0",
 				"",
 				installStrategy("csv1-dep", nil, nil),
 				[]*v1beta1.CustomResourceDefinition{crd("c1", "v2")},
@@ -522,7 +522,7 @@ func TestRequirementAndPermissionStatus(t *testing.T) {
 			description: "RequirementNotMet/CRDResourceInactive",
 			csv: csv("csv1",
 				namespace,
-				"0.0",
+				"0.0.0",
 				"",
 				installStrategy("csv1-dep", nil, nil),
 				[]*v1beta1.CustomResourceDefinition{crd("c1", "v2")},

diff --git a/test/e2e/csv_e2e_test.go b/test/e2e/csv_e2e_test.go
@@ -271,7 +271,7 @@ func TestCreateCSVWithUnmetRequirementsMinKubeVersion(t *testing.T) {
 			Name: genName("csv"),
 		},
 		Spec: v1alpha1.ClusterServiceVersionSpec{
-			MinKubeVersion: "999.999",
+			MinKubeVersion: "999.999.999",
 			InstallModes: []v1alpha1.InstallMode{
 				{
 					Type:      v1alpha1.InstallModeTypeOwnNamespace,
@@ -334,7 +334,7 @@ func TestCreateCSVWithUnmetRequirementsCRD(t *testing.T) {
 			Name: genName("csv"),
 		},
 		Spec: v1alpha1.ClusterServiceVersionSpec{
-			MinKubeVersion: "0.0",
+			MinKubeVersion: "0.0.0",
 			InstallModes: []v1alpha1.InstallMode{
 				{
 					Type:      v1alpha1.InstallModeTypeOwnNamespace,
@@ -507,7 +507,7 @@ func TestCreateCSVWithUnmetRequirementsAPIService(t *testing.T) {
 			Name: genName("csv"),
 		},
 		Spec: v1alpha1.ClusterServiceVersionSpec{
-			MinKubeVersion: "0.0",
+			MinKubeVersion: "0.0.0",
 			InstallModes: []v1alpha1.InstallMode{
 				{
 					Type:      v1alpha1.InstallModeTypeOwnNamespace,
@@ -596,7 +596,7 @@ func TestCreateCSVWithUnmetPermissionsAPIService(t *testing.T) {
 			Name: genName("csv"),
 		},
 		Spec: v1alpha1.ClusterServiceVersionSpec{
-			MinKubeVersion: "0.0",
+			MinKubeVersion: "0.0.0",
 			InstallModes: []v1alpha1.InstallMode{
 				{
 					Type:      v1alpha1.InstallModeTypeOwnNamespace,
@@ -659,7 +659,7 @@ func TestCreateCSVWithUnmetRequirementsNativeAPI(t *testing.T) {
 			Name: genName("csv"),
 		},
 		Spec: v1alpha1.ClusterServiceVersionSpec{
-			MinKubeVersion: "0.0",
+			MinKubeVersion: "0.0.0",
 			InstallModes: []v1alpha1.InstallMode{
 				{
 					Type:      v1alpha1.InstallModeTypeOwnNamespace,
@@ -750,7 +750,7 @@ func TestCreateCSVRequirementsMetCRD(t *testing.T) {
 			Name: genName("csv"),
 		},
 		Spec: v1alpha1.ClusterServiceVersionSpec{
-			MinKubeVersion: "0.0",
+			MinKubeVersion: "0.0.0",
 			InstallModes: []v1alpha1.InstallMode{
 				{
 					Type:      v1alpha1.InstallModeTypeOwnNamespace,
@@ -1006,7 +1006,7 @@ func TestCreateCSVRequirementsMetAPIService(t *testing.T) {
 			Name: genName("csv"),
 		},
 		Spec: v1alpha1.ClusterServiceVersionSpec{
-			MinKubeVersion: "0.0",
+			MinKubeVersion: "0.0.0",
 			InstallModes: []v1alpha1.InstallMode{
 				{
 					Type:      v1alpha1.InstallModeTypeOwnNamespace,
@@ -1162,7 +1162,7 @@ func TestCreateCSVWithOwnedAPIService(t *testing.T) {
 
 	csv := v1alpha1.ClusterServiceVersion{
 		Spec: v1alpha1.ClusterServiceVersionSpec{
-			MinKubeVersion: "0.0",
+			MinKubeVersion: "0.0.0",
 			InstallModes: []v1alpha1.InstallMode{
 				{
 					Type:      v1alpha1.InstallModeTypeOwnNamespace,
@@ -1337,7 +1337,7 @@ func TestUpdateCSVSameDeploymentName(t *testing.T) {
 			Name: genName("csv"),
 		},
 		Spec: v1alpha1.ClusterServiceVersionSpec{
-			MinKubeVersion: "0.0",
+			MinKubeVersion: "0.0.0",
 			InstallModes: []v1alpha1.InstallMode{
 				{
 					Type:      v1alpha1.InstallModeTypeOwnNamespace,
@@ -1520,7 +1520,7 @@ func TestUpdateCSVDifferentDeploymentName(t *testing.T) {
 			Name: genName("csv"),
 		},
 		Spec: v1alpha1.ClusterServiceVersionSpec{
-			MinKubeVersion: "0.0",
+			MinKubeVersion: "0.0.0",
 			InstallModes: []v1alpha1.InstallMode{
 				{
 					Type:      v1alpha1.InstallModeTypeOwnNamespace,
@@ -1708,7 +1708,7 @@ func TestUpdateCSVMultipleIntermediates(t *testing.T) {
 			Name: genName("csv"),
 		},
 		Spec: v1alpha1.ClusterServiceVersionSpec{
-			MinKubeVersion: "0.0",
+			MinKubeVersion: "0.0.0",
 			InstallModes: []v1alpha1.InstallMode{
 				{
 					Type:      v1alpha1.InstallModeTypeOwnNamespace,
@@ -1902,7 +1902,7 @@ func TestUpdateCSVMultipleVersionCRD(t *testing.T) {
 			Name: genName("csv"),
 		},
 		Spec: v1alpha1.ClusterServiceVersionSpec{
-			MinKubeVersion: "0.0",
+			MinKubeVersion: "0.0.0",
 			InstallModes: []v1alpha1.InstallMode{
 				{
 					Type:      v1alpha1.InstallModeTypeOwnNamespace,