From fb7981b6e5c7192ad3e103dbaf1862668d80b911 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 13 Aug 2019 15:07:33 -0700 Subject: [PATCH 1/2] CHANGELOG: --enable-v2=false by default Signed-off-by: Gyuho Lee --- CHANGELOG-3.4.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md index b87c7d6f1..9fa190dbe 100644 --- a/CHANGELOG-3.4.md +++ b/CHANGELOG-3.4.md @@ -86,6 +86,8 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.3.0...v3.4.0) and - Make [`ETCDCTL_API=3 etcdctl` default](https://github.com/etcd-io/etcd/issues/9600). - Now, `etcdctl set foo bar` must be `ETCDCTL_API=2 etcdctl set foo bar`. - Now, `ETCDCTL_API=3 etcdctl put foo bar` could be just `etcdctl put foo bar`. +- Make [`etcd --enable-v2=false` default](https://github.com/etcd-io/etcd/pull/10935). +- Make [`embed.DefaultEnableV2` `false` default](https://github.com/etcd-io/etcd/pull/10935). - **Deprecated `etcd --ca-file` flag**. Use [`etcd --trusted-ca-file`](https://github.com/etcd-io/etcd/pull/9470) instead (`etcd --ca-file` flag has been marked deprecated since v2.1). - **Deprecated `etcd --peer-ca-file` flag**. Use [`etcd --peer-trusted-ca-file`](https://github.com/etcd-io/etcd/pull/9470) instead (`etcd --peer-ca-file` flag has been marked deprecated since v2.1). - **Deprecated `pkg/transport.TLSInfo.CAFile` field**. Use [`pkg/transport.TLSInfo.TrustedCAFile`](https://github.com/etcd-io/etcd/pull/9470) instead (`CAFile` field has been marked deprecated since v2.1). @@ -423,6 +425,7 @@ Note: **v3.5 will deprecate `etcd --log-package-levels` flag for `capnslog`**; ` - Change [**`embed.Config.LogOutputs`** type from `string` to `[]string`](https://github.com/etcd-io/etcd/pull/9579) to support multiple log outputs. - Add [`embed.Config.BackendBatchLimit`](https://github.com/etcd-io/etcd/pull/10283) field. - Add [`embed.Config.BackendBatchInterval`](https://github.com/etcd-io/etcd/pull/10283) field. +- Make [`embed.DefaultEnableV2` `false` default](https://github.com/etcd-io/etcd/pull/10935). ### Package `pkg/adt` From 092ee6d3210270f1e2e4b571e61bacf028d49904 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 13 Aug 2019 15:16:28 -0700 Subject: [PATCH 2/2] Documentation/upgrades: highlight "--enable-v2=false" Signed-off-by: Gyuho Lee --- Documentation/upgrades/upgrade_3_4.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Documentation/upgrades/upgrade_3_4.md b/Documentation/upgrades/upgrade_3_4.md index 4a6fb93d1..b1b3be005 100644 --- a/Documentation/upgrades/upgrade_3_4.md +++ b/Documentation/upgrades/upgrade_3_4.md @@ -35,6 +35,21 @@ OK +etcdctl put foo bar ``` +#### Make `ETCDCTL_API=3 etcdctl` default + +[`etcd --enable-v2=false`](https://github.com/etcd-io/etcd/pull/10935) is now the default. + +This means, unless `etcd --enable-v2=true` is specified, etcd v3.4 server would not serve v2 API requests. + +If v2 API were used, make sure to enable v2 API in v3.4: + +```diff +-etcd ++etcd --enable-v2=true +``` + +Other HTTP APIs will still work (e.g. `[CLIENT-URL]/metrics`, `[CLIENT-URL]/health`, v3 gRPC gateway). + #### Deprecated `etcd --ca-file` and `etcd --peer-ca-file` flags `--ca-file` and `--peer-ca-file` flags are deprecated; they have been deprecated since v2.1.