Skip to content

Commit 616e8db

Browse files
dpernydperny
authored
Merge pull request moby#3051 from crazy-max/grpc-update
etcd 3.5 and upgrade grpc/protobuf
2 parents cfa939c + 310cbe4 commit 616e8db

2,852 files changed

Lines changed: 608711 additions & 60082 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
vendor.mod linguist-language=Go-Module
2+
vendor.sum linguist-language=Go-Checksums

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ FROM ${GOLANG_IMAGE}
99
RUN apt-get update && apt-get install -y make git unzip
1010

1111
# should stay consistent with the version in .circleci/config.yml
12-
ARG PROTOC_VERSION=3.6.1
12+
ARG PROTOC_VERSION=3.11.4
1313
# download and install protoc binary and .proto files
1414
RUN curl --silent --show-error --location --output protoc.zip \
15-
https://github.com/google/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-linux-x86_64.zip \
15+
https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-linux-x86_64.zip \
1616
&& unzip -d /usr/local protoc.zip include/\* bin/\* \
1717
&& rm -f protoc.zip
1818

‎api/api.pb.txt‎

Lines changed: 120 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10433,7 +10433,7 @@ file {
1043310433
syntax: "proto3"
1043410434
}
1043510435
file {
10436-
name: "github.com/coreos/etcd/raft/raftpb/raft.proto"
10436+
name: "go.etcd.io/etcd/raft/v3/raftpb/raft.proto"
1043710437
package: "raftpb"
1043810438
dependency: "gogoproto/gogo.proto"
1043910439
message_type {
@@ -10691,11 +10691,11 @@ file {
1069110691
message_type {
1069210692
name: "ConfState"
1069310693
field {
10694-
name: "nodes"
10694+
name: "voters"
1069510695
number: 1
1069610696
label: LABEL_REPEATED
1069710697
type: TYPE_UINT64
10698-
json_name: "nodes"
10698+
json_name: "voters"
1069910699
}
1070010700
field {
1070110701
name: "learners"
@@ -10704,46 +10704,129 @@ file {
1070410704
type: TYPE_UINT64
1070510705
json_name: "learners"
1070610706
}
10707+
field {
10708+
name: "voters_outgoing"
10709+
number: 3
10710+
label: LABEL_REPEATED
10711+
type: TYPE_UINT64
10712+
json_name: "votersOutgoing"
10713+
}
10714+
field {
10715+
name: "learners_next"
10716+
number: 4
10717+
label: LABEL_REPEATED
10718+
type: TYPE_UINT64
10719+
json_name: "learnersNext"
10720+
}
10721+
field {
10722+
name: "auto_leave"
10723+
number: 5
10724+
label: LABEL_OPTIONAL
10725+
type: TYPE_BOOL
10726+
options {
10727+
65001: 0
10728+
}
10729+
json_name: "autoLeave"
10730+
}
1070710731
}
1070810732
message_type {
1070910733
name: "ConfChange"
1071010734
field {
10711-
name: "ID"
10735+
name: "type"
10736+
number: 2
10737+
label: LABEL_OPTIONAL
10738+
type: TYPE_ENUM
10739+
type_name: ".raftpb.ConfChangeType"
10740+
options {
10741+
65001: 0
10742+
}
10743+
json_name: "type"
10744+
}
10745+
field {
10746+
name: "node_id"
10747+
number: 3
10748+
label: LABEL_OPTIONAL
10749+
type: TYPE_UINT64
10750+
options {
10751+
65001: 0
10752+
65004: "NodeID"
10753+
}
10754+
json_name: "nodeId"
10755+
}
10756+
field {
10757+
name: "context"
10758+
number: 4
10759+
label: LABEL_OPTIONAL
10760+
type: TYPE_BYTES
10761+
json_name: "context"
10762+
}
10763+
field {
10764+
name: "id"
1071210765
number: 1
1071310766
label: LABEL_OPTIONAL
1071410767
type: TYPE_UINT64
1071510768
options {
1071610769
65001: 0
10770+
65004: "ID"
1071710771
}
10718-
json_name: "ID"
10772+
json_name: "id"
1071910773
}
10774+
}
10775+
message_type {
10776+
name: "ConfChangeSingle"
1072010777
field {
10721-
name: "Type"
10722-
number: 2
10778+
name: "type"
10779+
number: 1
1072310780
label: LABEL_OPTIONAL
1072410781
type: TYPE_ENUM
1072510782
type_name: ".raftpb.ConfChangeType"
1072610783
options {
1072710784
65001: 0
1072810785
}
10729-
json_name: "Type"
10786+
json_name: "type"
1073010787
}
1073110788
field {
10732-
name: "NodeID"
10733-
number: 3
10789+
name: "node_id"
10790+
number: 2
1073410791
label: LABEL_OPTIONAL
1073510792
type: TYPE_UINT64
1073610793
options {
1073710794
65001: 0
10795+
65004: "NodeID"
1073810796
}
10739-
json_name: "NodeID"
10797+
json_name: "nodeId"
1074010798
}
10799+
}
10800+
message_type {
10801+
name: "ConfChangeV2"
1074110802
field {
10742-
name: "Context"
10743-
number: 4
10803+
name: "transition"
10804+
number: 1
10805+
label: LABEL_OPTIONAL
10806+
type: TYPE_ENUM
10807+
type_name: ".raftpb.ConfChangeTransition"
10808+
options {
10809+
65001: 0
10810+
}
10811+
json_name: "transition"
10812+
}
10813+
field {
10814+
name: "changes"
10815+
number: 2
10816+
label: LABEL_REPEATED
10817+
type: TYPE_MESSAGE
10818+
type_name: ".raftpb.ConfChangeSingle"
10819+
options {
10820+
65001: 0
10821+
}
10822+
json_name: "changes"
10823+
}
10824+
field {
10825+
name: "context"
10826+
number: 3
1074410827
label: LABEL_OPTIONAL
1074510828
type: TYPE_BYTES
10746-
json_name: "Context"
10829+
json_name: "context"
1074710830
}
1074810831
}
1074910832
enum_type {
@@ -10756,6 +10839,10 @@ file {
1075610839
name: "EntryConfChange"
1075710840
number: 1
1075810841
}
10842+
value {
10843+
name: "EntryConfChangeV2"
10844+
number: 2
10845+
}
1075910846
}
1076010847
enum_type {
1076110848
name: "MessageType"
@@ -10836,6 +10923,21 @@ file {
1083610923
number: 18
1083710924
}
1083810925
}
10926+
enum_type {
10927+
name: "ConfChangeTransition"
10928+
value {
10929+
name: "ConfChangeTransitionAuto"
10930+
number: 0
10931+
}
10932+
value {
10933+
name: "ConfChangeTransitionJointImplicit"
10934+
number: 1
10935+
}
10936+
value {
10937+
name: "ConfChangeTransitionJointExplicit"
10938+
number: 2
10939+
}
10940+
}
1083910941
enum_type {
1084010942
name: "ConfChangeType"
1084110943
value {
@@ -10861,14 +10963,17 @@ file {
1086110963
63017: 1
1086210964
63018: 1
1086310965
63020: 1
10966+
63026: 0
10967+
63034: 0
10968+
63035: 0
1086410969
}
1086510970
}
1086610971
file {
1086710972
name: "github.com/docker/swarmkit/api/raft.proto"
1086810973
package: "docker.swarmkit.v1"
1086910974
dependency: "github.com/docker/swarmkit/api/objects.proto"
1087010975
dependency: "github.com/docker/swarmkit/api/types.proto"
10871-
dependency: "github.com/coreos/etcd/raft/raftpb/raft.proto"
10976+
dependency: "go.etcd.io/etcd/raft/v3/raftpb/raft.proto"
1087210977
dependency: "gogoproto/gogo.proto"
1087310978
dependency: "github.com/docker/swarmkit/protobuf/plugin/plugin.proto"
1087410979
message_type {

‎api/raft.pb.go‎

Lines changed: 66 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/raft.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package docker.swarmkit.v1;
44

55
import "github.com/docker/swarmkit/api/objects.proto";
66
import "github.com/docker/swarmkit/api/types.proto";
7-
import "github.com/coreos/etcd/raft/raftpb/raft.proto";
7+
import "go.etcd.io/etcd/raft/v3/raftpb/raft.proto";
88
import weak "gogoproto/gogo.proto";
99
import weak "github.com/docker/swarmkit/protobuf/plugin/plugin.proto";
1010

0 commit comments

Comments
 (0)