Merge pull request #304 from gr455/oam/versioning

Add version to components

.github/install/deploy.yaml

@@ -3,5 +3,5 @@ services:
   kuma:
     type: KumaMesh
     namespace: kuma
-    settings:
-      version: #will be inserted dynamically
+    version: #will be inserted dynamically
+

.github/workflows/e2etest.yaml

@@ -38,7 +38,7 @@ jobs:
       - name: Change service mesh version in patternfile
         run: | 
            
-           yq e -i '.services.kuma.settings.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploy.yaml 
+           yq e -i '.services.kuma.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploy.yaml 
            cat ./.github/install/deploy.yaml
       - name: Uploading file
         uses: actions/upload-artifact@v2

go.mod

@@ -11,8 +11,8 @@ replace (
 )
 
 require (
-	github.com/layer5io/meshery-adapter-library v0.5.7
-	github.com/layer5io/meshkit v0.5.30
+	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.6

kuma/oam.go

@@ -89,7 +89,11 @@ func handleComponentKumaMesh(kuma *Kuma, comp v1alpha1.Component, isDel bool, ku
 	// Get the kuma version from the settings
 	// we are sure that the version of kuma 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 Istio installation")
+	}
+	//TODO: When no version is passed in service, use the latest Kuma version
 
 	msg, err := kuma.installKuma(isDel, false, comp.Namespace, version, kubeconfigs)
 	if err != nil {

templates/oam/workloads/1.2.2/kumamesh.meshery.layer5io.schema.json

@@ -0,0 +1,6 @@
+{
+	"$id": "http://meshery.layer5.io/definition/Workload/KumaMesh",
+	"$schema": "http://json-schema.org/draft-07/schema",
+	"title": "KumaMesh",
+	"type": "object"
+}

templates/oam/workloads/1.2.2/kumamesh_definition.json

@@ -0,0 +1,16 @@
+{
+	"apiVersion": "core.oam.dev/v1alpha1",
+	"kind": "WorkloadDefinition",
+	"metadata": {
+		"name": "KumaMesh"
+	},
+	"spec": {
+		"definitionRef": {
+			"name": "kumamesh.meshery.layer5.io"
+		},
+		"metadata": {
+			"@type": "pattern.meshery.io/core",
+			"version": "1.2.2"
+		}
+	}
+}

templates/oam/workloads/1.3.0/kumamesh.meshery.layer5io.schema.json

@@ -0,0 +1,6 @@
+{
+	"$id": "http://meshery.layer5.io/definition/Workload/KumaMesh",
+	"$schema": "http://json-schema.org/draft-07/schema",
+	"title": "KumaMesh",
+	"type": "object"
+}

templates/oam/workloads/1.3.0/kumamesh_definition.json

@@ -0,0 +1,16 @@
+{
+	"apiVersion": "core.oam.dev/v1alpha1",
+	"kind": "WorkloadDefinition",
+	"metadata": {
+		"name": "KumaMesh"
+	},
+	"spec": {
+		"definitionRef": {
+			"name": "kumamesh.meshery.layer5.io"
+		},
+		"metadata": {
+			"@type": "pattern.meshery.io/core",
+			"version": "1.3.0"
+		}
+	}
+}

templates/oam/workloads/1.3.1/kumamesh.meshery.layer5io.schema.json

@@ -0,0 +1,6 @@
+{
+	"$id": "http://meshery.layer5.io/definition/Workload/KumaMesh",
+	"$schema": "http://json-schema.org/draft-07/schema",
+	"title": "KumaMesh",
+	"type": "object"
+}

templates/oam/workloads/1.3.1/kumamesh_definition.json

@@ -0,0 +1,16 @@
+{
+	"apiVersion": "core.oam.dev/v1alpha1",
+	"kind": "WorkloadDefinition",
+	"metadata": {
+		"name": "KumaMesh"
+	},
+	"spec": {
+		"definitionRef": {
+			"name": "kumamesh.meshery.layer5.io"
+		},
+		"metadata": {
+			"@type": "pattern.meshery.io/core",
+			"version": "1.3.1"
+		}
+	}
+}

templates/oam/workloads/1.4.0/kumamesh.meshery.layer5io.schema.json

@@ -0,0 +1,6 @@
+{
+	"$id": "http://meshery.layer5.io/definition/Workload/KumaMesh",
+	"$schema": "http://json-schema.org/draft-07/schema",
+	"title": "KumaMesh",
+	"type": "object"
+}

templates/oam/workloads/1.4.0/kumamesh_definition.json

@@ -0,0 +1,16 @@
+{
+	"apiVersion": "core.oam.dev/v1alpha1",
+	"kind": "WorkloadDefinition",
+	"metadata": {
+		"name": "KumaMesh"
+	},
+	"spec": {
+		"definitionRef": {
+			"name": "kumamesh.meshery.layer5.io"
+		},
+		"metadata": {
+			"@type": "pattern.meshery.io/core",
+			"version": "1.4.0"
+		}
+	}
+}

templates/oam/workloads/1.4.1/kumamesh.meshery.layer5io.schema.json

@@ -0,0 +1,6 @@
+{
+	"$id": "http://meshery.layer5.io/definition/Workload/KumaMesh",
+	"$schema": "http://json-schema.org/draft-07/schema",
+	"title": "KumaMesh",
+	"type": "object"
+}

templates/oam/workloads/1.4.1/kumamesh_definition.json

@@ -0,0 +1,16 @@
+{
+	"apiVersion": "core.oam.dev/v1alpha1",
+	"kind": "WorkloadDefinition",
+	"metadata": {
+		"name": "KumaMesh"
+	},
+	"spec": {
+		"definitionRef": {
+			"name": "kumamesh.meshery.layer5.io"
+		},
+		"metadata": {
+			"@type": "pattern.meshery.io/core",
+			"version": "1.4.1"
+		}
+	}
+}

templates/oam/workloads/1.5.0/kumamesh.meshery.layer5io.schema.json

@@ -0,0 +1,6 @@
+{
+	"$id": "http://meshery.layer5.io/definition/Workload/KumaMesh",
+	"$schema": "http://json-schema.org/draft-07/schema",
+	"title": "KumaMesh",
+	"type": "object"
+}

templates/oam/workloads/1.5.0/kumamesh_definition.json

@@ -0,0 +1,16 @@
+{
+	"apiVersion": "core.oam.dev/v1alpha1",
+	"kind": "WorkloadDefinition",
+	"metadata": {
+		"name": "KumaMesh"
+	},
+	"spec": {
+		"definitionRef": {
+			"name": "kumamesh.meshery.layer5.io"
+		},
+		"metadata": {
+			"@type": "pattern.meshery.io/core",
+			"version": "1.5.0"
+		}
+	}
+}

templates/oam/workloads/1.5.1/kumamesh.meshery.layer5io.schema.json

@@ -0,0 +1,6 @@
+{
+	"$id": "http://meshery.layer5.io/definition/Workload/KumaMesh",
+	"$schema": "http://json-schema.org/draft-07/schema",
+	"title": "KumaMesh",
+	"type": "object"
+}

templates/oam/workloads/1.5.1/kumamesh_definition.json

@@ -0,0 +1,16 @@
+{
+	"apiVersion": "core.oam.dev/v1alpha1",
+	"kind": "WorkloadDefinition",
+	"metadata": {
+		"name": "KumaMesh"
+	},
+	"spec": {
+		"definitionRef": {
+			"name": "kumamesh.meshery.layer5.io"
+		},
+		"metadata": {
+			"@type": "pattern.meshery.io/core",
+			"version": "1.5.1"
+		}
+	}
+}

templates/oam/workloads/1.6.0/kumamesh.meshery.layer5io.schema.json

@@ -0,0 +1,6 @@
+{
+	"$id": "http://meshery.layer5.io/definition/Workload/KumaMesh",
+	"$schema": "http://json-schema.org/draft-07/schema",
+	"title": "KumaMesh",
+	"type": "object"
+}

templates/oam/workloads/1.6.0/kumamesh_definition.json

@@ -0,0 +1,16 @@
+{
+	"apiVersion": "core.oam.dev/v1alpha1",
+	"kind": "WorkloadDefinition",
+	"metadata": {
+		"name": "KumaMesh"
+	},
+	"spec": {
+		"definitionRef": {
+			"name": "kumamesh.meshery.layer5.io"
+		},
+		"metadata": {
+			"@type": "pattern.meshery.io/core",
+			"version": "1.6.0"
+		}
+	}
+}