Skip to content

Commit

Permalink
Merge pull request #144 from layer5io/kumarabd/feature/broker
Browse files Browse the repository at this point in the history
bumped meshkit and manifest changes for version
  • Loading branch information
kumarabd authored Mar 16, 2021
2 parents 666642f + 42af7bd commit ff17ed2
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 6 deletions.
6 changes: 3 additions & 3 deletions config/manifests/default.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
apiVersion: v1
kind: Namespace
metadata:
labels:
app: meshery
component: operator
name: meshery
---
apiVersion: apiextensions.k8s.io/v1beta1
Expand Down Expand Up @@ -327,6 +324,7 @@ metadata:
labels:
app: meshery
component: operator
version: v0.2.11
name: meshery-operator-metrics-service
namespace: meshery
spec:
Expand All @@ -337,13 +335,15 @@ spec:
selector:
app: meshery
component: operator
version: v0.2.11
---
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: meshery
component: operator
version: v0.2.11
name: meshery-operator
namespace: meshery
spec:
Expand Down
4 changes: 4 additions & 0 deletions config/samples/meshery_v1alpha1_broker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ kind: Broker
metadata:
name: meshery-broker
namespace: meshery
labels:
app: meshery
component: controller
version: v0.1.15
annotations:
meshery/component-type: management-plane
spec:
Expand Down
4 changes: 4 additions & 0 deletions config/samples/meshery_v1alpha1_meshsync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ kind: MeshSync
metadata:
name: meshery-meshsync
namespace: meshery
labels:
app: meshery
component: controller
version: v0.1.15
annotations:
meshery/component-type: management-plane
spec:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/go-logr/logr v0.4.0
github.com/golang/protobuf v1.4.3 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/layer5io/meshkit v0.2.3
github.com/layer5io/meshkit v0.2.6
github.com/onsi/ginkgo v1.14.2
github.com/onsi/gomega v1.10.4
golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d // indirect
Expand Down
6 changes: 4 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,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=
Expand Down Expand Up @@ -502,8 +503,8 @@ github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq
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/meshkit v0.2.3 h1:U8UO2FeixfsQmnH1Tdu59mXe/d4Qdvu4SWm/BG0c3Gc=
github.com/layer5io/meshkit v0.2.3/go.mod h1:I/iDjm3Qz3//hQYh6h3UVssqYCKV0eX/xhaFsppRv00=
github.com/layer5io/meshkit v0.2.6 h1:PsWl5qyz9OHDuOv87DitG00Sphiu0Sg8vHmIZvprtn4=
github.com/layer5io/meshkit v0.2.6/go.mod h1:QvEKV8wIEOabiFlUgiu+s78GpJTsRpoRw5pgvEX077Y=
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=
Expand Down Expand Up @@ -1165,6 +1166,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=
Expand Down

0 comments on commit ff17ed2

Please sign in to comment.