Support Etcd v3, enhance KV support #2407
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nmengin
added
area/cluster
area/provider
bot/no-merge
kind/enhancement
nmengin
force-pushed
the
feature/libkv-migration
branch
from
7f770cd to
2de94fa
Compare
nmengin
force-pushed
the
feature/libkv-migration
branch
from
308f991 to
46be176
Compare
mmatur
requested changes
Nov 16, 2017
| @@ -36,13 +36,19 @@ import: | |||
| - tlsconfig | |||
| - package: github.com/docker/go-units | |||
| version: 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1 | |||
| - package: github.com/coreos/etcd | |||
| version: v3.2.9 | |||
There was a problem hiding this comment.
Just a question. Why it is not the same version that is present in docker compose file v3.2.9 <> v3.2.7
There was a problem hiding this comment.
Modification done in the docker-compose fileS.
integration/etcd_test.go
Outdated
| @@ -72,14 +84,12 @@ func (s *EtcdSuite) TestSimpleConfiguration(c *check.C) { | |||
|
|
|||
| // TODO validate : run on 80 | |||
| // Expected a 404 as we did not configure anything | |||
| err = try.GetRequest("http://127.0.0.1:8000/", 1000*time.Millisecond, try.StatusCodeIs(http.StatusNotFound)) | |||
| err = try.GetRequest(traefikEtcdURL, 1000*time.Millisecond, try.StatusCodeIs(http.StatusNotFound)) | |||
There was a problem hiding this comment.
Could you please replace 1000*time.Millisecond with 1*time.Second
nmengin
force-pushed
the
feature/libkv-migration
branch
from
46be176 to
38df4a1
Compare
nmengin
force-pushed
the
feature/libkv-migration
branch
2 times, most recently
from
d0a92cb to
d2d6830
Compare
nmengin
force-pushed
the
feature/libkv-migration
branch
from
3eb92e5 to
67fbb54
Compare
nmengin
force-pushed
the
feature/libkv-migration
branch
from
67fbb54 to
680fa6c
Compare
emilevauge
requested changes
Nov 17, 2017
There was a problem hiding this comment.
Thanks a lot @nmengin 😍
Few minor comments but overall, looks very good to me :)
docs/configuration/backends/etcd.md
Outdated
|
|
||
| !!! Note | ||
| the option `useAPIV3` allows using Etcd API V3 only if it's set to true. | ||
| This option will be **deprecated** and API V3 will be the only version compatible with Træfik. |
| esac | ||
| } | ||
|
|
||
| main $@ |
There was a problem hiding this comment.
247 lines of fun ;)
Are we sure we want to maintain this in the repo ?
There was a problem hiding this comment.
@emilevauge For the moment I prefer keep it as long as we do not have end-to-end test about the cluster mode.
It allows generating easily a Dockerized Træfik cluster...
Moreover, shell is life... shell is like an unicorn or a rainbow or both...
provider/etcd/etcd.go
Outdated
| etcdv3.Register() | ||
| p.SetStoreType(store.ETCDV3) | ||
| } else { | ||
| log.Warn("The ETCD API V2 is deprecated. Please use API V3 instead") |
There was a problem hiding this comment.
Could you add a comment // TODO: Deprecated before ?
nmengin
force-pushed
the
feature/libkv-migration
branch
from
680fa6c to
8e81b7e
Compare
nmengin
force-pushed
the
feature/libkv-migration
branch
from
8e81b7e to
2c51cbf
Compare
emilevauge
approved these changes
Nov 17, 2017
nmengin
force-pushed
the
feature/libkv-migration
branch
from
2c51cbf to
8c4a392
Compare
nmengin
force-pushed
the
feature/libkv-migration
branch
from
4e2a0e9 to
f7f86da
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
In the way to migrate fix some bugs with KV store, essentially ETCDV3, this PR migrates Træfik to the abronan libkv fork we have to migrate first stært in the way to fix dependencies.
Motivation
Fixes #926 #1034 #2069 #1974 #1975
More
Additional information
The new libkv version allows connections to ETCD through both
V2andV3API.In the way to avoid breaking change, the parameter
userAPIV3was added to the backend ETCD.Note : Both the Atcd API V2 and the option
userAPIV3are deprecated. More information about deprecated option in proposal #2212.