Merge pull request #168 from gr455/oam/versioning

Add version to components
meshery · Aug 5, 2022 · 2144a66 · 2144a66
2 parents d02e0ca + c29b736
commit 2144a66
Show file tree

Hide file tree

Showing 117 changed files with 133 additions and 131 deletions.
diff --git a/.github/install/deploy.yaml b/.github/install/deploy.yaml
@@ -3,5 +3,4 @@ services:
   osm:
     type: OSMMesh
     namespace: osm
-    settings:
-      version:  #will be inserted dynamically
+    version:  #will be inserted dynamically      
diff --git a/.github/workflows/e2etest.yaml b/.github/workflows/e2etest.yaml
@@ -39,7 +39,7 @@ jobs:
       - name: Change service mesh version in patternfile
         run: | 
            
-           yq e -i '.services.osm.settings.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploy.yaml 
+           yq e -i '.services.osm.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploy.yaml 
            cat ./.github/install/deploy.yaml
       - name: Uploading file
         uses: actions/upload-artifact@v2

diff --git a/go.mod b/go.mod
@@ -9,8 +9,8 @@ replace (
 )
 
 require (
-	github.com/layer5io/meshery-adapter-library v0.5.7
-	github.com/layer5io/meshkit v0.5.20
+	github.com/layer5io/meshery-adapter-library v0.5.8
+	github.com/layer5io/meshkit v0.5.32
 	github.com/layer5io/service-mesh-performance v0.3.4
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/apimachinery v0.23.5
@@ -64,7 +64,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/btree v1.0.1 // indirect
-	github.com/google/go-cmp v0.5.7 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.3.0 // indirect
@@ -151,8 +151,8 @@ require (
 	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
 	google.golang.org/api v0.74.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
-	google.golang.org/grpc v1.45.0 // indirect
+	google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
+	google.golang.org/grpc v1.46.0 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/gorp.v1 v1.7.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect

diff --git a/go.sum b/go.sum
diff --git a/osm/oam.go b/osm/oam.go
@@ -89,7 +89,11 @@ func handleComponentOSMMesh(h *Handler, comp v1alpha1.Component, isDel bool, kub
 	// Get the osm version from the settings
 	// we are sure that the version of osm would be present
 	// because the configuration is already validated against the schema
-	version := comp.Spec.Settings["version"].(string)
+	version := comp.Spec.Version
+	if version == "" {
+		return "", fmt.Errorf("pass valid version inside service for OSM installation")
+	}
+	//TODO: When no version is passed in service, use the latest OSM version
 
 	msg, err := h.installOSM(isDel, version, comp.Namespace, kubeconfigs)
 	if err != nil {

diff --git a/templates/oam/workloads/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/osmmesh.meshery.layer5io.schema.json
diff --git a/templates/oam/workloads/osmmesh_definition.json b/templates/oam/workloads/osmmesh_definition.json
diff --git a/templates/oam/workloads/v0.0.1/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.0.1/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.0.1/osmmesh_definition.json b/templates/oam/workloads/v0.0.1/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.0.1"
 		}
 	}

diff --git a/templates/oam/workloads/v0.0.10/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.0.10/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.0.10/osmmesh_definition.json b/templates/oam/workloads/v0.0.10/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.0.10"
 		}
 	}

diff --git a/templates/oam/workloads/v0.0.9/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.0.9/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.0.9/osmmesh_definition.json b/templates/oam/workloads/v0.0.9/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.0.9"
 		}
 	}

diff --git a/templates/oam/workloads/v0.1.0-rc.1/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.1.0-rc.1/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.1.0-rc.1/osmmesh_definition.json b/templates/oam/workloads/v0.1.0-rc.1/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.1.0-rc.1"
 		}
 	}

diff --git a/templates/oam/workloads/v0.1.0/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.1.0/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.1.0/osmmesh_definition.json b/templates/oam/workloads/v0.1.0/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.1.0"
 		}
 	}

diff --git a/templates/oam/workloads/v0.10.0-rc.1/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.10.0-rc.1/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.10.0-rc.1/osmmesh_definition.json b/templates/oam/workloads/v0.10.0-rc.1/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.10.0-rc.1"
 		}
 	}

diff --git a/templates/oam/workloads/v0.10.0-rc.2/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.10.0-rc.2/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.10.0-rc.2/osmmesh_definition.json b/templates/oam/workloads/v0.10.0-rc.2/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.10.0-rc.2"
 		}
 	}

diff --git a/templates/oam/workloads/v0.10.0/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.10.0/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.10.0/osmmesh_definition.json b/templates/oam/workloads/v0.10.0/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.10.0"
 		}
 	}

diff --git a/templates/oam/workloads/v0.11.0-rc.1/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.11.0-rc.1/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.11.0-rc.1/osmmesh_definition.json b/templates/oam/workloads/v0.11.0-rc.1/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.11.0-rc.1"
 		}
 	}

diff --git a/templates/oam/workloads/v0.11.0-rc.3/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.11.0-rc.3/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.11.0-rc.3/osmmesh_definition.json b/templates/oam/workloads/v0.11.0-rc.3/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.11.0-rc.3"
 		}
 	}

diff --git a/templates/oam/workloads/v0.11.0/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.11.0/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.11.0/osmmesh_definition.json b/templates/oam/workloads/v0.11.0/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.11.0"
 		}
 	}

diff --git a/templates/oam/workloads/v0.11.1-rc.1/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.11.1-rc.1/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.11.1-rc.1/osmmesh_definition.json b/templates/oam/workloads/v0.11.1-rc.1/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.11.1-rc.1"
 		}
 	}

diff --git a/templates/oam/workloads/v0.11.1/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.11.1/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.11.1/osmmesh_definition.json b/templates/oam/workloads/v0.11.1/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.11.1"
 		}
 	}

diff --git a/templates/oam/workloads/v0.11.2/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.11.2/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.11.2/osmmesh_definition.json b/templates/oam/workloads/v0.11.2/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.11.2"
 		}
 	}

diff --git a/templates/oam/workloads/v0.2.0/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.2.0/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.2.0/osmmesh_definition.json b/templates/oam/workloads/v0.2.0/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.2.0"
 		}
 	}

diff --git a/templates/oam/workloads/v0.3.0/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.3.0/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.3.0/osmmesh_definition.json b/templates/oam/workloads/v0.3.0/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.3.0"
 		}
 	}

diff --git a/templates/oam/workloads/v0.4.0/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.4.0/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.4.0/osmmesh_definition.json b/templates/oam/workloads/v0.4.0/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.4.0"
 		}
 	}

diff --git a/templates/oam/workloads/v0.4.1/osmmesh.meshery.layer5io.schema.json b/templates/oam/workloads/v0.4.1/osmmesh.meshery.layer5io.schema.json
@@ -2,6 +2,7 @@
 	"$id": "http://meshery.layer5.io/definition/Workload/OSMMesh",
 	"$schema": "http://json-schema.org/draft-07/schema",
 	"properties": {},
+	"required": [],
 	"title": "OSMMesh",
 	"type": "object"
 }
diff --git a/templates/oam/workloads/v0.4.1/osmmesh_definition.json b/templates/oam/workloads/v0.4.1/osmmesh_definition.json
@@ -9,6 +9,7 @@
 			"name": "osmmesh.meshery.layer5.io"
 		},
 		"metadata": {
+			"@type": "pattern.meshery.io/core",
 			"version": "v0.4.1"
 		}
 	}