Skip to content

K
k3s
Commit bb992150 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #35694 from wojtek-t/update_etcd_3_0_13

Automatic merge from submit-queue Update Godeps etcd to 3.0.13 Ref #20504
parents 0e46a5b2 543c2c20
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 133 deletions
Godeps/Godeps.json
View file @ bb992150
...@@ -358,263 +358,263 @@ ...@@ -358,263 +358,263 @@
}, },
{ {
"ImportPath": "github.com/coreos/etcd/alarm", "ImportPath": "github.com/coreos/etcd/alarm",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/auth", "ImportPath": "github.com/coreos/etcd/auth",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/auth/authpb", "ImportPath": "github.com/coreos/etcd/auth/authpb",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/client", "ImportPath": "github.com/coreos/etcd/client",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/clientv3", "ImportPath": "github.com/coreos/etcd/clientv3",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/compactor", "ImportPath": "github.com/coreos/etcd/compactor",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/discovery", "ImportPath": "github.com/coreos/etcd/discovery",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/error", "ImportPath": "github.com/coreos/etcd/error",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/etcdserver", "ImportPath": "github.com/coreos/etcd/etcdserver",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/etcdserver/api", "ImportPath": "github.com/coreos/etcd/etcdserver/api",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/etcdserver/api/v2http", "ImportPath": "github.com/coreos/etcd/etcdserver/api/v2http",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/etcdserver/api/v2http/httptypes", "ImportPath": "github.com/coreos/etcd/etcdserver/api/v2http/httptypes",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/etcdserver/api/v3rpc", "ImportPath": "github.com/coreos/etcd/etcdserver/api/v3rpc",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes", "ImportPath": "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/etcdserver/auth", "ImportPath": "github.com/coreos/etcd/etcdserver/auth",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/etcdserver/etcdserverpb", "ImportPath": "github.com/coreos/etcd/etcdserver/etcdserverpb",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/etcdserver/membership", "ImportPath": "github.com/coreos/etcd/etcdserver/membership",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/etcdserver/stats", "ImportPath": "github.com/coreos/etcd/etcdserver/stats",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/integration", "ImportPath": "github.com/coreos/etcd/integration",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/lease", "ImportPath": "github.com/coreos/etcd/lease",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/lease/leasehttp", "ImportPath": "github.com/coreos/etcd/lease/leasehttp",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/lease/leasepb", "ImportPath": "github.com/coreos/etcd/lease/leasepb",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/mvcc", "ImportPath": "github.com/coreos/etcd/mvcc",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/mvcc/backend", "ImportPath": "github.com/coreos/etcd/mvcc/backend",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/mvcc/mvccpb", "ImportPath": "github.com/coreos/etcd/mvcc/mvccpb",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/adt", "ImportPath": "github.com/coreos/etcd/pkg/adt",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/contention", "ImportPath": "github.com/coreos/etcd/pkg/contention",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/crc", "ImportPath": "github.com/coreos/etcd/pkg/crc",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/fileutil", "ImportPath": "github.com/coreos/etcd/pkg/fileutil",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/httputil", "ImportPath": "github.com/coreos/etcd/pkg/httputil",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/idutil", "ImportPath": "github.com/coreos/etcd/pkg/idutil",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/ioutil", "ImportPath": "github.com/coreos/etcd/pkg/ioutil",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/logutil", "ImportPath": "github.com/coreos/etcd/pkg/logutil",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/netutil", "ImportPath": "github.com/coreos/etcd/pkg/netutil",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/pathutil", "ImportPath": "github.com/coreos/etcd/pkg/pathutil",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/pbutil", "ImportPath": "github.com/coreos/etcd/pkg/pbutil",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/runtime", "ImportPath": "github.com/coreos/etcd/pkg/runtime",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/schedule", "ImportPath": "github.com/coreos/etcd/pkg/schedule",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/testutil", "ImportPath": "github.com/coreos/etcd/pkg/testutil",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/tlsutil", "ImportPath": "github.com/coreos/etcd/pkg/tlsutil",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/transport", "ImportPath": "github.com/coreos/etcd/pkg/transport",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/types", "ImportPath": "github.com/coreos/etcd/pkg/types",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/pkg/wait", "ImportPath": "github.com/coreos/etcd/pkg/wait",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/raft", "ImportPath": "github.com/coreos/etcd/raft",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/raft/raftpb", "ImportPath": "github.com/coreos/etcd/raft/raftpb",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/rafthttp", "ImportPath": "github.com/coreos/etcd/rafthttp",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/snap", "ImportPath": "github.com/coreos/etcd/snap",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/snap/snappb", "ImportPath": "github.com/coreos/etcd/snap/snappb",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/store", "ImportPath": "github.com/coreos/etcd/store",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/version", "ImportPath": "github.com/coreos/etcd/version",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/wal", "ImportPath": "github.com/coreos/etcd/wal",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/etcd/wal/walpb", "ImportPath": "github.com/coreos/etcd/wal/walpb",
"Comment": "v3.0.12", "Comment": "v3.0.13",
"Rev": "2d1e2e8e646e65f73ca0d9ee905a5343d6135a50" "Rev": "c99d0d4b255f0dfc117b59555c89933192237c27"
}, },
{ {
"ImportPath": "github.com/coreos/go-oidc/http", "ImportPath": "github.com/coreos/go-oidc/http",
......
build-tools/build-image/cross/Dockerfile
View file @ bb992150
...@@ -72,7 +72,7 @@ RUN mkdir $TMPDIR \ ...@@ -72,7 +72,7 @@ RUN mkdir $TMPDIR \
github.com/jteeuwen/go-bindata/go-bindata github.com/jteeuwen/go-bindata/go-bindata
# Download and symlink etcd. We need this for our integration tests. # Download and symlink etcd. We need this for our integration tests.
RUN export ETCD_VERSION=v3.0.10; \ RUN export ETCD_VERSION=v3.0.13; \
mkdir -p /usr/local/src/etcd \ mkdir -p /usr/local/src/etcd \
&& cd /usr/local/src/etcd \ && cd /usr/local/src/etcd \
&& curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz | tar -xz \ && curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz | tar -xz \
......
cluster/images/etcd/Makefile
View file @ bb992150
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# Build the etcd image # Build the etcd image
# #
# Usage: # Usage:
# [TAGS=2.2.1 2.3.7 3.0.12] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) # [TAGS=2.2.1 2.3.7 3.0.13] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
# The image contains different etcd versions to simplify # The image contains different etcd versions to simplify
# upgrades. Thus be careful when removing any tag from here. # upgrades. Thus be careful when removing any tag from here.
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
# Except from etcd-$(tag) and etcdctl-$(tag) binaries, we also # Except from etcd-$(tag) and etcdctl-$(tag) binaries, we also
# need etcd and etcdctl binaries for backward compatibility reasons. # need etcd and etcdctl binaries for backward compatibility reasons.
# That binary will be set to the last tag from $(TAGS). # That binary will be set to the last tag from $(TAGS).
TAGS?=2.2.1 2.3.7 3.0.12 TAGS?=2.2.1 2.3.7 3.0.13
REGISTRY_TAG?=3.0.12 REGISTRY_TAG?=3.0.13
ARCH?=amd64 ARCH?=amd64
REGISTRY?=gcr.io/google_containers REGISTRY?=gcr.io/google_containers
GOLANG_VERSION?=1.6.3 GOLANG_VERSION?=1.6.3
......
cluster/images/etcd/migrate-if-needed.sh
View file @ bb992150
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
# This script performs etcd upgrade based on the following environmental # This script performs etcd upgrade based on the following environmental
# variables: # variables:
# TARGET_STORAGE - API of etcd to be used (supported: 'etcd2', 'etcd3') # TARGET_STORAGE - API of etcd to be used (supported: 'etcd2', 'etcd3')
# TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.12') # TARGET_VERSION - etcd release to be used (supported: '2.2.1', '2.3.7', '3.0.13')
# DATA_DIRECTORY - directory with etcd data # DATA_DIRECTORY - directory with etcd data
# #
# The current etcd version and storage format is detected based on the # The current etcd version and storage format is detected based on the
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
# #
# The update workflow support the following upgrade steps: # The update workflow support the following upgrade steps:
# - 2.2.1/etcd2 -> 2.3.7/etcd2 # - 2.2.1/etcd2 -> 2.3.7/etcd2
# - 2.3.7/etcd2 -> 3.0.12/etcd2 # - 2.3.7/etcd2 -> 3.0.13/etcd2
# - 3.0.12/etcd2 -> 3.0.12/etcd3 # - 3.0.13/etcd2 -> 3.0.13/etcd3
# #
# NOTE: The releases supported in this script has to match release binaries # NOTE: The releases supported in this script has to match release binaries
# present in the etcd image (to make this script work correctly). # present in the etcd image (to make this script work correctly).
...@@ -60,7 +60,7 @@ fi ...@@ -60,7 +60,7 @@ fi
# NOTE: SUPPORTED_VERSION has to match release binaries present in the # NOTE: SUPPORTED_VERSION has to match release binaries present in the
# etcd image (to make this script work correctly). # etcd image (to make this script work correctly).
# We cannot use array since sh doesn't support it. # We cannot use array since sh doesn't support it.
SUPPORTED_VERSIONS_STRING="2.2.1 2.3.7 3.0.12" SUPPORTED_VERSIONS_STRING="2.2.1 2.3.7 3.0.13"
SUPPORTED_VERSIONS=$(echo "${SUPPORTED_VERSIONS_STRING}" | tr " " "\n") SUPPORTED_VERSIONS=$(echo "${SUPPORTED_VERSIONS_STRING}" | tr " " "\n")
VERSION_FILE="version.txt" VERSION_FILE="version.txt"
......
hack/lib/etcd.sh
View file @ bb992150
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# A set of helpers for starting/running etcd for tests # A set of helpers for starting/running etcd for tests
ETCD_VERSION=${ETCD_VERSION:-3.0.10} ETCD_VERSION=${ETCD_VERSION:-3.0.13}
ETCD_HOST=${ETCD_HOST:-127.0.0.1} ETCD_HOST=${ETCD_HOST:-127.0.0.1}
ETCD_PORT=${ETCD_PORT:-2379} ETCD_PORT=${ETCD_PORT:-2379}
......
hack/test-update-storage-objects.sh
View file @ bb992150
...@@ -160,7 +160,7 @@ killApiServer ...@@ -160,7 +160,7 @@ killApiServer
kube::etcd::stop kube::etcd::stop
TARGET_STORAGE="etcd3" \ TARGET_STORAGE="etcd3" \
TARGET_VERSION="3.0.12" \ TARGET_VERSION="3.0.13" \
DATA_DIRECTORY="${ETCD_DIR}" \ DATA_DIRECTORY="${ETCD_DIR}" \
ETCD=$(which etcd) \ ETCD=$(which etcd) \
ETCDCTL=$(which etcdctl) \ ETCDCTL=$(which etcdctl) \
......
vendor/github.com/coreos/etcd/auth/store.go
View file @ bb992150
...@@ -603,6 +603,11 @@ func (as *authStore) isOpPermitted(userName string, key, rangeEnd []byte, permTy ...@@ -603,6 +603,11 @@ func (as *authStore) isOpPermitted(userName string, key, rangeEnd []byte, permTy
return false return false
} }
// root role should have permission on all ranges
if hasRootRole(user) {
return true
}
if as.isRangeOpPermitted(tx, userName, key, rangeEnd, permTyp) { if as.isRangeOpPermitted(tx, userName, key, rangeEnd, permTyp) {
return true return true
} }
......
vendor/github.com/coreos/etcd/etcdserver/server.go
View file @ bb992150
...@@ -154,13 +154,13 @@ type Server interface { ...@@ -154,13 +154,13 @@ type Server interface {
// EtcdServer is the production implementation of the Server interface // EtcdServer is the production implementation of the Server interface
type EtcdServer struct { type EtcdServer struct {
// r and inflightSnapshots must be the first elements to keep 64-bit alignment for atomic // inflightSnapshots holds count the number of snapshots currently inflight.
// access to fields inflightSnapshots int64 // must use atomic operations to access; keep 64-bit aligned.
appliedIndex uint64 // must use atomic operations to access; keep 64-bit aligned.
// count the number of inflight snapshots. // consistIndex used to hold the offset of current executing entry
// MUST use atomic operation to access this field. // It is initialized to 0 before executing any entry.
inflightSnapshots int64 consistIndex consistentIndex // must use atomic operations to access; keep 64-bit aligned.
Cfg *ServerConfig Cfg *ServerConfig
readych chan struct{} readych chan struct{}
r raftNode r raftNode
...@@ -195,10 +195,6 @@ type EtcdServer struct { ...@@ -195,10 +195,6 @@ type EtcdServer struct {
// compactor is used to auto-compact the KV. // compactor is used to auto-compact the KV.
compactor *compactor.Periodic compactor *compactor.Periodic
// consistent index used to hold the offset of current executing entry
// It is initialized to 0 before executing any entry.
consistIndex consistentIndex
// peerRt used to send requests (version, lease) to peers. // peerRt used to send requests (version, lease) to peers.
peerRt http.RoundTripper peerRt http.RoundTripper
reqIDGen *idutil.Generator reqIDGen *idutil.Generator
...@@ -212,8 +208,6 @@ type EtcdServer struct { ...@@ -212,8 +208,6 @@ type EtcdServer struct {
// wg is used to wait for the go routines that depends on the server state // wg is used to wait for the go routines that depends on the server state
// to exit when stopping the server. // to exit when stopping the server.
wg sync.WaitGroup wg sync.WaitGroup
appliedIndex uint64
} }
// NewServer creates a new EtcdServer from the supplied configuration. The // NewServer creates a new EtcdServer from the supplied configuration. The
......
vendor/github.com/coreos/etcd/mvcc/kvstore.go
View file @ bb992150
...@@ -408,6 +408,13 @@ func (s *store) restore() error { ...@@ -408,6 +408,13 @@ func (s *store) restore() error {
s.currentRev = rev s.currentRev = rev
} }
// keys in the range [compacted revision -N, compaction] might all be deleted due to compaction.
// the correct revision should be set to compaction revision in the case, not the largest revision
// we have seen.
if s.currentRev.main < s.compactMainRev {
s.currentRev.main = s.compactMainRev
}
for key, lid := range keyToLease { for key, lid := range keyToLease {
if s.le == nil { if s.le == nil {
panic("no lessor to attach lease") panic("no lessor to attach lease")
......
vendor/github.com/coreos/etcd/raft/node.go
View file @ bb992150
...@@ -38,7 +38,7 @@ var ( ...@@ -38,7 +38,7 @@ var (
// SoftState provides state that is useful for logging and debugging. // SoftState provides state that is useful for logging and debugging.
// The state is volatile and does not need to be persisted to the WAL. // The state is volatile and does not need to be persisted to the WAL.
type SoftState struct { type SoftState struct {
Lead uint64 Lead uint64 // must use atomic operations to access; keep 64-bit aligned.
RaftState StateType RaftState StateType
} }
......
vendor/github.com/coreos/etcd/raft/raftpb/raft.pb.go
View file @ bb992150
...@@ -183,9 +183,9 @@ func (x *ConfChangeType) UnmarshalJSON(data []byte) error { ...@@ -183,9 +183,9 @@ func (x *ConfChangeType) UnmarshalJSON(data []byte) error {
func (ConfChangeType) EnumDescriptor() ([]byte, []int) { return fileDescriptorRaft, []int{2} } func (ConfChangeType) EnumDescriptor() ([]byte, []int) { return fileDescriptorRaft, []int{2} }
type Entry struct { type Entry struct {
Type EntryType `protobuf:"varint,1,opt,name=Type,json=type,enum=raftpb.EntryType" json:"Type"`
Term uint64 `protobuf:"varint,2,opt,name=Term,json=term" json:"Term"` Term uint64 `protobuf:"varint,2,opt,name=Term,json=term" json:"Term"`
Index uint64 `protobuf:"varint,3,opt,name=Index,json=index" json:"Index"` Index uint64 `protobuf:"varint,3,opt,name=Index,json=index" json:"Index"`
Type EntryType `protobuf:"varint,1,opt,name=Type,json=type,enum=raftpb.EntryType" json:"Type"`
Data []byte `protobuf:"bytes,4,opt,name=Data,json=data" json:"Data,omitempty"` Data []byte `protobuf:"bytes,4,opt,name=Data,json=data" json:"Data,omitempty"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
} }
......
vendor/github.com/coreos/etcd/raft/raftpb/raft.proto
View file @ bb992150
...@@ -15,9 +15,9 @@ enum EntryType { ...@@ -15,9 +15,9 @@ enum EntryType {
} }
message Entry { message Entry {
optional uint64 Term = 2 [(gogoproto.nullable) = false]; // must be 64-bit aligned for atomic operations
optional uint64 Index = 3 [(gogoproto.nullable) = false]; // must be 64-bit aligned for atomic operations
optional EntryType Type = 1 [(gogoproto.nullable) = false]; optional EntryType Type = 1 [(gogoproto.nullable) = false];
optional uint64 Term = 2 [(gogoproto.nullable) = false];
optional uint64 Index = 3 [(gogoproto.nullable) = false];
optional bytes Data = 4; optional bytes Data = 4;
} }
......
vendor/github.com/coreos/etcd/version/version.go
View file @ bb992150
...@@ -29,7 +29,7 @@ import ( ...@@ -29,7 +29,7 @@ import (
var ( var (
// MinClusterVersion is the min cluster version this etcd binary is compatible with. // MinClusterVersion is the min cluster version this etcd binary is compatible with.
MinClusterVersion = "2.3.0" MinClusterVersion = "2.3.0"
Version = "3.0.12" Version = "3.0.13"
// Git SHA Value will be set during build // Git SHA Value will be set during build
GitSHA = "Not provided (use ./build instead of go build)" GitSHA = "Not provided (use ./build instead of go build)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment