Support Etcd v3, enhance KV support #2407

nmengin · 2017-11-14T16:01:07Z

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

Added example for manual tests

Additional information

The new libkv version allows connections to ETCD through both V2 and V3 API.
In the way to avoid breaking change, the parameter userAPIV3 was added to the backend ETCD.

Note : Both the Atcd API V2 and the option userAPIV3 are deprecated. More information about deprecated option in proposal #2212.

juliens

LGTM

mmatur · 2017-11-16T06:24:13Z

glide.yaml

@@ -36,13 +36,19 @@ import:
  - tlsconfig
 - package: github.com/docker/go-units
  version: 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1
+- package: github.com/coreos/etcd
+  version: v3.2.9


Just a question. Why it is not the same version that is present in docker compose file v3.2.9 <> v3.2.7

Modification done in the docker-compose fileS.

mmatur · 2017-11-16T06:26:37Z

integration/etcd_test.go

@@ -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))


Could you please replace 1000*time.Millisecond with 1*time.Second

mmatur

LGTM 👏

ldez

LGTM 👍

emilevauge

Thanks a lot @nmengin 😍
Few minor comments but overall, looks very good to me :)

emilevauge · 2017-11-17T10:37:12Z

docs/configuration/backends/etcd.md

+
+!!! 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.


s/will be/is

emilevauge · 2017-11-17T10:40:50Z

examples/cluster/manage_cluster_docker_environment.sh

+    esac
+}
+
+main $@


247 lines of fun ;)

Are we sure we want to maintain this in the repo ?

@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...

emilevauge · 2017-11-17T10:46:07Z

provider/etcd/etcd.go

+		etcdv3.Register()
+		p.SetStoreType(store.ETCDV3)
+	} else {
+		log.Warn("The ETCD API V2 is deprecated. Please use API V3 instead")


Could you add a comment // TODO: Deprecated before ?

I have some remark

traefiker added area/provider/etcd size/S status/0-needs-triage labels Nov 14, 2017

nmengin added area/cluster area/provider bot/no-merge kind/enhancement a new or improved feature. status/3-needs-merge size/S and removed area/provider/etcd size/S status/0-needs-triage labels Nov 14, 2017

juliens approved these changes Nov 14, 2017

View reviewed changes

ldez added status/2-needs-review contributor/needs-resolve-conflicts contributor/waiting-for-corrections and removed status/3-needs-merge bot/no-merge labels Nov 14, 2017

nmengin force-pushed the feature/libkv-migration branch from 7f770cd to 2de94fa Compare November 15, 2017 09:48

nmengin removed the contributor/needs-resolve-conflicts label Nov 15, 2017

ldez added the contributor/needs-resolve-conflicts label Nov 15, 2017

nmengin force-pushed the feature/libkv-migration branch from 308f991 to 46be176 Compare November 16, 2017 07:49

nmengin removed the contributor/needs-resolve-conflicts label Nov 16, 2017

nmengin added this to the 1.5 milestone Nov 16, 2017

mmatur requested changes Nov 16, 2017

View reviewed changes

nmengin force-pushed the feature/libkv-migration branch from 46be176 to 38df4a1 Compare November 16, 2017 08:05

nmengin removed the contributor/waiting-for-corrections label Nov 16, 2017

nmengin force-pushed the feature/libkv-migration branch 2 times, most recently from d0a92cb to d2d6830 Compare November 16, 2017 08:57

mmatur approved these changes Nov 16, 2017

View reviewed changes

nmengin force-pushed the feature/libkv-migration branch from 3eb92e5 to 67fbb54 Compare November 17, 2017 09:28

nmengin added 2 commits November 17, 2017 10:46

Update libkv dependency and all its transitive dependencies to use fork

6365afd

Add example

8567a81

nmengin force-pushed the feature/libkv-migration branch from 67fbb54 to 680fa6c Compare November 17, 2017 09:51

ldez previously approved these changes Nov 17, 2017

View reviewed changes

ldez added the bot/no-merge label Nov 17, 2017

emilevauge requested changes Nov 17, 2017

View reviewed changes

traefiker added the contributor/waiting-for-corrections label Nov 17, 2017

nmengin force-pushed the feature/libkv-migration branch from 680fa6c to 8e81b7e Compare November 17, 2017 13:03

nmengin removed the contributor/waiting-for-corrections label Nov 17, 2017

nmengin force-pushed the feature/libkv-migration branch from 8e81b7e to 2c51cbf Compare November 17, 2017 13:24

emilevauge approved these changes Nov 17, 2017

View reviewed changes

nmengin force-pushed the feature/libkv-migration branch from 2c51cbf to 8c4a392 Compare November 17, 2017 15:48

Add Etcd API V2 support to avoid breaking change.

f7f86da

nmengin force-pushed the feature/libkv-migration branch from 4e2a0e9 to f7f86da Compare November 17, 2017 16:06

ldez added status/3-needs-merge and removed bot/no-merge status/2-needs-review labels Nov 17, 2017

traefiker merged commit 66e489a into traefik:master Nov 17, 2017

traefiker removed the status/3-needs-merge label Nov 17, 2017

ldez changed the title ~~Update libkv dependency~~ Support Etcd v3, enhance KV support Nov 17, 2017

nmengin deleted the feature/libkv-migration branch August 3, 2018 12:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support Etcd v3, enhance KV support #2407

Support Etcd v3, enhance KV support #2407

nmengin commented Nov 14, 2017 •

edited

Loading

juliens left a comment

mmatur Nov 16, 2017

nmengin Nov 16, 2017 •

edited

Loading

mmatur Nov 16, 2017

mmatur left a comment

ldez left a comment

emilevauge left a comment

emilevauge Nov 17, 2017

emilevauge Nov 17, 2017

nmengin Nov 17, 2017 •

edited

Loading

emilevauge Nov 17, 2017

+                  esac
+              }
+              main $@

Support Etcd v3, enhance KV support #2407

Support Etcd v3, enhance KV support #2407

Conversation

nmengin commented Nov 14, 2017 • edited Loading

What does this PR do?

Motivation

More

Additional information

juliens left a comment

Choose a reason for hiding this comment

mmatur Nov 16, 2017

Choose a reason for hiding this comment

nmengin Nov 16, 2017 • edited Loading

Choose a reason for hiding this comment

mmatur Nov 16, 2017

Choose a reason for hiding this comment

mmatur left a comment

Choose a reason for hiding this comment

ldez left a comment

Choose a reason for hiding this comment

emilevauge left a comment

Choose a reason for hiding this comment

emilevauge Nov 17, 2017

Choose a reason for hiding this comment

emilevauge Nov 17, 2017

Choose a reason for hiding this comment

nmengin Nov 17, 2017 • edited Loading

Choose a reason for hiding this comment

emilevauge Nov 17, 2017

Choose a reason for hiding this comment

nmengin commented Nov 14, 2017 •

edited

Loading

nmengin Nov 16, 2017 •

edited

Loading

nmengin Nov 17, 2017 •

edited

Loading