From 32af4d0bfeaf75bd19865550d48db22b6226e0d9 Mon Sep 17 00:00:00 2001 From: dhruv0000 Date: Thu, 28 Jan 2021 04:37:03 +0530 Subject: [PATCH 01/13] Added type param Signed-off-by: dhruv0000 --- go.mod | 8 ++++--- go.sum | 49 +++++++++++++++++++++++++++++++++++---- internal/config/config.go | 2 ++ traefik/traefik.go | 3 --- 4 files changed, 51 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index a7142a8..7a8e0b2 100644 --- a/go.mod +++ b/go.mod @@ -2,10 +2,12 @@ module github.com/layer5io/meshery-traefik-mesh go 1.15 -replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334 +replace ( + github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f require ( - github.com/layer5io/meshery-adapter-library v0.1.11 - github.com/layer5io/meshkit v0.1.32 + github.com/layer5io/meshery-adapter-library master + github.com/layer5io/meshkit v0.2.1-0.20210127211805-88e99ca45457 + github.com/layer5io/service-mesh-performance v0.3.2 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index c7c28c4..c610aac 100644 --- a/go.sum +++ b/go.sum @@ -176,6 +176,7 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -247,6 +248,8 @@ github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVB github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7 h1:LofdAjjjqCSXMwLGgOgnE+rdPuvX9DxCqaHwKy7i/ko= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -412,6 +415,8 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= @@ -541,20 +546,25 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kumarabd/gokit v0.2.0/go.mod h1:PdII4jWKPVYICrdF/qU6B4GiRmV51uLVWH7npYnHBlo= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= -github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334/go.mod h1:UmrVd7x+bNVKrpmKgTtfRiTKHZeNPcMjQproJ0vGwhE= +github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f/go.mod h1:UmrVd7x+bNVKrpmKgTtfRiTKHZeNPcMjQproJ0vGwhE= github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20201022191033-40468652a54f h1:ZwVdDIb9RRXCRfRNUGOgwcyn5WrjfJi7NV64SwQ0Gvo= github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20201022191033-40468652a54f/go.mod h1:LpewBZnN0QDRcC2fDiBVK+iByfFyf2HJM1B2h0rTMZo= -github.com/layer5io/meshery-adapter-library v0.1.11 h1:ZUSI6Jf3XxXj4uy+csKa7hdrd1hdKoxMkzWNPa+qxs4= -github.com/layer5io/meshery-adapter-library v0.1.11/go.mod h1:AFTJZboGpCVCgG928sIA+hjdmkA5j+2oAEU7vje2A6k= +github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210125055931-43e1dc9563c4 h1:5DrvqMrZhaRjzHOyijzSDYHJgEoIXWNQjAZD9vR5iDY= +github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210125055931-43e1dc9563c4/go.mod h1:BQPLwdJt7v7y0fXIejI4whR9zMyX07Wjt5xrbgEmHLw= github.com/layer5io/meshkit v0.1.30 h1:d9emBQAf+YnURkA5wZ6VbbqDfnx9G8G3xqOv6dG4n/k= github.com/layer5io/meshkit v0.1.30/go.mod h1:AznOL6xqpUZGyExSZJ3Bdx6EZ22UnAT9V620pm7R484= -github.com/layer5io/meshkit v0.1.32 h1:en4T3bo/BVtO/CsPbWx/1bgObCKtRHa+0tZtoxOWISw= -github.com/layer5io/meshkit v0.1.32/go.mod h1:IkAIh0mwGkd52xLQ6vhpJuip+XUkrImnWnGJ08Lox7Q= +github.com/layer5io/meshkit v0.2.1-0.20210127211805-88e99ca45457 h1:At+QhZMMkRt4w+5FQRZvEqeIkcpuYv5NjoqgmohI62Q= +github.com/layer5io/meshkit v0.2.1-0.20210127211805-88e99ca45457/go.mod h1:j/uAg0oBG/g9QFInCH4xrrO2YO/KKqnB79Ty1r6gaKs= +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 h1:bkzKFlgIMtiszq6dIKf5Sjy2Yx2VTFVd5oxuYv5Shcs= +github.com/layer5io/service-mesh-performance v0.3.2/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.7.0 h1:h93mCPfUSkaul3Ka/VG8uZdmW1uMHDGxzu0NWHuJmHY= @@ -587,6 +597,8 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-oci8 v0.0.7/go.mod h1:wjDx6Xm9q7dFtHJvIlrI99JytznLw5wQ4R+9mNXJwGI= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= @@ -639,6 +651,10 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -651,11 +667,18 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.1 h1:jMU0WaQrP0a/YAEq8eJmJKjBoMs+pClEr1vDMlM/Do4= +github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34= github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.2 h1:aY/nuoWlKJud2J6U0E3NWsjlg+0GtwXxgEqthRdzlcs= +github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -762,6 +785,8 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= @@ -965,10 +990,13 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1015,15 +1043,19 @@ golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1034,10 +1066,13 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642 h1:B6caxRw+hozq68X2MY7jEpZh/cr4/aHLv9xU8Kkadrw= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM= +golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1113,6 +1148,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= @@ -1213,6 +1250,8 @@ gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= diff --git a/internal/config/config.go b/internal/config/config.go index 4507177..777ceb4 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -8,6 +8,7 @@ import ( configprovider "github.com/layer5io/meshery-adapter-library/config/provider" "github.com/layer5io/meshery-adapter-library/status" "github.com/layer5io/meshkit/utils" + smp "github.com/layer5io/service-mesh-performance/spec" ) const ( @@ -40,6 +41,7 @@ var ( "status": status.None, "traceurl": status.None, "version": status.None, + "type": smp.ServiceMesh_MAESH.Enum().String(), } // ProviderConfig is the config for the configuration provider diff --git a/traefik/traefik.go b/traefik/traefik.go index 994a485..ea6d3ea 100644 --- a/traefik/traefik.go +++ b/traefik/traefik.go @@ -106,9 +106,6 @@ func (mesh *Mesh) ApplyOperation(ctx context.Context, opReq adapter.OperationReq hh.StreamErr(e, err) return } - ee.Summary = fmt.Sprintf("%s test %s successfully", name, status.Completed) - ee.Details = "" - hh.StreamInfo(e) }(mesh, e) default: mesh.StreamErr(e, ErrOpInvalid) From 9f4846d6f56847416f5db3b515a54db0ec6edbb2 Mon Sep 17 00:00:00 2001 From: dhruv0000 Date: Tue, 2 Feb 2021 06:01:40 +0530 Subject: [PATCH 02/13] Updated go.mod and added type in MeshSpec Signed-off-by: dhruv0000 --- go.mod | 7 ++--- go.sum | 62 ++++----------------------------------- internal/config/config.go | 2 +- 3 files changed, 9 insertions(+), 62 deletions(-) diff --git a/go.mod b/go.mod index 7a8e0b2..8e240e2 100644 --- a/go.mod +++ b/go.mod @@ -2,12 +2,11 @@ module github.com/layer5io/meshery-traefik-mesh go 1.15 -replace ( - github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f +replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f require ( - github.com/layer5io/meshery-adapter-library master + github.com/layer5io/meshery-adapter-library v0.1.12-0.20210127214045-50f4c3bbd783 github.com/layer5io/meshkit v0.2.1-0.20210127211805-88e99ca45457 - github.com/layer5io/service-mesh-performance v0.3.2 + 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 c610aac..dad5070 100644 --- a/go.sum +++ b/go.sum @@ -105,7 +105,6 @@ github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:o github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.29.15/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -243,7 +242,6 @@ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZM github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= @@ -320,44 +318,20 @@ github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+ github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= -github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= -github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= -github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8= github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w= -github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= -github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= github.com/gobuffalo/flect v0.2.0/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= -github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= -github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= -github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= -github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk= -github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= -github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360= -github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg= -github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE= -github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= github.com/gobuffalo/logger v1.0.1 h1:ZEgyRGgAm4ZAhAO45YXMs5Fp+bzGLESFewzAVBMKuTg= github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs= -github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4= github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q= -github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= -github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= github.com/gobuffalo/packr/v2 v2.7.1 h1:n3CIW5T17T8v4GGK5sWXLVWJhCz7b5aNLSxW6gYim4o= github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc= -github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= @@ -400,7 +374,6 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= @@ -528,12 +501,9 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= -github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= @@ -548,23 +518,22 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kumarabd/gokit v0.2.0/go.mod h1:PdII4jWKPVYICrdF/qU6B4GiRmV51uLVWH7npYnHBlo= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f/go.mod h1:UmrVd7x+bNVKrpmKgTtfRiTKHZeNPcMjQproJ0vGwhE= -github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20201022191033-40468652a54f h1:ZwVdDIb9RRXCRfRNUGOgwcyn5WrjfJi7NV64SwQ0Gvo= -github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20201022191033-40468652a54f/go.mod h1:LpewBZnN0QDRcC2fDiBVK+iByfFyf2HJM1B2h0rTMZo= github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210125055931-43e1dc9563c4 h1:5DrvqMrZhaRjzHOyijzSDYHJgEoIXWNQjAZD9vR5iDY= github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210125055931-43e1dc9563c4/go.mod h1:BQPLwdJt7v7y0fXIejI4whR9zMyX07Wjt5xrbgEmHLw= -github.com/layer5io/meshkit v0.1.30 h1:d9emBQAf+YnURkA5wZ6VbbqDfnx9G8G3xqOv6dG4n/k= -github.com/layer5io/meshkit v0.1.30/go.mod h1:AznOL6xqpUZGyExSZJ3Bdx6EZ22UnAT9V620pm7R484= +github.com/layer5io/meshery-adapter-library v0.1.12-0.20210127214045-50f4c3bbd783 h1:FacmiXIWbrxpcjW9UVzdMKUaDrpiLiEBR2PORzH5Nqw= +github.com/layer5io/meshery-adapter-library v0.1.12-0.20210127214045-50f4c3bbd783/go.mod h1:OsH6mXuHOH1ONhDQOwa83sNTGgoMxwjAo8OoKvKZrDY= github.com/layer5io/meshkit v0.2.1-0.20210127211805-88e99ca45457 h1:At+QhZMMkRt4w+5FQRZvEqeIkcpuYv5NjoqgmohI62Q= github.com/layer5io/meshkit v0.2.1-0.20210127211805-88e99ca45457/go.mod h1:j/uAg0oBG/g9QFInCH4xrrO2YO/KKqnB79Ty1r6gaKs= 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 h1:bkzKFlgIMtiszq6dIKf5Sjy2Yx2VTFVd5oxuYv5Shcs= 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= +github.com/layer5io/service-mesh-performance v0.3.3/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.7.0 h1:h93mCPfUSkaul3Ka/VG8uZdmW1uMHDGxzu0NWHuJmHY= @@ -585,8 +554,6 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= -github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= @@ -636,7 +603,6 @@ github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lN github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= @@ -705,7 +671,6 @@ github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIw github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= github.com/pelletier/go-toml v1.6.0 h1:aetoXYr0Tv7xRU/V4B4IZJ2QcbtMUFoNb3ORp7TzIK4= github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= @@ -762,7 +727,6 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.4.0 h1:LUa41nrWTQNGhzdsZ5lTnkwbNjj6rXTdazA1cSdjkOY= @@ -780,7 +744,6 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= @@ -844,8 +807,6 @@ github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= -github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= @@ -873,7 +834,6 @@ go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mI go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mongodb.org/mongo-driver v1.4.0/go.mod h1:llVBH2pkj9HywK0Dtdt6lDikOjFLbceHVu/Rc0iMKLs= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -906,9 +866,7 @@ golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -1007,7 +965,6 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1028,15 +985,12 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1068,7 +1022,6 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642 h1:B6caxRw+hozq68X2MY7jEpZh/cr4/aHLv9xU8Kkadrw= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM= @@ -1098,13 +1051,9 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -1191,7 +1140,6 @@ google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dT google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= diff --git a/internal/config/config.go b/internal/config/config.go index 777ceb4..2dafe1f 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -41,7 +41,7 @@ var ( "status": status.None, "traceurl": status.None, "version": status.None, - "type": smp.ServiceMesh_MAESH.Enum().String(), + "type": smp.ServiceMesh_TRAEFIK_MESH.Enum().String(), } // ProviderConfig is the config for the configuration provider From 7c3f99e979fa316d7eb5f2a4d34bcdc64f65c88a Mon Sep 17 00:00:00 2001 From: dhruv0000 Date: Thu, 18 Mar 2021 22:22:13 +0530 Subject: [PATCH 03/13] Updated Meshkit and meshery-adapter-library in go.mod Signed-off-by: dhruv0000 --- go.mod | 4 ++-- go.sum | 45 +++++++++++++++--------------------------- traefik/install.go | 5 +---- traefik/sample-apps.go | 7 ++----- 4 files changed, 21 insertions(+), 40 deletions(-) diff --git a/go.mod b/go.mod index 8e240e2..ed466eb 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.15 replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f require ( - github.com/layer5io/meshery-adapter-library v0.1.12-0.20210127214045-50f4c3bbd783 - github.com/layer5io/meshkit v0.2.1-0.20210127211805-88e99ca45457 + github.com/layer5io/meshery-adapter-library v0.1.13-0.20210318083724-41864a8ad719 + github.com/layer5io/meshkit v0.2.6 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 dad5070..dea60fd 100644 --- a/go.sum +++ b/go.sum @@ -142,6 +142,7 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f h1:tSNMc+rJDfmYntojat8lljbt1mgKNpTxUZJsSzJ9Y1s= @@ -231,6 +232,7 @@ github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4s github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -244,7 +246,6 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -261,11 +262,9 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2 github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.10.0 h1:dXFJfIHVvUcpSgDOV+Ne6t7jXri8Tfv2uOLHUZ2XNuo= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= @@ -318,9 +317,9 @@ github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+ github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8= @@ -386,7 +385,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -406,8 +404,9 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= @@ -466,7 +465,6 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= @@ -482,6 +480,7 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E= github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -506,7 +505,6 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -514,7 +512,6 @@ github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= @@ -523,14 +520,13 @@ github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtB github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f/go.mod h1:UmrVd7x+bNVKrpmKgTtfRiTKHZeNPcMjQproJ0vGwhE= -github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210125055931-43e1dc9563c4 h1:5DrvqMrZhaRjzHOyijzSDYHJgEoIXWNQjAZD9vR5iDY= -github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210125055931-43e1dc9563c4/go.mod h1:BQPLwdJt7v7y0fXIejI4whR9zMyX07Wjt5xrbgEmHLw= -github.com/layer5io/meshery-adapter-library v0.1.12-0.20210127214045-50f4c3bbd783 h1:FacmiXIWbrxpcjW9UVzdMKUaDrpiLiEBR2PORzH5Nqw= -github.com/layer5io/meshery-adapter-library v0.1.12-0.20210127214045-50f4c3bbd783/go.mod h1:OsH6mXuHOH1ONhDQOwa83sNTGgoMxwjAo8OoKvKZrDY= -github.com/layer5io/meshkit v0.2.1-0.20210127211805-88e99ca45457 h1:At+QhZMMkRt4w+5FQRZvEqeIkcpuYv5NjoqgmohI62Q= -github.com/layer5io/meshkit v0.2.1-0.20210127211805-88e99ca45457/go.mod h1:j/uAg0oBG/g9QFInCH4xrrO2YO/KKqnB79Ty1r6gaKs= +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.13-0.20210318083724-41864a8ad719 h1:vERJC33y4daxkIH/y/ITp5G/Wzim0f5BKWtao6dDybE= +github.com/layer5io/meshery-adapter-library v0.1.13-0.20210318083724-41864a8ad719/go.mod h1:cJ34wNJcYT0Go7DNpmZo+Qmf8Sm4eGZjVM9HY5bMsMs= +github.com/layer5io/meshkit v0.2.6 h1:PsWl5qyz9OHDuOv87DitG00Sphiu0Sg8vHmIZvprtn4= +github.com/layer5io/meshkit v0.2.6/go.mod h1:QvEKV8wIEOabiFlUgiu+s78GpJTsRpoRw5pgvEX077Y= 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 h1:bkzKFlgIMtiszq6dIKf5Sjy2Yx2VTFVd5oxuYv5Shcs= 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= github.com/layer5io/service-mesh-performance v0.3.3/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ= @@ -562,7 +558,6 @@ github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= @@ -572,7 +567,6 @@ github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v1.12.0 h1:u/x3mp++qUxvYfulZ4HKOvVO0JWhk7HtE8lWhbGz/Do= github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.5 h1:1IdxlwTNazvbKJQSxoJ5/9ECbEeaTTyeU7sEAZ5KKTQ= github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= @@ -631,7 +625,6 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.1 h1:jMU0WaQrP0a/YAEq8eJmJKjBoMs+pClEr1vDMlM/Do4= @@ -640,7 +633,6 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34= github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.2 h1:aY/nuoWlKJud2J6U0E3NWsjlg+0GtwXxgEqthRdzlcs= @@ -746,7 +738,6 @@ github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvH github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -951,7 +942,6 @@ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -1022,7 +1012,6 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642 h1:B6caxRw+hozq68X2MY7jEpZh/cr4/aHLv9xU8Kkadrw= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM= golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1095,7 +1084,6 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1178,8 +1166,9 @@ google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1196,13 +1185,11 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= @@ -1225,7 +1212,6 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= @@ -1235,6 +1221,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/sqlite v1.1.4/go.mod h1:mJCeTFr7+crvS+TRnWc5Z3UvwxUN1BGBLMrf5LA9DYw= gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +gorm.io/gorm v1.20.10 h1:oJDuZyiUVVH1t20aRv439xIhmx5HFqv3iDxwAZ5sBb0= gorm.io/gorm v1.20.10/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= diff --git a/traefik/install.go b/traefik/install.go index d146cc1..4d26298 100644 --- a/traefik/install.go +++ b/traefik/install.go @@ -59,10 +59,7 @@ func (mesh *Mesh) installTraefikMesh(del bool, version, namespace string) (strin } func (mesh *Mesh) applyHelmChart(del bool, version, namespace string) error { - kClient, err := mesherykube.New(mesh.KubeClient, mesh.RestConfig) - if err != nil { - return err - } + kClient := mesh.MesheryKubeclient repo := "https://helm.traefik.io/mesh" chart := "traefik-mesh" diff --git a/traefik/sample-apps.go b/traefik/sample-apps.go index dddd83c..c935b44 100644 --- a/traefik/sample-apps.go +++ b/traefik/sample-apps.go @@ -30,12 +30,9 @@ func (mesh *Mesh) installSampleApp(namespace string, del bool, templates []adapt } func (mesh *Mesh) applyManifest(contents []byte, isDel bool, namespace string) error { - kclient, err := mesherykube.New(mesh.KubeClient, mesh.RestConfig) - if err != nil { - return err - } + kclient := mesh.MesheryKubeclient - err = kclient.ApplyManifest(contents, mesherykube.ApplyOptions{ + err := kclient.ApplyManifest(contents, mesherykube.ApplyOptions{ Namespace: namespace, Update: true, Delete: isDel, From ae0badab77feb346d965ba2643bf4673dc82e85d Mon Sep 17 00:00:00 2001 From: dhruv0000 Date: Thu, 25 Mar 2021 17:52:00 +0530 Subject: [PATCH 04/13] CI fix Signed-off-by: dhruv0000 --- .github/workflows/ci.yml | 4 ++-- traefik/traefik.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7cf215..b771b1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: uses: actions/setup-go@v1 with: go-version: ${{ secrets.GO_VERSION }} - - run: GOPROXY=direct GOSUMDB=off go get -u golang.org/x/lint/golint; go list ./nginx/... | grep -v /vendor/ | xargs -L1 /home/runner/go/bin/golint -set_exit_status + - run: GOPROXY=direct GOSUMDB=off go get -u golang.org/x/lint/golint; go list ./traefik/... | grep -v /vendor/ | xargs -L1 /home/runner/go/bin/golint -set_exit_status error_check: name: Error check runs-on: ubuntu-latest @@ -47,7 +47,7 @@ jobs: uses: actions/setup-go@v1 with: go-version: ${{ secrets.GO_VERSION }} - - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go get -u honnef.co/go/tools/cmd/staticcheck; /home/runner/go/bin/staticcheck -tags draft -checks all ./nginx/... # https://staticcheck.io/docs/checks + - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go get -u honnef.co/go/tools/cmd/staticcheck; /home/runner/go/bin/staticcheck -tags draft -checks all ./traefik/... # https://staticcheck.io/docs/checks vet: name: Vet runs-on: ubuntu-latest diff --git a/traefik/traefik.go b/traefik/traefik.go index ea6d3ea..be3447e 100644 --- a/traefik/traefik.go +++ b/traefik/traefik.go @@ -1,3 +1,4 @@ +// Package traefik - Common operations for the adapter package traefik import ( From 762887fcc1dcbc0c9628c861374e0a652d6ac89b Mon Sep 17 00:00:00 2001 From: Dinesh Date: Sat, 27 Mar 2021 10:37:47 +0530 Subject: [PATCH 05/13] added layer5 logo --- img/readme/layer5-tag-community-dark-bg.png | Bin 0 -> 18676 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 img/readme/layer5-tag-community-dark-bg.png diff --git a/img/readme/layer5-tag-community-dark-bg.png b/img/readme/layer5-tag-community-dark-bg.png new file mode 100644 index 0000000000000000000000000000000000000000..773961d454e40b794cf1bfe723f0ed9cebffd71f GIT binary patch literal 18676 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 literal 0 HcmV?d00001 From 713245183ee4786e3271bd31b10e1cb6d63228d7 Mon Sep 17 00:00:00 2001 From: DineshKoushik <54497410+DineshKoushik@users.noreply.github.com> Date: Sat, 27 Mar 2021 10:44:30 +0530 Subject: [PATCH 06/13] Updated README.md Signed-off-by: Dinesh --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 959286a..f80cc96 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -



+



# Meshery Adapter for Traefik Mesh From 5ad2702dbc8d8003f05c138e7adca5b72f3a8800 Mon Sep 17 00:00:00 2001 From: Dinesh Date: Sat, 27 Mar 2021 10:53:22 +0530 Subject: [PATCH 07/13] removed logo Signed-off-by: Dinesh --- img/readme/layer5-tag-community-dark-bg.png | Bin 18676 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 img/readme/layer5-tag-community-dark-bg.png diff --git a/img/readme/layer5-tag-community-dark-bg.png b/img/readme/layer5-tag-community-dark-bg.png deleted file mode 100644 index 773961d454e40b794cf1bfe723f0ed9cebffd71f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18676 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 From 9c5726f8fceede5f0c1c863313465869f08e7c7a Mon Sep 17 00:00:00 2001 From: Lee Calcote Date: Fri, 2 Apr 2021 17:24:51 -0500 Subject: [PATCH 08/13] Update release-drafter.yml --- .github/release-drafter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 37cc2df..9c69dcf 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,4 +1,4 @@ -name-template: "v$NEXT_PATCH_VERSION" +name-template: "Meshery Adapter for Traefik Mesh v$NEXT_PATCH_VERSION" tag-template: "v$NEXT_PATCH_VERSION" categories: - title: "🚀 Features" From 3e11f9303245543a21ce019652fa56843eccd8aa Mon Sep 17 00:00:00 2001 From: kumarabd Date: Fri, 9 Apr 2021 21:09:31 +0530 Subject: [PATCH 09/13] cleanup changes Signed-off-by: kumarabd --- go.mod | 10 ++++-- go.sum | 71 +++++---------------------------------- internal/config/config.go | 15 ++++----- main.go | 4 +++ traefik/sample-apps.go | 8 +---- traefik/traefik.go | 3 ++ 6 files changed, 30 insertions(+), 81 deletions(-) diff --git a/go.mod b/go.mod index ed466eb..99cbe4d 100644 --- a/go.mod +++ b/go.mod @@ -2,11 +2,15 @@ module github.com/layer5io/meshery-traefik-mesh go 1.15 -replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f +replace ( + github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible + github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f + golang.org/x/sys => golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6 +) require ( - github.com/layer5io/meshery-adapter-library v0.1.13-0.20210318083724-41864a8ad719 - github.com/layer5io/meshkit v0.2.6 + github.com/layer5io/meshery-adapter-library v0.1.14 + github.com/layer5io/meshkit v0.2.7 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 dea60fd..aa97fb1 100644 --- a/go.sum +++ b/go.sum @@ -197,10 +197,6 @@ github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod h1:JLrzqnKDaYBop github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v1.4.2-0.20190916154449-92cc603036dd/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce h1:KXS1Jg+ddGcWA8e1N7cupxaHHZhit5rB9tfDU+mfjyY= -github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= @@ -522,10 +518,10 @@ github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6Fm github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f/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.13-0.20210318083724-41864a8ad719 h1:vERJC33y4daxkIH/y/ITp5G/Wzim0f5BKWtao6dDybE= -github.com/layer5io/meshery-adapter-library v0.1.13-0.20210318083724-41864a8ad719/go.mod h1:cJ34wNJcYT0Go7DNpmZo+Qmf8Sm4eGZjVM9HY5bMsMs= -github.com/layer5io/meshkit v0.2.6 h1:PsWl5qyz9OHDuOv87DitG00Sphiu0Sg8vHmIZvprtn4= -github.com/layer5io/meshkit v0.2.6/go.mod h1:QvEKV8wIEOabiFlUgiu+s78GpJTsRpoRw5pgvEX077Y= +github.com/layer5io/meshery-adapter-library v0.1.14 h1:gi5h4Ih5m28gKPwzQf5ppu7LcLHERl1sSLYKUkf/Mx8= +github.com/layer5io/meshery-adapter-library v0.1.14/go.mod h1:xmhnOnTQiMWVZc4ghFwHfQYFSCYQBHZ22uLERU5u8aE= +github.com/layer5io/meshkit v0.2.7 h1:cuZLr6BYLVlAYgqD4itCqBZDff1EL0eteRRwKSBuHog= +github.com/layer5io/meshkit v0.2.7/go.mod h1:QvEKV8wIEOabiFlUgiu+s78GpJTsRpoRw5pgvEX077Y= 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= @@ -590,6 +586,8 @@ github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f h1:2+myh5ml7lgEU/5 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible h1:NT0cwArZg/wGdvY8pzej4tPr+9WGmDdkF8Suj+mkz2g= +github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -960,61 +958,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM= -golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6 h1:DvY3Zkh7KabQE/kfzMvYvKirSiguP9Q/veMtkYyf0o8= +golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/internal/config/config.go b/internal/config/config.go index 2dafe1f..640fa78 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -30,18 +30,17 @@ var ( // ServerConfig is the configuration for the gRPC server ServerConfig = map[string]string{ - "name": "traefik-mesh-adapter", - "port": "10006", - "version": "v1.0.0", + "name": smp.ServiceMesh_TRAEFIK_MESH.Enum().String(), + "port": "10006", + "type": "adapter", + "traceurl": status.None, } // MeshSpec is the spec for the service mesh associated with this adapter MeshSpec = map[string]string{ - "name": "traefik mesh", - "status": status.None, - "traceurl": status.None, - "version": status.None, - "type": smp.ServiceMesh_TRAEFIK_MESH.Enum().String(), + "name": smp.ServiceMesh_TRAEFIK_MESH.Enum().String(), + "status": status.None, + "version": status.None, } // ProviderConfig is the config for the configuration provider diff --git a/main.go b/main.go index a41f4d6..bf2a36a 100644 --- a/main.go +++ b/main.go @@ -32,6 +32,8 @@ import ( var ( serviceName = "traefik-mesh-adaptor" + version = "none" + gitsha = "none" ) func init() { @@ -99,6 +101,8 @@ func main() { service.Handler = handler service.Channel = make(chan interface{}, 10) service.StartedAt = time.Now() + service.Version = version + service.GitSHA = gitsha // Server Initialization log.Info("Adaptor Listening at port: ", service.Port) diff --git a/traefik/sample-apps.go b/traefik/sample-apps.go index c935b44..70bc2ed 100644 --- a/traefik/sample-apps.go +++ b/traefik/sample-apps.go @@ -3,7 +3,6 @@ package traefik import ( "github.com/layer5io/meshery-adapter-library/adapter" "github.com/layer5io/meshery-adapter-library/status" - "github.com/layer5io/meshkit/utils" mesherykube "github.com/layer5io/meshkit/utils/kubernetes" ) @@ -15,12 +14,7 @@ func (mesh *Mesh) installSampleApp(namespace string, del bool, templates []adapt } for _, template := range templates { - contents, err := utils.ReadFileSource(string(template)) - if err != nil { - return st, ErrSampleApp(err) - } - - err = mesh.applyManifest([]byte(contents), del, namespace) + err := mesh.applyManifest([]byte(template.String()), del, namespace) if err != nil { return st, ErrSampleApp(err) } diff --git a/traefik/traefik.go b/traefik/traefik.go index be3447e..156d841 100644 --- a/traefik/traefik.go +++ b/traefik/traefik.go @@ -107,6 +107,9 @@ func (mesh *Mesh) ApplyOperation(ctx context.Context, opReq adapter.OperationReq hh.StreamErr(e, err) return } + ee.Summary = fmt.Sprintf("%s test %s successfully", name, status.Completed) + ee.Details = "" + hh.StreamInfo(e) }(mesh, e) default: mesh.StreamErr(e, ErrOpInvalid) From ca8d070d84797852f9966f8980940f9d5a98962d Mon Sep 17 00:00:00 2001 From: kumarabd Date: Fri, 9 Apr 2021 21:43:04 +0530 Subject: [PATCH 10/13] added docker changes Signed-off-by: kumarabd --- .github/workflows/build-and-release.yml | 4 ++-- Dockerfile | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 8d398c4..65d0b75 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -36,7 +36,7 @@ jobs: - name: Docker edge build & tag if: startsWith(github.ref, 'refs/tags/') != true && success() run: | - DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:edge-latest --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} . + DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:edge-latest --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} --build-arg GIT_COMMITSHA=${GITHUB_SHA::7} --build-arg VERSION="edge-latest" . docker tag ${{ secrets.IMAGE_NAME }}:edge-latest ${{ secrets.IMAGE_NAME }}:edge-${GITHUB_SHA::7} - name: Docker edge push if: startsWith(github.ref, 'refs/tags/') != true && success() @@ -46,7 +46,7 @@ jobs: - name: Docker stable build & tag if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() run: | - DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:stable-latest . + DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:stable-latest --build-arg GIT_COMMITSHA=${GITHUB_SHA::7} --build-arg VERSION=${GITHUB_REF/refs\/tags\//} . docker tag ${{ secrets.IMAGE_NAME }}:stable-latest ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_REF/refs\/tags\//} docker tag ${{ secrets.IMAGE_NAME }}:stable-latest ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_SHA::7} - name: Docker stable push diff --git a/Dockerfile b/Dockerfile index 31e4050..2c52bda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM golang:1.15 as builder -ARG CONFIG_PROVIDER="viper" +ARG VERSION +ARG GIT_SHA WORKDIR /build # Copy the Go Modules manifests COPY go.mod go.mod @@ -13,7 +14,7 @@ COPY main.go main.go COPY internal/ internal/ COPY traefik/ traefik/ # Build -RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -ldflags="-w -s -X main.provider=$CONFIG_PROVIDER" -a -o meshery-traefik-mesh main.go +RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -ldflags="-w -s -X main.version=$VERSION -X main.gitsha=$GIT_SHA" -a -o meshery-traefik-mesh main.go # Use distroless as minimal base image to package the manager binary # Refer to /~https://github.com/GoogleContainerTools/distroless for more details From 1a244a427f8126ce4dc01723082c9472d343551a Mon Sep 17 00:00:00 2001 From: kumarabd Date: Sat, 10 Apr 2021 00:19:16 +0530 Subject: [PATCH 11/13] ci fixes Signed-off-by: kumarabd --- go.mod | 6 +----- go.sum | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 60 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 99cbe4d..ef56ec5 100644 --- a/go.mod +++ b/go.mod @@ -2,11 +2,7 @@ module github.com/layer5io/meshery-traefik-mesh go 1.15 -replace ( - github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible - github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f - golang.org/x/sys => golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6 -) +replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f require ( github.com/layer5io/meshery-adapter-library v0.1.14 diff --git a/go.sum b/go.sum index aa97fb1..3c453f1 100644 --- a/go.sum +++ b/go.sum @@ -197,6 +197,10 @@ github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod h1:JLrzqnKDaYBop github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v1.4.2-0.20190916154449-92cc603036dd/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce h1:KXS1Jg+ddGcWA8e1N7cupxaHHZhit5rB9tfDU+mfjyY= +github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= @@ -586,8 +590,6 @@ github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f h1:2+myh5ml7lgEU/5 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible h1:NT0cwArZg/wGdvY8pzej4tPr+9WGmDdkF8Suj+mkz2g= -github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -958,8 +960,61 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6 h1:DvY3Zkh7KabQE/kfzMvYvKirSiguP9Q/veMtkYyf0o8= -golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM= +golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 5852cf44a82aba51c16cafb445e0bdc1fef65fdf Mon Sep 17 00:00:00 2001 From: abishek Date: Mon, 12 Apr 2021 15:07:59 +0530 Subject: [PATCH 12/13] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2c52bda..22f4b32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM golang:1.15 as builder ARG VERSION -ARG GIT_SHA +ARG GIT_COMMITSHA WORKDIR /build # Copy the Go Modules manifests COPY go.mod go.mod @@ -23,4 +23,4 @@ ENV DISTRO="debian" ENV GOARCH="amd64" WORKDIR $HOME/.meshery COPY --from=builder /build/meshery-traefik-mesh . -ENTRYPOINT ["./meshery-traefik-mesh"] \ No newline at end of file +ENTRYPOINT ["./meshery-traefik-mesh"] From 6ee17f32fd02e04a0a7555304d4b9db72ff26add Mon Sep 17 00:00:00 2001 From: abishek Date: Mon, 12 Apr 2021 15:17:22 +0530 Subject: [PATCH 13/13] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 22f4b32..7476e21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ COPY main.go main.go COPY internal/ internal/ COPY traefik/ traefik/ # Build -RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -ldflags="-w -s -X main.version=$VERSION -X main.gitsha=$GIT_SHA" -a -o meshery-traefik-mesh main.go +RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -ldflags="-w -s -X main.version=$VERSION -X main.gitsha=$GIT_COMMITSHA" -a -o meshery-traefik-mesh main.go # Use distroless as minimal base image to package the manager binary # Refer to /~https://github.com/GoogleContainerTools/distroless for more details