From ee7aa77833d568f431827d9f914e6d9a82de0f5e Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Fri, 15 Mar 2019 16:04:04 +0100 Subject: [PATCH] Update structor --- .travis.yml | 2 +- README.md | 4 ++-- docs/basics.md | 2 +- docs/index.md | 4 ++-- docs/user-guide/kubernetes.md | 34 +++++++++++++++++----------------- examples/quickstart/README.md | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 035e41498..57fe23a5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ before_deploy: make -j${N_MAKE_JOBS} crossbinary-parallel; tar cfz dist/traefik-${VERSION}.src.tar.gz --exclude-vcs --exclude dist .; fi; - curl -sfL https://raw.githubusercontent.com/containous/structor/master/godownloader.sh | bash -s -- -b "${GOPATH}/bin" v1.4.0 + curl -sfL https://raw.githubusercontent.com/containous/structor/master/godownloader.sh | bash -s -- -b "${GOPATH}/bin" v1.6.0 structor -o containous -r traefik --dockerfile-url="https://raw.githubusercontent.com/containous/traefik/v1.7/docs.Dockerfile" --menu.js-url="https://raw.githubusercontent.com/containous/structor/master/traefik-menu.js.gotmpl" --rqts-url="https://raw.githubusercontent.com/containous/structor/master/requirements-override.txt" --exp-branch=master --debug; fi deploy: diff --git a/README.md b/README.md index f4c74ee9b..3e815d619 100644 --- a/README.md +++ b/README.md @@ -113,13 +113,13 @@ If you need commercial support, please contact [Containo.us](https://containo.us ## Download -- Grab the latest binary from the [releases](https://github.com/containous/traefik/releases) page and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/master/traefik.sample.toml): +- Grab the latest binary from the [releases](https://github.com/containous/traefik/releases) page and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v1.7/traefik.sample.toml): ```shell ./traefik --configFile=traefik.toml ``` -- Or use the official tiny Docker image and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/master/traefik.sample.toml): +- Or use the official tiny Docker image and run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v1.7/traefik.sample.toml): ```shell docker run -d -p 8080:8080 -p 80:80 -v $PWD/traefik.toml:/etc/traefik/traefik.toml traefik diff --git a/docs/basics.md b/docs/basics.md index 51cdce993..6037c1604 100644 --- a/docs/basics.md +++ b/docs/basics.md @@ -746,7 +746,7 @@ Once a day (the first call begins 10 minutes after the start of Traefik), we col ### Show me the code ! -If you want to dig into more details, here is the source code of the collecting system: [collector.go](https://github.com/containous/traefik/blob/master/collector/collector.go) +If you want to dig into more details, here is the source code of the collecting system: [collector.go](https://github.com/containous/traefik/blob/v1.7/collector/collector.go) By default we anonymize all configuration fields, except fields tagged with `export=true`. diff --git a/docs/index.md b/docs/index.md index 9fb64ceaa..a5aedde1f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -66,7 +66,7 @@ _(But if you'd rather configure some of your routes manually, Traefik supports t In this quickstart, we'll use [Docker compose](https://docs.docker.com/compose) to create our demo infrastructure. -To save some time, you can clone [Traefik's repository](https://github.com/containous/traefik) and use the quickstart files located in the [examples/quickstart](https://github.com/containous/traefik/tree/master/examples/quickstart/) directory. +To save some time, you can clone [Traefik's repository](https://github.com/containous/traefik) and use the quickstart files located in the [examples/quickstart](https://github.com/containous/traefik/tree/v1.7/examples/quickstart/) directory. ### 1 — Launch Traefik — Tell It to Listen to Docker @@ -190,7 +190,7 @@ You will learn fundamental Traefik features and see some demos with Kubernetes. ### The Official Binary File -You can grab the latest binary from the [releases](https://github.com/containous/traefik/releases) page and just run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/master/traefik.sample.toml): +You can grab the latest binary from the [releases](https://github.com/containous/traefik/releases) page and just run it with the [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v1.7/traefik.sample.toml): ```shell ./traefik -c traefik.toml diff --git a/docs/user-guide/kubernetes.md b/docs/user-guide/kubernetes.md index de116e7d1..3a6475853 100644 --- a/docs/user-guide/kubernetes.md +++ b/docs/user-guide/kubernetes.md @@ -4,7 +4,7 @@ This guide explains how to use Traefik as an Ingress controller for a Kubernetes If you are not familiar with Ingresses in Kubernetes you might want to read the [Kubernetes user guide](https://kubernetes.io/docs/concepts/services-networking/ingress/) -The config files used in this guide can be found in the [examples directory](https://github.com/containous/traefik/tree/master/examples/k8s) +The config files used in this guide can be found in the [examples directory](https://github.com/containous/traefik/tree/v1.7/examples/k8s) ## Prerequisites @@ -68,10 +68,10 @@ subjects: namespace: kube-system ``` -[examples/k8s/traefik-rbac.yaml](https://github.com/containous/traefik/tree/master/examples/k8s/traefik-rbac.yaml) +[examples/k8s/traefik-rbac.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/traefik-rbac.yaml) ```shell -kubectl apply -f https://raw.githubusercontent.com/containous/traefik/master/examples/k8s/traefik-rbac.yaml +kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/traefik-rbac.yaml ``` For namespaced restrictions, one RoleBinding is required per watched namespace along with a corresponding configuration of Traefik's `kubernetes.namespaces` parameter. @@ -148,7 +148,7 @@ spec: type: NodePort ``` -[examples/k8s/traefik-deployment.yaml](https://github.com/containous/traefik/tree/master/examples/k8s/traefik-deployment.yaml) +[examples/k8s/traefik-deployment.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/traefik-deployment.yaml) !!! note The Service will expose two NodePorts which allow access to the ingress and the web interface. @@ -216,7 +216,7 @@ spec: name: admin ``` -[examples/k8s/traefik-ds.yaml](https://github.com/containous/traefik/tree/master/examples/k8s/traefik-ds.yaml) +[examples/k8s/traefik-ds.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/traefik-ds.yaml) !!! note This will create a Daemonset that uses privileged ports 80/8080 on the host. This may not work on all providers, but illustrates the static (non-NodePort) hostPort binding. The `traefik-ingress-service` can still be used inside the cluster to access the DaemonSet pods. @@ -224,11 +224,11 @@ spec: To deploy Traefik to your cluster start by submitting one of the YAML files to the cluster with `kubectl`: ```shell -kubectl apply -f https://raw.githubusercontent.com/containous/traefik/master/examples/k8s/traefik-deployment.yaml +kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/traefik-deployment.yaml ``` ```shell -kubectl apply -f https://raw.githubusercontent.com/containous/traefik/master/examples/k8s/traefik-ds.yaml +kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/traefik-ds.yaml ``` There are some significant differences between using Deployments and DaemonSets: @@ -352,10 +352,10 @@ spec: servicePort: web ``` -[examples/k8s/ui.yaml](https://github.com/containous/traefik/tree/master/examples/k8s/ui.yaml) +[examples/k8s/ui.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/ui.yaml) ```shell -kubectl apply -f https://raw.githubusercontent.com/containous/traefik/master/examples/k8s/ui.yaml +kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/ui.yaml ``` Now lets setup an entry in our `/etc/hosts` file to route `traefik-ui.minikube` to our cluster. @@ -581,10 +581,10 @@ spec: - containerPort: 80 ``` -[examples/k8s/cheese-deployments.yaml](https://github.com/containous/traefik/tree/master/examples/k8s/cheese-deployments.yaml) +[examples/k8s/cheese-deployments.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/cheese-deployments.yaml) ```shell -kubectl apply -f https://raw.githubusercontent.com/containous/traefik/master/examples/k8s/cheese-deployments.yaml +kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/cheese-deployments.yaml ``` Next we need to setup a Service for each of the cheese pods. @@ -636,10 +636,10 @@ spec: !!! note We also set a [circuit breaker expression](/basics/#backends) for one of the backends by setting the `traefik.backend.circuitbreaker` annotation on the service. -[examples/k8s/cheese-services.yaml](https://github.com/containous/traefik/tree/master/examples/k8s/cheese-services.yaml) +[examples/k8s/cheese-services.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/cheese-services.yaml) ```shell -kubectl apply -f https://raw.githubusercontent.com/containous/traefik/master/examples/k8s/cheese-services.yaml +kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/cheese-services.yaml ``` Now we can submit an ingress for the cheese websites. @@ -676,13 +676,13 @@ spec: servicePort: http ``` -[examples/k8s/cheese-ingress.yaml](https://github.com/containous/traefik/tree/master/examples/k8s/cheese-ingress.yaml) +[examples/k8s/cheese-ingress.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/cheese-ingress.yaml) !!! note We list each hostname, and add a backend service. ```shell -kubectl apply -f https://raw.githubusercontent.com/containous/traefik/master/examples/k8s/cheese-ingress.yaml +kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/cheese-ingress.yaml ``` Now visit the [Traefik dashboard](http://traefik-ui.minikube/) and you should see a frontend for each host. @@ -731,13 +731,13 @@ spec: servicePort: http ``` -[examples/k8s/cheeses-ingress.yaml](https://github.com/containous/traefik/tree/master/examples/k8s/cheeses-ingress.yaml) +[examples/k8s/cheeses-ingress.yaml](https://github.com/containous/traefik/tree/v1.7/examples/k8s/cheeses-ingress.yaml) !!! note We are configuring Traefik to strip the prefix from the url path with the `traefik.frontend.rule.type` annotation so that we can use the containers from the previous example without modification. ```shell -kubectl apply -f https://raw.githubusercontent.com/containous/traefik/master/examples/k8s/cheeses-ingress.yaml +kubectl apply -f https://raw.githubusercontent.com/containous/traefik/v1.7/examples/k8s/cheeses-ingress.yaml ``` ```shell diff --git a/examples/quickstart/README.md b/examples/quickstart/README.md index 26ca61cf4..7f750305b 100644 --- a/examples/quickstart/README.md +++ b/examples/quickstart/README.md @@ -2,7 +2,7 @@ In this quickstart, we'll use [Docker compose](https://docs.docker.com/compose) to create our demo infrastructure. -To save some time, you can clone [Traefik's repository](https://github.com/containous/traefik) and use the quickstart files located in the [examples/quickstart](https://github.com/containous/traefik/tree/master/examples/quickstart/) directory. +To save some time, you can clone [Traefik's repository](https://github.com/containous/traefik) and use the quickstart files located in the [examples/quickstart](https://github.com/containous/traefik/tree/v1.7/examples/quickstart/) directory. ### 1 — Launch Traefik — Tell It to Listen to Docker