04d47a93f9
backport from #13467 exclude the same alarm type activated by multiple peers
2021-11-12 14:17:14 -08:00
72d3e382e7
version: 3.4.18
...
Signed-off-by: Sam Batschelet <sbatsche@redhat.com >
v3.4.18
2021-10-15 09:47:08 -04:00
eb9cee9ee3
Merge pull request #13397 from geetasg/release-3.4
...
storage/backend: Add a gauge to indicate if defrag is active (backport)
2021-10-07 19:08:31 +02:00
85abf6e46d
storage/backend: Add a gauge to indicate if defrag is active (backport from 3.6)
2021-10-06 11:04:47 -07:00
1eac258f58
Merge pull request #13385 from hexfusion/cp-13376-release-3.4
...
[release-3.4] Dockerfile: bump debian bullseye-20210927
2021-10-04 08:40:32 +02:00
91da298560
Dockerfile: bump debian bullseye-20210927
...
fixes: CVE-2021-3711, CVE-2021-35942, CVE-2019-9893
Signed-off-by: Sam Batschelet <sbatsche@redhat.com >
2021-10-04 00:32:23 -04:00
19e2e70e4f
version: 3.4.17
...
Signed-off-by: Sam Batschelet <sbatsche@redhat.com >
v3.4.17
2021-10-03 22:30:27 -04:00
8ea187e2cf
Merge pull request #13378 from ysksuzuki/replace-jwt-go
...
Replace github.com/dgrijalva/jwt-go with github.com/golang-jwt/jwt
2021-10-03 21:48:32 -04:00
e63d058247
test: update go to 1.15.15
...
Update go to 1.15.15 which is the latest of 1.15 because linux-amd64-fmt fails with go 1.15.13.
Signed-off-by: Yusuke Suzuki <yusuke-suzuki@cybozu.co.jp >
2021-10-02 10:04:22 +09:00
1558ede7f8
go.mod,go.sum: Replace github.com/dgrijalva/jwt-go with github.com/golang-jwt/jwt
...
github.com/dgrijalva/jwt-go has CVE https://github.com/advisories/GHSA-w73w-5m7g-f7qc
and is already archived. etcd v3.4 should use a community maintained fork
github.com/golang-jwt/jwt which provides the fixed version of the CVE.
Signed-off-by: Yusuke Suzuki <yusuke-suzuki@cybozu.co.jp >
2021-10-02 10:01:52 +09:00
41061e56ad
Merge pull request #13139 from hexfusion/bp-12727
...
[release-3.4]: ClientV3: Ordering: Fix TestEndpointSwitchResolvesViolation test
2021-06-24 10:38:10 -04:00
501d8f01ea
[release-3.4]: ClientV3: Ordering: Fix TestEndpointSwitchResolvesViolation test
...
Signed-off-by: Sam Batschelet <sbatsche@redhat.com >
2021-06-23 21:26:55 -04:00
38669a0709
Merge pull request #13137 from hexfusion/track-modules
...
vendor: track vendor/modules.txt
2021-06-23 14:52:10 -04:00
7489911d51
Merge pull request #13135 from serathius/actions-3.4
...
Migrate PR testing from travis to GitHub actions
2021-06-23 14:03:37 -04:00
15b7954d03
vendor: track vendor/modules.txt
...
Signed-off-by: Sam Batschelet <sbatsche@redhat.com >
2021-06-23 13:56:39 -04:00
6cc1345a0b
Migrate PR testing from travis to GitHub actions
2021-06-23 18:25:29 +02:00
589a6993b8
Merge pull request #13101 from mrueg/backport-12864
...
[backport 3.4] fix check datascale command for https endpoints
2021-06-14 08:19:22 -04:00
4bacd21e20
fix check datascale command for https endpoints
2021-06-11 11:58:20 +02:00
0ecc337028
Merge pull request #13100 from tangcong/automated-cherry-pick-of-#13077-origin-release-3.4
...
[backport 3.4] embed: unlimit the recv msg size of grpc-gateway
2021-06-10 21:29:34 -04:00
628fa1818e
embed: unlimit the recv msg size of grpc-gateway
...
Ensure the client which access etcd via grpc-gateway won't
be limited by the MaxCallRecvMsgSize. Here we choose the same
default value of etcdcli as grpc-gateway's MaxCallRecvMsgSize.
Fix https://github.com/etcd-io/etcd/issues/12576
2021-06-11 08:07:28 +08:00
d19fbe541b
version: 3.4.16
...
Signed-off-by: Gyuho Lee <leegyuho@amazon.com >
v3.4.16
2021-05-12 01:52:43 +00:00
6bbc85827b
Merge pull request #12917 from chaochn47/2021-05-03-backport-#12880
...
Backport-3.4 exclude alarms from health check conditionally
2021-05-06 10:21:09 +02:00
dbde4f2d5e
Backport-3.4 exclude alarms from health check conditionally
2021-05-04 10:37:12 -07:00
15715dcf1a
Merge pull request #12902 from MakDon/release-3.4
...
[Backport-3.4] etcdserver/mvcc: update trace.Step condition
2021-04-28 11:05:35 -07:00
963d3b9369
etcdserver/mvcc: update trace.Step condition
...
backport PR #12894 to release-3.4
2021-04-28 11:35:49 +08:00
ba829044f5
Merge pull request #12888 from chaochn47/2021-04-22-cherry-pick-12871
...
Backport-3.4 etcdserver/util.go: reduce memory when logging range requests
2021-04-23 00:45:20 +02:00
c4eb81af99
Backport-3.4 etcdserver/util.go: reduce memory when logging range requests
2021-04-22 15:07:44 -07:00
ceafa1b33e
Merge pull request #12882 from lilic/bump-go-12
...
.travis,Makefile,functional: Bump go 1.12 version to v1.12.17
2021-04-20 23:33:23 +02:00
5890bc8bd6
.travis,Makefile,functional: Bump go 1.12 version to v1.12.17
...
This version was already used to build the release v3.4.15.
2021-04-20 14:00:44 +02:00
c274aa5ea4
Merge pull request #12849 from lilic/test-go-1-15
...
[release-3.4]: .travis.yml: Test with go v1.15.11
2021-04-19 18:17:05 +02:00
276ee962ec
integration: Fix 'go test --tags cluster_proxy --timeout=30m -v ./integration/...'
...
grpc proxy opens additional 2 watching channels. The metric is shared
between etcd-server & grpc_proxy, so all assertions on number of open
watch channels need to take in consideration the additional "2"
channels.
2021-04-19 16:41:28 +02:00
8d1b8335e3
pkg/tlsutil: Adjust cipher suites for go 1.12
...
Cherry-pick of 60e44286fa
from master branch does not work due to
missing `tls.CipherSuites()` function. We work around by using go build
tags for both the building and tests.
2021-04-19 11:49:13 +02:00
c3f447a698
Fix pkg/tlsutil (test) to not fail on 386.
...
In fact this commit rewrites the functionality to use upstream list of
ciphers instead of checking whether the lists are in sync using ast
analysis.
2021-04-19 11:49:13 +02:00
85e037d9c6
bill-of-materials.json: Update golang.org/x/sys
2021-04-19 11:49:13 +02:00
a1691be1bd
.travis,test: Turn race off in Travis for go version 1.15
...
Currently with race it fails, we can enable this at a later point.
2021-04-19 11:49:13 +02:00
df35086b6a
integration : fix TestTLSClientCipherSuitesMismatch in go1.13
...
In go1.13, the TLS13 is enablled by default, and as per go1.13 release notes :
TLS 1.3 cipher suites are not configurable. All supported cipher suites are safe,
and if PreferServerCipherSuites is set in Config the preference order is based
on the available hardware.
Fixing the test case for go1.13 by limiting the TLS version to TLS12
2021-04-19 11:18:14 +02:00
eeefd614c8
vendor: Run go mod vendor
2021-04-19 11:18:14 +02:00
4276c33026
go.mod,go.sum: Bump github.com/creack/pty that includes patch
...
This patch is needed due to go 1.15 erroring on:
"Setctty set but Ctty not valid in child".
2021-04-19 11:18:13 +02:00
cfc08e5f06
go.mod,go.sum: Comply with go v1.15
2021-04-19 11:18:13 +02:00
0b7e4184e8
etcdserver,wal: Convert int to string using rune()
2021-04-19 11:18:13 +02:00
35bd924596
integration,raft,tests: Comply with go v1.15 gofmt
2021-04-19 11:18:13 +02:00
62596faeed
.travis.yml: Test with go v1.15.11
...
Currently in CI the tests are only run with go v1.12, this adds also go
v1.15.11.
Excludes certain variants for v1.15.
2021-04-19 11:18:13 +02:00
b7e5f5bc12
Merge pull request #12839 from lilic/fix-go-version
...
[release-3.4]: Pin go version in go.mod to 1.12
2021-04-07 17:52:05 +02:00
91bed2e01f
pkpkg/testutil/leak.go: Allowlist created by testing.runTests.func1
2021-04-07 17:20:52 +02:00
b19eb0f339
vendor: Run go mod vendor
2021-04-07 15:25:32 +02:00
8557cb29ba
go.sum, go.mod: Run go mod tidy with go 1.12
2021-04-07 15:25:08 +02:00
ef415e3fe1
go.mod: Pin go to 1.12 version
...
As go 1.12.2 is what is tested in CI as well as recommended to be built
with 1.12.2 we should also pin to this in the go directive version.
2021-04-07 15:21:42 +02:00
82eae9227c
Merge pull request #12803 from cwedgwood/metrics-3.4
...
etcdserver: fix incorrect metrics generated when clients cancel watches
2021-04-01 08:17:37 -04:00
656dc63eab
etcdserver: fix incorrect metrics generated when clients cancel watches
...
Manual cherry-pick of 9571325fe8
for
release-3.4.
2021-03-31 22:59:29 -07:00
30799c97be
Merge pull request #12815 from dbavatar/release-3.4-peervalidation
...
etcdserver: Fix PeerURL validation
2021-03-30 12:54:32 +02:00