Skip to content

Commit

Permalink
Upgrade traefik and deps to 2.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dtomcej committed Apr 3, 2020
1 parent 84b646a commit 6894b63
Show file tree
Hide file tree
Showing 28 changed files with 424 additions and 342 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Let's build maesh for linux-amd64
FROM golang:1.13-alpine AS base-image
FROM golang:1.14-alpine AS base-image

# Package dependencies
RUN apk --no-cache --no-progress add \
Expand All @@ -22,7 +22,7 @@ WORKDIR /go/src/github.com/containous/maesh
RUN curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh

# Download golangci-lint binary to bin folder in $GOPATH
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.22.2
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.23.8

ENV GO111MODULE on
COPY go.mod go.sum ./
Expand Down
10 changes: 5 additions & 5 deletions docs/content/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ and is configured via the values.yaml file in the helm install.
- Service Mesh Interface (SMI) mode can be enabled.
This configures maesh to run in SMI mode, where access and routes are explicitly enabled.
Note: By default, all routes and access is denied.
Please see the [SMI Specification](https://github.com/deislabs/smi-spec) for more information
Please see the [SMI Specification](https://github.com/servicemeshinterface/smi-spec) for more information

## Dynamic configuration

Expand Down Expand Up @@ -121,7 +121,7 @@ More precisely, the `server` app is composed by two routes:
- The `api` route under the `/api` path, accepting all methods
- The `metrics` routes under the `/metrics` path, accepting only `GET` requests

Other types of route groups and detailed information are available [in the specification](https://github.com/deislabs/smi-spec/blob/master/traffic-specs.md).
Other types of route groups and detailed information are available [in the specification](https://github.com/servicemeshinterface/smi-spec/blob/master/traffic-specs.md).

By default, all traffic is denied so we need to grant access to clients to our application. This is done by defining a `TrafficTarget`.

Expand Down Expand Up @@ -154,7 +154,7 @@ In this example, we grant access to all pods running with the service account `c

Any client running with the service account `client` under the `client` namespace accessing `server.server.maesh/api` is allowed to access the `/api` resource. Others will receive 404 answers from the Maesh node.

More information can be found [in the SMI specification](https://github.com/deislabs/smi-spec/blob/master/traffic-access-control.md).
More information can be found [in the SMI specification](https://github.com/servicemeshinterface/smi-spec/blob/master/traffic-access-control.md).

#### Traffic Splitting

Expand All @@ -178,8 +178,8 @@ spec:
In this example, we define a traffic split for our server service between two versions of our server, v1 and v2.
`server.server.maesh` directs 80% of the traffic to the server-v1 pods, and 20% of the traffic to the server-v2 pods.

More information can be found [in the SMI specification](https://github.com/deislabs/smi-spec/blob/master/traffic-split.md).
More information can be found [in the SMI specification](https://github.com/servicemeshinterface/smi-spec/blob/master/traffic-split.md).

#### Traffic Metrics

At the moment, Maesh does not implement the [Traffic Metrics specification](https://github.com/deislabs/smi-spec/blob/master/traffic-metrics.md).
At the moment, Maesh does not implement the [Traffic Metrics specification](https://github.com/servicemeshinterface/smi-spec/blob/master/traffic-metrics.md).
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ go 1.13

// Kubernetes version kubernetes-1.15.3
require (
github.com/abronan/valkeyrie v0.0.0-20190822142731-f2e1850dc905
github.com/abronan/valkeyrie v0.0.0-20200127174252-ef4277a138cd
github.com/cenkalti/backoff/v4 v4.0.0
github.com/containous/traefik/v2 v2.1.6
github.com/deislabs/smi-sdk-go v0.2.1-0.20191211172751-4e51d4dc331e
github.com/containous/traefik/v2 v2.2.0
github.com/go-check/check v0.0.0-20180628173108-788fd7840127
github.com/google/uuid v1.1.1
github.com/gorilla/mux v1.7.3
github.com/pmezard/go-difflib v1.0.0
github.com/servicemeshinterface/smi-sdk-go v0.3.1-0.20200326101714-d0668c95e1dc
github.com/sirupsen/logrus v1.4.2
github.com/stretchr/testify v1.4.0
github.com/stretchr/testify v1.5.1
github.com/vdemeester/shakers v0.1.0
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
k8s.io/api v0.0.0-20190819141258-3544db3b9e44
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
k8s.io/client-go v0.0.0-20190819141724-e14f31a72a77
k8s.io/api v0.18.0
k8s.io/apimachinery v0.18.0
k8s.io/client-go v0.18.0
)

replace (
Expand Down

0 comments on commit 6894b63

Please sign in to comment.