Skip to content

Commit

Permalink
Merge branch 'v1.3' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinpollet committed Jul 10, 2020
2 parents 8d583b9 + d6bbf49 commit 3c07e25
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 5 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.14
require (
github.com/abronan/valkeyrie v0.0.0-20200127174252-ef4277a138cd
github.com/cenkalti/backoff/v4 v4.0.2
github.com/containous/traefik/v2 v2.2.2
github.com/containous/traefik/v2 v2.2.3
github.com/go-check/check v0.0.0-20180628173108-788fd7840127
github.com/google/uuid v1.1.1
github.com/gorilla/mux v1.7.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ github.com/containous/multibuf v0.0.0-20190809014333-8b6c9a7e6bba h1:PhR03pep+5e
github.com/containous/multibuf v0.0.0-20190809014333-8b6c9a7e6bba/go.mod h1:zkWcASFUJEst6QwCrxLdkuw1gvaKqmflEipm+iecV5M=
github.com/containous/mux v0.0.0-20200408164629-f779179d490a h1:9HowJycBgtJU6s+2ic6cTeAV1CaJC+dJfC7rFoMwoyc=
github.com/containous/mux v0.0.0-20200408164629-f779179d490a/go.mod h1:z8WW7n06n8/1xF9Jl9WmuDeZuHAhfL+bwarNjsciwwg=
github.com/containous/traefik/v2 v2.2.2 h1:ZieYXw1K1+dw94c47pxEsmfjVoymr+viBpTIpPn1QzQ=
github.com/containous/traefik/v2 v2.2.2/go.mod h1:d42LvooahX/t+Sj8mbYHpOVfqSFKrvF2KQndPcvSTjM=
github.com/containous/traefik/v2 v2.2.3 h1:1WKUH7WavgKSFJ+AYXhyl2mInsQqk8pwoBrEv524MEA=
github.com/containous/traefik/v2 v2.2.3/go.mod h1:d42LvooahX/t+Sj8mbYHpOVfqSFKrvF2KQndPcvSTjM=
github.com/coreos/bbolt v1.3.3 h1:n6AiVyVRKQFNb6mJlwESEvvLoDyiTzXX7ORAUlkeBdY=
github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3q1JMazcgBQ=
Expand Down
40 changes: 40 additions & 0 deletions helm/chart/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Maesh

Maesh is a simple, yet full-featured service mesh. It is container-native and fits as your de-facto service mesh in your
Kubernetes cluster. It supports the latest Service Mesh Interface specification [SMI](https://smi-spec.io/) that facilitates
integration with pre-existing solution.

Moreover, Maesh is opt-in by default, which means that your existing services are
unaffected until you decide to add them to the mesh.

## Prerequisites

- Kubernetes 1.11+
- CoreDNS/KubeDNS installed as [Cluster DNS Provider](https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/) (versions 1.3+ supported)
- [Helm v3](https://helm.sh/docs/intro/install/)

## Installing the Chart

To install the chart with the release name `maesh`:

```bash
$ helm repo add maesh https://containous.github.io/maesh/charts
$ helm repo update
$ helm install maesh maesh/maesh
```

You can use the `--namespace my-namespace` flag to deploy Maesh in a custom namespace and the `--set "key1=val1,key2=val2,..."`
flag to configure it. Where `key1=val1`, `key2=val2`, `...` are chart values that you can find at
https://github.com/containous/maesh/blob/master/helm/chart/maesh/values.yaml.

## Uninstalling the Chart

To uninstall the chart with the release name `maesh`:

```bash
$ helm uninstall maesh
```

## Contributing

If you want to contribute to this chart, please read the [Guidelines](./Guidelines.md).
4 changes: 2 additions & 2 deletions helm/chart/maesh/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
apiVersion: v2
name: maesh
version: 2.1.0
appVersion: v1.3.0
version: 2.1.2
appVersion: v1.3.2
description: Maesh - Simpler Service Mesh
keywords:
- traefik
Expand Down

0 comments on commit 3c07e25

Please sign in to comment.