From 2b29538ea81f119239ec920e04ba4e282b024705 Mon Sep 17 00:00:00 2001 From: ashish Date: Tue, 31 Aug 2021 20:40:02 +0530 Subject: [PATCH 1/7] added runtime component generation Signed-off-by: ashish --- go.mod | 3 +- go.sum | 4 +-- istio/oam/register.go | 81 +++++++++++++++++++++++++++++++++++++++++++ main.go | 27 +++++++++++++-- 4 files changed, 110 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index aa13f1349..d7d0d76ab 100644 --- a/go.mod +++ b/go.mod @@ -12,8 +12,9 @@ replace ( require ( github.com/aspenmesh/istio-vet v0.0.0-20200806222806-9c8e9a962b9f + github.com/cenkalti/backoff v2.2.1+incompatible github.com/layer5io/meshery-adapter-library v0.1.22 - github.com/layer5io/meshkit v0.2.21 + github.com/layer5io/meshkit v0.2.24 github.com/layer5io/service-mesh-performance v0.3.3 gopkg.in/yaml.v2 v2.4.0 istio.io/client-go v1.8.0 diff --git a/go.sum b/go.sum index 88e37008d..ef6fe01fb 100644 --- a/go.sum +++ b/go.sum @@ -573,8 +573,8 @@ github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3 github.com/layer5io/meshery-adapter-library v0.1.22 h1:eryv812OTx1uacU2tA5q9oBNm1uJswmSWv6kKHaOK1g= github.com/layer5io/meshery-adapter-library v0.1.22/go.mod h1:m8MtMkpF6pRxreZBxz+PqKiHP2msK6o+VIPTfmnlF1I= github.com/layer5io/meshkit v0.2.20/go.mod h1:nkTKAEL9jZ74az1LEd157tSe3o382DxPOCgxqI7gCjk= -github.com/layer5io/meshkit v0.2.21 h1:hUJ/DqXfG7OiZFUfoIzaBi0zmIWyrzAjgZj8z7jyJpY= -github.com/layer5io/meshkit v0.2.21/go.mod h1:blHAWgbcsNJ3rjKr8YvYke8jQILV75vRaARXYwSh0YA= +github.com/layer5io/meshkit v0.2.24 h1:ILWDRmnDPtXyLiNGxn5OTu1iF/XyBDQLgz/Y8paVwsc= +github.com/layer5io/meshkit v0.2.24/go.mod h1:blHAWgbcsNJ3rjKr8YvYke8jQILV75vRaARXYwSh0YA= github.com/layer5io/service-mesh-performance v0.3.2-0.20210122142912-a94e0658b021/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= github.com/layer5io/service-mesh-performance v0.3.2/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= github.com/layer5io/service-mesh-performance v0.3.3 h1:KtouYXg64y+G0soPJwDeB0sM6PXolBpkV6Ke15aqwmk= diff --git a/istio/oam/register.go b/istio/oam/register.go index 1d99bf0d1..e312ec781 100644 --- a/istio/oam/register.go +++ b/istio/oam/register.go @@ -1,13 +1,19 @@ package oam import ( + "bytes" + "encoding/json" "fmt" + "net/http" "os" "path/filepath" "strings" + "time" + "github.com/cenkalti/backoff" "github.com/layer5io/meshery-adapter-library/adapter" "github.com/layer5io/meshery-istio/internal/config" + "github.com/layer5io/meshkit/utils/manifests" ) var ( @@ -117,3 +123,78 @@ func load(basePath string) ([]schemaDefinitionPathSet, error) { return res, nil } + +//RegisterWorkLoadsDynamically ... +func RegisterWorkLoadsDynamically(runtime, host string) error { + release, err := config.GetLatestReleases(1) + if err != nil { + fmt.Println("Could not get latest stable release") + return err + } + v := release[0].TagName + m := manifests.Config{ + Name: "Istio", + MeshVersion: v, + Filter: manifests.CrdFilter{ + RootFilter: []string{"$[?(@.kind==\"CustomResourceDefinition\")]"}, + NameFilter: []string{"$..[\"spec\"][\"names\"][\"kind\"]"}, + VersionFilter: []string{"$..spec.versions[0]", " --o-filter", "$[0]"}, + GroupFilter: []string{"$..spec", " --o-filter", "$[]"}, + SpecFilter: []string{"$..openAPIV3Schema.properties.spec", " --o-filter", "$[]"}, + }, + } + fmt.Println("version ", v) + url := "https://raw.githubusercontent.com/istio/istio/" + v + "/manifests/charts/base/crds/crd-all.gen.yaml" + comp, err := manifests.GetFromManifest(url, manifests.SERVICE_MESH, m) + if err != nil { + return err + } + for i, def := range comp.Definitions { + var ord adapter.OAMRegistrantData + ord.OAMRefSchema = comp.Schemas[i] + + //Marshalling the stringified json + ord.Host = host + definitionMap := map[string]interface{}{} + if err := json.Unmarshal([]byte(def), &definitionMap); err != nil { + return err + } + // To be shifted in meshkit + definitionMap["apiVersion"] = "core.oam.dev/v1alpha1" + definitionMap["kind"] = "WorkloadDefinition" + ord.OAMDefinition = definitionMap + ord.Metadata = map[string]string{ + config.OAMAdapterNameMetadataKey: config.IstioOperation, + } + // send request to the register + backoffOpt := backoff.NewExponentialBackOff() + backoffOpt.MaxElapsedTime = 10 * time.Minute + if err := backoff.Retry(func() error { + contentByt, err := json.Marshal(ord) + if err != nil { + return backoff.Permanent(err) + } + content := bytes.NewReader(contentByt) + // host here is given by the application itself and is trustworthy hence, + // #nosec + resp, err := http.Post(fmt.Sprintf("%s/api/oam/workload", runtime), "application/json", content) + if err != nil { + return err + } + if resp.StatusCode != http.StatusCreated && + resp.StatusCode != http.StatusOK && + resp.StatusCode != http.StatusAccepted { + return fmt.Errorf( + "register process failed, host returned status: %s with status code %d", + resp.Status, + resp.StatusCode, + ) + } + + return nil + }, backoffOpt); err != nil { + return err + } + } + return nil +} diff --git a/main.go b/main.go index 84b349d99..9ba18b88c 100644 --- a/main.go +++ b/main.go @@ -105,8 +105,8 @@ func main() { service.StartedAt = time.Now() service.Version = version service.GitSHA = gitsha - - go registerCapabilities(service.Port, log) + go registerCapabilities(service.Port, log) //Registering static capabilities + go registerDynamicCapabilities(service.Port, log) //Registering latest capabilities periodically // Server Initialization log.Info("Adaptor Listening at port: ", service.Port) @@ -156,3 +156,26 @@ func registerCapabilities(port string, log logger.Handler) { log.Info(err.Error()) } } + +func registerDynamicCapabilities(port string, log logger.Handler) { + registerWorkloads(port, log) + //Start the ticker + const reRegisterAfter = 24 + ticker := time.NewTicker(reRegisterAfter * time.Hour) + for { + select { + case <-ticker.C: + registerWorkloads(port, log) + } + } + +} +func registerWorkloads(port string, log logger.Handler) { + log.Info("Registering latest workload components") + // Register workloads + if err := oam.RegisterWorkLoadsDynamically(mesheryServerAddress(), serviceAddress()+":"+port); err != nil { + log.Info(err.Error()) + return + } + log.Info("Latest workload components successfully registered.") +} From 2624d5216b6cd164d56f527436130216039a3ad8 Mon Sep 17 00:00:00 2001 From: ashish Date: Mon, 6 Sep 2021 12:35:51 +0530 Subject: [PATCH 2/7] moved functions to adapter library Signed-off-by: ashish --- go.mod | 2 +- go.sum | 2 ++ istio/oam/register.go | 81 ------------------------------------------- main.go | 33 +++++++++++++++--- 4 files changed, 31 insertions(+), 87 deletions(-) diff --git a/go.mod b/go.mod index d7d0d76ab..425ceb90b 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ replace ( require ( github.com/aspenmesh/istio-vet v0.0.0-20200806222806-9c8e9a962b9f github.com/cenkalti/backoff v2.2.1+incompatible - github.com/layer5io/meshery-adapter-library v0.1.22 + github.com/layer5io/meshery-adapter-library v0.1.23 github.com/layer5io/meshkit v0.2.24 github.com/layer5io/service-mesh-performance v0.3.3 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index ef6fe01fb..f1bce60ca 100644 --- a/go.sum +++ b/go.sum @@ -572,6 +572,8 @@ github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3 github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3e34/go.mod h1:BQPLwdJt7v7y0fXIejI4whR9zMyX07Wjt5xrbgEmHLw= github.com/layer5io/meshery-adapter-library v0.1.22 h1:eryv812OTx1uacU2tA5q9oBNm1uJswmSWv6kKHaOK1g= github.com/layer5io/meshery-adapter-library v0.1.22/go.mod h1:m8MtMkpF6pRxreZBxz+PqKiHP2msK6o+VIPTfmnlF1I= +github.com/layer5io/meshery-adapter-library v0.1.23 h1:7eGxHJL4Ag6gU2ZBqsYrbBkQBJFv7Tcob8SZ3wgwrNI= +github.com/layer5io/meshery-adapter-library v0.1.23/go.mod h1:SLknhKksSoUtKzG2tvJKkN/DsMnGV+O+etmuj5Qew48= github.com/layer5io/meshkit v0.2.20/go.mod h1:nkTKAEL9jZ74az1LEd157tSe3o382DxPOCgxqI7gCjk= github.com/layer5io/meshkit v0.2.24 h1:ILWDRmnDPtXyLiNGxn5OTu1iF/XyBDQLgz/Y8paVwsc= github.com/layer5io/meshkit v0.2.24/go.mod h1:blHAWgbcsNJ3rjKr8YvYke8jQILV75vRaARXYwSh0YA= diff --git a/istio/oam/register.go b/istio/oam/register.go index e312ec781..1d99bf0d1 100644 --- a/istio/oam/register.go +++ b/istio/oam/register.go @@ -1,19 +1,13 @@ package oam import ( - "bytes" - "encoding/json" "fmt" - "net/http" "os" "path/filepath" "strings" - "time" - "github.com/cenkalti/backoff" "github.com/layer5io/meshery-adapter-library/adapter" "github.com/layer5io/meshery-istio/internal/config" - "github.com/layer5io/meshkit/utils/manifests" ) var ( @@ -123,78 +117,3 @@ func load(basePath string) ([]schemaDefinitionPathSet, error) { return res, nil } - -//RegisterWorkLoadsDynamically ... -func RegisterWorkLoadsDynamically(runtime, host string) error { - release, err := config.GetLatestReleases(1) - if err != nil { - fmt.Println("Could not get latest stable release") - return err - } - v := release[0].TagName - m := manifests.Config{ - Name: "Istio", - MeshVersion: v, - Filter: manifests.CrdFilter{ - RootFilter: []string{"$[?(@.kind==\"CustomResourceDefinition\")]"}, - NameFilter: []string{"$..[\"spec\"][\"names\"][\"kind\"]"}, - VersionFilter: []string{"$..spec.versions[0]", " --o-filter", "$[0]"}, - GroupFilter: []string{"$..spec", " --o-filter", "$[]"}, - SpecFilter: []string{"$..openAPIV3Schema.properties.spec", " --o-filter", "$[]"}, - }, - } - fmt.Println("version ", v) - url := "https://raw.githubusercontent.com/istio/istio/" + v + "/manifests/charts/base/crds/crd-all.gen.yaml" - comp, err := manifests.GetFromManifest(url, manifests.SERVICE_MESH, m) - if err != nil { - return err - } - for i, def := range comp.Definitions { - var ord adapter.OAMRegistrantData - ord.OAMRefSchema = comp.Schemas[i] - - //Marshalling the stringified json - ord.Host = host - definitionMap := map[string]interface{}{} - if err := json.Unmarshal([]byte(def), &definitionMap); err != nil { - return err - } - // To be shifted in meshkit - definitionMap["apiVersion"] = "core.oam.dev/v1alpha1" - definitionMap["kind"] = "WorkloadDefinition" - ord.OAMDefinition = definitionMap - ord.Metadata = map[string]string{ - config.OAMAdapterNameMetadataKey: config.IstioOperation, - } - // send request to the register - backoffOpt := backoff.NewExponentialBackOff() - backoffOpt.MaxElapsedTime = 10 * time.Minute - if err := backoff.Retry(func() error { - contentByt, err := json.Marshal(ord) - if err != nil { - return backoff.Permanent(err) - } - content := bytes.NewReader(contentByt) - // host here is given by the application itself and is trustworthy hence, - // #nosec - resp, err := http.Post(fmt.Sprintf("%s/api/oam/workload", runtime), "application/json", content) - if err != nil { - return err - } - if resp.StatusCode != http.StatusCreated && - resp.StatusCode != http.StatusOK && - resp.StatusCode != http.StatusAccepted { - return fmt.Errorf( - "register process failed, host returned status: %s with status code %d", - resp.Status, - resp.StatusCode, - ) - } - - return nil - }, backoffOpt); err != nil { - return err - } - } - return nil -} diff --git a/main.go b/main.go index 9ba18b88c..e240ed7f3 100644 --- a/main.go +++ b/main.go @@ -22,6 +22,8 @@ import ( "github.com/layer5io/meshery-istio/istio" "github.com/layer5io/meshkit/logger" + "github.com/layer5io/meshkit/utils/manifests" + smp "github.com/layer5io/service-mesh-performance/spec" // "github.com/layer5io/meshkit/tracing" "github.com/layer5io/meshery-adapter-library/adapter" @@ -163,17 +165,38 @@ func registerDynamicCapabilities(port string, log logger.Handler) { const reRegisterAfter = 24 ticker := time.NewTicker(reRegisterAfter * time.Hour) for { - select { - case <-ticker.C: - registerWorkloads(port, log) - } + <-ticker.C + registerWorkloads(port, log) } } func registerWorkloads(port string, log logger.Handler) { log.Info("Registering latest workload components") + release, err := config.GetLatestReleases(1) + if err != nil { + log.Info("Could not get latest stable release") + return + } + version := release[0].TagName + log.Info("version " + version) // Register workloads - if err := oam.RegisterWorkLoadsDynamically(mesheryServerAddress(), serviceAddress()+":"+port); err != nil { + if err := adapter.RegisterWorkLoadsDynamically(mesheryServerAddress(), serviceAddress()+":"+port, &adapter.DynamicComponentsConfig{ + TimeoutInMinutes: 30, + URL: "https://raw.githubusercontent.com/istio/istio/" + version + "/manifests/charts/base/crds/crd-all.gen.yaml", + GenerationMethod: adapter.Manifests, + Config: manifests.Config{ + Name: smp.ServiceMesh_Type_name[int32(smp.ServiceMesh_ISTIO)], + MeshVersion: version, + Filter: manifests.CrdFilter{ + RootFilter: []string{"$[?(@.kind==\"CustomResourceDefinition\")]"}, + NameFilter: []string{"$..[\"spec\"][\"names\"][\"kind\"]"}, + VersionFilter: []string{"$..spec.versions[0]", " --o-filter", "$[0]"}, + GroupFilter: []string{"$..spec", " --o-filter", "$[]"}, + SpecFilter: []string{"$..openAPIV3Schema.properties.spec", " --o-filter", "$[]"}, + }, + }, + Operation: config.IstioOperation, + }); err != nil { log.Info(err.Error()) return } From 162b000a8a4bf56830706d4bef5f71b24cadce18 Mon Sep 17 00:00:00 2001 From: ashish Date: Mon, 6 Sep 2021 14:45:37 +0530 Subject: [PATCH 3/7] changed Signed-off-by: ashish --- go.mod | 1 - go.sum | 3 --- 2 files changed, 4 deletions(-) diff --git a/go.mod b/go.mod index 425ceb90b..b10da5874 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,6 @@ replace ( require ( github.com/aspenmesh/istio-vet v0.0.0-20200806222806-9c8e9a962b9f - github.com/cenkalti/backoff v2.2.1+incompatible github.com/layer5io/meshery-adapter-library v0.1.23 github.com/layer5io/meshkit v0.2.24 github.com/layer5io/service-mesh-performance v0.3.3 diff --git a/go.sum b/go.sum index f1bce60ca..5cf6c196b 100644 --- a/go.sum +++ b/go.sum @@ -570,11 +570,8 @@ github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6Fm github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334/go.mod h1:UmrVd7x+bNVKrpmKgTtfRiTKHZeNPcMjQproJ0vGwhE= github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3e34 h1:QaViadDOBCMDUwYx78kfRvHMkzRVnh/GOhm3s2gxoP4= github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3e34/go.mod h1:BQPLwdJt7v7y0fXIejI4whR9zMyX07Wjt5xrbgEmHLw= -github.com/layer5io/meshery-adapter-library v0.1.22 h1:eryv812OTx1uacU2tA5q9oBNm1uJswmSWv6kKHaOK1g= -github.com/layer5io/meshery-adapter-library v0.1.22/go.mod h1:m8MtMkpF6pRxreZBxz+PqKiHP2msK6o+VIPTfmnlF1I= github.com/layer5io/meshery-adapter-library v0.1.23 h1:7eGxHJL4Ag6gU2ZBqsYrbBkQBJFv7Tcob8SZ3wgwrNI= github.com/layer5io/meshery-adapter-library v0.1.23/go.mod h1:SLknhKksSoUtKzG2tvJKkN/DsMnGV+O+etmuj5Qew48= -github.com/layer5io/meshkit v0.2.20/go.mod h1:nkTKAEL9jZ74az1LEd157tSe3o382DxPOCgxqI7gCjk= github.com/layer5io/meshkit v0.2.24 h1:ILWDRmnDPtXyLiNGxn5OTu1iF/XyBDQLgz/Y8paVwsc= github.com/layer5io/meshkit v0.2.24/go.mod h1:blHAWgbcsNJ3rjKr8YvYke8jQILV75vRaARXYwSh0YA= github.com/layer5io/service-mesh-performance v0.3.2-0.20210122142912-a94e0658b021/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= From 923079d366ab541f4e65c986578f51a998d81ea6 Mon Sep 17 00:00:00 2001 From: ashish Date: Tue, 7 Sep 2021 14:15:29 +0530 Subject: [PATCH 4/7] retriggering workflow Signed-off-by: ashish --- main.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main.go b/main.go index e240ed7f3..16f4b6a44 100644 --- a/main.go +++ b/main.go @@ -171,14 +171,13 @@ func registerDynamicCapabilities(port string, log logger.Handler) { } func registerWorkloads(port string, log logger.Handler) { - log.Info("Registering latest workload components") release, err := config.GetLatestReleases(1) if err != nil { log.Info("Could not get latest stable release") return } version := release[0].TagName - log.Info("version " + version) + log.Info("Registering latest workload components for version ", version) // Register workloads if err := adapter.RegisterWorkLoadsDynamically(mesheryServerAddress(), serviceAddress()+":"+port, &adapter.DynamicComponentsConfig{ TimeoutInMinutes: 30, From f7b3236038b0b099e6712ed7a5fee40b651e1023 Mon Sep 17 00:00:00 2001 From: ashish Date: Mon, 27 Sep 2021 00:57:12 +0530 Subject: [PATCH 5/7] changed filters and fixed bugs Signed-off-by: ashish --- go.mod | 2 +- go.sum | 2 ++ main.go | 10 +++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index b10da5874..46c6e5c5c 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ replace ( require ( github.com/aspenmesh/istio-vet v0.0.0-20200806222806-9c8e9a962b9f github.com/layer5io/meshery-adapter-library v0.1.23 - github.com/layer5io/meshkit v0.2.24 + github.com/layer5io/meshkit v0.2.28 github.com/layer5io/service-mesh-performance v0.3.3 gopkg.in/yaml.v2 v2.4.0 istio.io/client-go v1.8.0 diff --git a/go.sum b/go.sum index 5cf6c196b..cc801a58d 100644 --- a/go.sum +++ b/go.sum @@ -574,6 +574,8 @@ github.com/layer5io/meshery-adapter-library v0.1.23 h1:7eGxHJL4Ag6gU2ZBqsYrbBkQB github.com/layer5io/meshery-adapter-library v0.1.23/go.mod h1:SLknhKksSoUtKzG2tvJKkN/DsMnGV+O+etmuj5Qew48= github.com/layer5io/meshkit v0.2.24 h1:ILWDRmnDPtXyLiNGxn5OTu1iF/XyBDQLgz/Y8paVwsc= github.com/layer5io/meshkit v0.2.24/go.mod h1:blHAWgbcsNJ3rjKr8YvYke8jQILV75vRaARXYwSh0YA= +github.com/layer5io/meshkit v0.2.28 h1:ZAMMRVuK2f2v+URlfgiy+uMPp99O7ygK/lrdK8GN3cc= +github.com/layer5io/meshkit v0.2.28/go.mod h1:blHAWgbcsNJ3rjKr8YvYke8jQILV75vRaARXYwSh0YA= github.com/layer5io/service-mesh-performance v0.3.2-0.20210122142912-a94e0658b021/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= github.com/layer5io/service-mesh-performance v0.3.2/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= github.com/layer5io/service-mesh-performance v0.3.3 h1:KtouYXg64y+G0soPJwDeB0sM6PXolBpkV6Ke15aqwmk= diff --git a/main.go b/main.go index 16f4b6a44..0e063d1b9 100644 --- a/main.go +++ b/main.go @@ -189,9 +189,13 @@ func registerWorkloads(port string, log logger.Handler) { Filter: manifests.CrdFilter{ RootFilter: []string{"$[?(@.kind==\"CustomResourceDefinition\")]"}, NameFilter: []string{"$..[\"spec\"][\"names\"][\"kind\"]"}, - VersionFilter: []string{"$..spec.versions[0]", " --o-filter", "$[0]"}, - GroupFilter: []string{"$..spec", " --o-filter", "$[]"}, - SpecFilter: []string{"$..openAPIV3Schema.properties.spec", " --o-filter", "$[]"}, + VersionFilter: []string{"$[0]..spec.versions[0]"}, + GroupFilter: []string{"$[0]..spec"}, + SpecFilter: []string{"$[0]..openAPIV3Schema.properties.spec"}, + ItrFilter: "$[?(@.spec.names.kind", + ItrSpecFilter: "$[?(@.spec.names.kind", + VField: "name", + GField: "group", }, }, Operation: config.IstioOperation, From 1f793c903151d64290f8a977e8444a4576324e02 Mon Sep 17 00:00:00 2001 From: ashish Date: Thu, 30 Sep 2021 03:59:06 +0530 Subject: [PATCH 6/7] upgraded meshkit version Signed-off-by: ashish --- go.mod | 2 +- go.sum | 2 ++ main.go | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 46c6e5c5c..82a6098be 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ replace ( require ( github.com/aspenmesh/istio-vet v0.0.0-20200806222806-9c8e9a962b9f github.com/layer5io/meshery-adapter-library v0.1.23 - github.com/layer5io/meshkit v0.2.28 + github.com/layer5io/meshkit v0.2.29 github.com/layer5io/service-mesh-performance v0.3.3 gopkg.in/yaml.v2 v2.4.0 istio.io/client-go v1.8.0 diff --git a/go.sum b/go.sum index cc801a58d..572851124 100644 --- a/go.sum +++ b/go.sum @@ -576,6 +576,8 @@ github.com/layer5io/meshkit v0.2.24 h1:ILWDRmnDPtXyLiNGxn5OTu1iF/XyBDQLgz/Y8paVw github.com/layer5io/meshkit v0.2.24/go.mod h1:blHAWgbcsNJ3rjKr8YvYke8jQILV75vRaARXYwSh0YA= github.com/layer5io/meshkit v0.2.28 h1:ZAMMRVuK2f2v+URlfgiy+uMPp99O7ygK/lrdK8GN3cc= github.com/layer5io/meshkit v0.2.28/go.mod h1:blHAWgbcsNJ3rjKr8YvYke8jQILV75vRaARXYwSh0YA= +github.com/layer5io/meshkit v0.2.29 h1:Sdp40Jmwq78i3NAaQb6+pkaaiBTfRD+oQhOz91SAxlc= +github.com/layer5io/meshkit v0.2.29/go.mod h1:blHAWgbcsNJ3rjKr8YvYke8jQILV75vRaARXYwSh0YA= github.com/layer5io/service-mesh-performance v0.3.2-0.20210122142912-a94e0658b021/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= github.com/layer5io/service-mesh-performance v0.3.2/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= github.com/layer5io/service-mesh-performance v0.3.3 h1:KtouYXg64y+G0soPJwDeB0sM6PXolBpkV6Ke15aqwmk= diff --git a/main.go b/main.go index 0e063d1b9..0ddde5148 100644 --- a/main.go +++ b/main.go @@ -192,8 +192,8 @@ func registerWorkloads(port string, log logger.Handler) { VersionFilter: []string{"$[0]..spec.versions[0]"}, GroupFilter: []string{"$[0]..spec"}, SpecFilter: []string{"$[0]..openAPIV3Schema.properties.spec"}, - ItrFilter: "$[?(@.spec.names.kind", - ItrSpecFilter: "$[?(@.spec.names.kind", + ItrFilter: []string{"$[?(@.spec.names.kind"}, + ItrSpecFilter: []string{"$[?(@.spec.names.kind"}, VField: "name", GField: "group", }, From 0c79c7e9879e13b42685db23375980d7eb51c330 Mon Sep 17 00:00:00 2001 From: ashish Date: Thu, 30 Sep 2021 04:04:36 +0530 Subject: [PATCH 7/7] upgraded adapter library version Signed-off-by: ashish --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 82a6098be..59c7196a7 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ replace ( require ( github.com/aspenmesh/istio-vet v0.0.0-20200806222806-9c8e9a962b9f - github.com/layer5io/meshery-adapter-library v0.1.23 + github.com/layer5io/meshery-adapter-library v0.1.24 github.com/layer5io/meshkit v0.2.29 github.com/layer5io/service-mesh-performance v0.3.3 gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index 572851124..950d27de0 100644 --- a/go.sum +++ b/go.sum @@ -572,6 +572,8 @@ github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3 github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3e34/go.mod h1:BQPLwdJt7v7y0fXIejI4whR9zMyX07Wjt5xrbgEmHLw= github.com/layer5io/meshery-adapter-library v0.1.23 h1:7eGxHJL4Ag6gU2ZBqsYrbBkQBJFv7Tcob8SZ3wgwrNI= github.com/layer5io/meshery-adapter-library v0.1.23/go.mod h1:SLknhKksSoUtKzG2tvJKkN/DsMnGV+O+etmuj5Qew48= +github.com/layer5io/meshery-adapter-library v0.1.24 h1:3U5oIZCyfPCqVeorTUqZnOhnwcdA/gUHtsDVShhpzaU= +github.com/layer5io/meshery-adapter-library v0.1.24/go.mod h1:SLknhKksSoUtKzG2tvJKkN/DsMnGV+O+etmuj5Qew48= github.com/layer5io/meshkit v0.2.24 h1:ILWDRmnDPtXyLiNGxn5OTu1iF/XyBDQLgz/Y8paVwsc= github.com/layer5io/meshkit v0.2.24/go.mod h1:blHAWgbcsNJ3rjKr8YvYke8jQILV75vRaARXYwSh0YA= github.com/layer5io/meshkit v0.2.28 h1:ZAMMRVuK2f2v+URlfgiy+uMPp99O7ygK/lrdK8GN3cc=