Merge pull request #205 from emilevauge/bump-go-1.6

Bump go 1.6
Add HTTP2 support
2016-02-18 11:07:18 +01:00 · 2016-02-18 10:31:56 +01:00 · 2016-02-18 10:30:41 +01:00 · 2016-02-17 23:05:26 +01:00 · 2016-02-17 09:56:43 +01:00 · 2016-02-16 12:30:33 -08:00
7 changed files with 61 additions and 14 deletions
--- a/18
+++ b/18
@@ -24,13 +24,13 @@ print-%: ; @echo $*=$($*)

 default: binary

-all: build-webui build
+all: generate-webui build
 	$(DOCKER_RUN_TRAEFIK) ./script/make.sh

-binary: build-webui generate-webui build
+binary: generate-webui build
 	$(DOCKER_RUN_TRAEFIK) ./script/make.sh generate binary

-crossbinary: build-webui generate-webui build
+crossbinary: generate-webui build
 	$(DOCKER_RUN_TRAEFIK) ./script/make.sh generate crossbinary

 test: build
@@ -77,13 +77,15 @@ run-dev:
 	go build
 	./traefik

-generate-webui:
-	mkdir -p static
-	docker run --rm -v "$$PWD/static":'/src/static' traefik-webui gulp
-	echo 'For more informations show `webui/readme.md`' > $$PWD/static/DONT-EDIT-FILES-IN-THIS-DIRECTORY.md
+generate-webui: build-webui
+	if [ ! -d "static" ]; then \
+		mkdir -p static; \
+		docker run --rm -v "$$PWD/static":'/src/static' traefik-webui gulp; \
+		echo 'For more informations show `webui/readme.md`' > $$PWD/static/DONT-EDIT-FILES-IN-THIS-DIRECTORY.md; \
+	fi

 lint:
 	$(foreach file,$(SRCS),golint $(file) || exit;)

 fmt:
-	gofmt -s -l -w $(SRCS)
+	gofmt -s -l -w $(SRCS)
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ It supports several backends ([Docker :whale:](https://www.docker.com/), [Mesos/
 - SSL frontend support
 - Clean AngularJS Web UI
 - Websocket support
+- HTTP/2 support

 ## Demo

@@ -80,7 +81,7 @@ Refer to the [benchmarks section](docs/index.md#benchmarks) in the documentation

 These projects use Træfɪk internally. If your company uses Træfɪk, we would be glad to get your feedback :) Contact us on [![Join the chat at https://traefik.herokuapp.com](https://img.shields.io/badge/style-register-green.svg?style=social&label=Slack)](https://traefik.herokuapp.com)

- Project [Mantl](http://http://mantl.io/) from Cisco
+- Project [Mantl](https://mantl.io/) from Cisco

 ![Web UI Providers](docs/img/mantl-logo.png)
 > Mantl is a modern platform for rapidly deploying globally distributed services. A container orchestrator, docker, a network stack, something to pool your logs, something to monitor health, a sprinkle of service discovery and some automation.
--- a/build.Dockerfile
+++ b/build.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.5.3
+FROM golang:1.6

 RUN go get github.com/Masterminds/glide
 RUN go get github.com/mitchellh/gox
--- a/docs/index.md
+++ b/docs/index.md
@@ -15,6 +15,7 @@ ___
 - [Etcd backend](#etcd)
 - [Zookeeper backend](#zk)
 - [Boltdb backend](#boltdb)
+- [Atomic configuration changes](#atomicconfig)
 - [Benchmarks](#benchmarks)


@@ -946,6 +947,44 @@ Træfɪk can be configured to use BoltDB as a backend configuration:
 # filename = "boltdb.tmpl"
 ```

+## <a id="atomicconfig"></a> Atomic configuration changes
+
+The [Etcd](https://github.com/coreos/etcd/issues/860) and [Consul](https://github.com/hashicorp/consul/issues/886) backends do not support updating multiple keys atomically. As a result, it may be possible for Træfɪk to read an intermediate configuration state despite judicious use of the `--providersThrottleDuration` flag. To solve this problem, Træfɪk supports a special key called `/traefik/alias`. If set, Træfɪk use the value as an alternative key prefix.
+
+Given the key structure below, Træfɪk will use the `http://172.17.0.2:80` as its only backend (frontend keys have been omitted for brevity).
+
+| Key                                                                     | Value                       |
+|-------------------------------------------------------------------------|-----------------------------|
+| `/traefik/alias`                                                        | `/traefik_configurations/1` |
+| `/traefik_configurations/1/backends/backend1/servers/server1/url`       | `http://172.17.0.2:80`      |
+| `/traefik_configurations/1/backends/backend1/servers/server1/weight`    | `10`                        |
+
+When an atomic configuration change is required, you may write a new configuration at an alternative prefix. Here, although the `/traefik_configurations/2/...` keys have been set, the old configuration is still active because the `/traefik/alias` key still points to `/traefik_configurations/1`:
+
+| Key                                                                     | Value                       |
+|-------------------------------------------------------------------------|-----------------------------|
+| `/traefik/alias`                                                        | `/traefik_configurations/1` |
+| `/traefik_configurations/1/backends/backend1/servers/server1/url`       | `http://172.17.0.2:80`      |
+| `/traefik_configurations/1/backends/backend1/servers/server1/weight`    | `10`                        |
+| `/traefik_configurations/2/backends/backend1/servers/server1/url`       | `http://172.17.0.2:80`      |
+| `/traefik_configurations/2/backends/backend1/servers/server1/weight`    | `5`                        |
+| `/traefik_configurations/2/backends/backend1/servers/server2/url`       | `http://172.17.0.3:80`      |
+| `/traefik_configurations/2/backends/backend1/servers/server2/weight`    | `5`                        |
+
+Once the `/traefik/alias` key is updated, the new `/traefik_configurations/2` configuration becomes active atomically. Here, we have a 50% balance between the `http://172.17.0.3:80` and the `http://172.17.0.4:80` hosts while no traffic is sent to the `172.17.0.2:80` host:
+
+| Key                                                                     | Value                       |
+|-------------------------------------------------------------------------|-----------------------------|
+| `/traefik/alias`                                                        | `/traefik_configurations/2` |
+| `/traefik_configurations/1/backends/backend1/servers/server1/url`       | `http://172.17.0.2:80`      |
+| `/traefik_configurations/1/backends/backend1/servers/server1/weight`    | `10`                        |
+| `/traefik_configurations/2/backends/backend1/servers/server1/url`       | `http://172.17.0.3:80`      |
+| `/traefik_configurations/2/backends/backend1/servers/server1/weight`    | `5`                        |
+| `/traefik_configurations/2/backends/backend1/servers/server2/url`       | `http://172.17.0.4:80`      |
+| `/traefik_configurations/2/backends/backend1/servers/server2/weight`    | `5`                        |
+
+Note that Træfɪk *will not watch for key changes in the `/traefik_configurations` prefix*. It will only watch for changes in the `/traefik` prefix. Further, if the `/traefik/alias` key is set, all other sibling keys with the `/traefik` prefix are ignored.
+

 ## <a id="benchmarks"></a> Benchmarks

--- a/integration/integration_test.go
+++ b/integration/integration_test.go
@@ -87,6 +87,9 @@ func (s *BaseSuite) createComposeProject(c *check.C, name string) {
 	c.Assert(err, checker.IsNil)
 	s.composeProject = composeProject

+	err = composeProject.Create()
+	c.Assert(err, checker.IsNil)
+
 	s.started = make(chan bool)
 	s.stopped = make(chan bool)
 	s.deleted = make(chan bool)
@@ -96,7 +99,8 @@ func (s *BaseSuite) createComposeProject(c *check.C, name string) {

 	composeProject.AddListener(s.listenChan)

-	composeProject.Start()
+	err = composeProject.Start()
+	c.Assert(err, checker.IsNil)

 	// Wait for compose to start
 	<-s.started
--- a/provider/kv.go
+++ b/provider/kv.go
@@ -70,7 +70,8 @@ func (provider *Kv) loadConfig() *types.Configuration {
 	templateObjects := struct {
 		Prefix string
 	}{
-		provider.Prefix,
+		// Allow `/traefik/alias` to superesede `provider.Prefix`
+		strings.TrimSuffix(provider.get(provider.Prefix, provider.Prefix+"/alias"), "/"),
 	}
 	var KvFuncMap = template.FuncMap{
 		"List":     provider.list,
--- a/webui/Dockerfile
+++ b/webui/Dockerfile
@@ -11,8 +11,8 @@ COPY bower.json $WEBUI_DIR/

 WORKDIR $WEBUI_DIR
 RUN npm set progress=false
-RUN npm install
-RUN bower install --allow-root
+RUN npm install --quiet
+RUN bower install --allow-root --quiet

 COPY . $WEBUI_DIR/
Author	SHA1	Message	Date
Vincent Demeester	c7d34b54aa	Merge pull request #205 from emilevauge/bump-go-1.6 Bump go 1.6	2016-02-18 11:07:18 +01:00
emile	8d860c84c8	Add HTTP2 support Signed-off-by: emile <emile@vauge.com>	2016-02-18 10:31:56 +01:00
emile	1dc086730e	Bump golang 1.6	2016-02-18 10:30:41 +01:00
Emile Vauge	5d79e56d30	Merge pull request #193 from dontrebootme/fix192 fix mantl url typo	2016-02-17 23:05:26 +01:00
Vincent Demeester	6e7677de79	Merge pull request #203 from goguardian/alias Implement `/traefik/alias` for KV stores.	2016-02-17 09:56:43 +01:00
Patrick O'Connor	fab6b8be3c	fix mantl url typo	2016-02-16 12:30:33 -08:00
Advait Shinde	f1c1eed437	Fix typo in documentation	2016-02-16 11:55:42 -05:00
Advait Shinde	348ab794c9	Add documentation for `/traefik/alias`.	2016-02-15 18:46:03 -05:00
Advait Shinde	aacedcc4b3	Implement `/traefik/alias` for KV stores.	2016-02-15 18:14:57 -05:00
Emile Vauge	786acc961a	Merge pull request #200 from vdemeester/some-fixes Do some build / test-integration fixes	2016-02-13 16:33:42 +01:00
Vincent Demeester	7adffdbd78	Run npm in quiet mode O:) Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2016-02-13 16:14:26 +01:00
Vincent Demeester	e3b519cdd8	Do some build / test-integration fixes - target generate-webui depends on build-webui - generate-webui will run only if the folder static does not exists - create compose project before starting it >_<'', otherwise it does nothing :'D Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2016-02-13 16:04:08 +01:00