Merge pull request #3051 from crazy-max/grpc-update

etcd 3.5 and upgrade grpc/protobuf

.gitattributes

@@ -0,0 +1,2 @@
+vendor.mod linguist-language=Go-Module
+vendor.sum linguist-language=Go-Checksums

Dockerfile

@@ -9,10 +9,10 @@ FROM ${GOLANG_IMAGE}
 RUN apt-get update && apt-get install -y make git unzip
 
 # should stay consistent with the version in .circleci/config.yml
-ARG PROTOC_VERSION=3.6.1
+ARG PROTOC_VERSION=3.11.4
 # download and install protoc binary and .proto files
 RUN curl --silent --show-error --location --output protoc.zip \
-  https://github.com/google/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-linux-x86_64.zip \
+  https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-linux-x86_64.zip \
   && unzip -d /usr/local protoc.zip include/\* bin/\* \
   && rm -f protoc.zip
 

api/api.pb.txt

@@ -10433,7 +10433,7 @@ file {
   syntax: "proto3"
 }
 file {
-  name: "github.com/coreos/etcd/raft/raftpb/raft.proto"
+  name: "go.etcd.io/etcd/raft/v3/raftpb/raft.proto"
   package: "raftpb"
   dependency: "gogoproto/gogo.proto"
   message_type {
@@ -10691,11 +10691,11 @@ file {
   message_type {
     name: "ConfState"
     field {
-      name: "nodes"
+      name: "voters"
       number: 1
       label: LABEL_REPEATED
       type: TYPE_UINT64
-      json_name: "nodes"
+      json_name: "voters"
     }
     field {
       name: "learners"
@@ -10704,46 +10704,129 @@ file {
       type: TYPE_UINT64
       json_name: "learners"
     }
+    field {
+      name: "voters_outgoing"
+      number: 3
+      label: LABEL_REPEATED
+      type: TYPE_UINT64
+      json_name: "votersOutgoing"
+    }
+    field {
+      name: "learners_next"
+      number: 4
+      label: LABEL_REPEATED
+      type: TYPE_UINT64
+      json_name: "learnersNext"
+    }
+    field {
+      name: "auto_leave"
+      number: 5
+      label: LABEL_OPTIONAL
+      type: TYPE_BOOL
+      options {
+        65001: 0
+      }
+      json_name: "autoLeave"
+    }
   }
   message_type {
     name: "ConfChange"
     field {
-      name: "ID"
+      name: "type"
+      number: 2
+      label: LABEL_OPTIONAL
+      type: TYPE_ENUM
+      type_name: ".raftpb.ConfChangeType"
+      options {
+        65001: 0
+      }
+      json_name: "type"
+    }
+    field {
+      name: "node_id"
+      number: 3
+      label: LABEL_OPTIONAL
+      type: TYPE_UINT64
+      options {
+        65001: 0
+        65004: "NodeID"
+      }
+      json_name: "nodeId"
+    }
+    field {
+      name: "context"
+      number: 4
+      label: LABEL_OPTIONAL
+      type: TYPE_BYTES
+      json_name: "context"
+    }
+    field {
+      name: "id"
       number: 1
       label: LABEL_OPTIONAL
       type: TYPE_UINT64
       options {
         65001: 0
+        65004: "ID"
       }
-      json_name: "ID"
+      json_name: "id"
     }
+  }
+  message_type {
+    name: "ConfChangeSingle"
     field {
-      name: "Type"
-      number: 2
+      name: "type"
+      number: 1
       label: LABEL_OPTIONAL
       type: TYPE_ENUM
       type_name: ".raftpb.ConfChangeType"
       options {
         65001: 0
       }
-      json_name: "Type"
+      json_name: "type"
     }
     field {
-      name: "NodeID"
-      number: 3
+      name: "node_id"
+      number: 2
       label: LABEL_OPTIONAL
       type: TYPE_UINT64
       options {
         65001: 0
+        65004: "NodeID"
       }
-      json_name: "NodeID"
+      json_name: "nodeId"
     }
+  }
+  message_type {
+    name: "ConfChangeV2"
     field {
-      name: "Context"
-      number: 4
+      name: "transition"
+      number: 1
+      label: LABEL_OPTIONAL
+      type: TYPE_ENUM
+      type_name: ".raftpb.ConfChangeTransition"
+      options {
+        65001: 0
+      }
+      json_name: "transition"
+    }
+    field {
+      name: "changes"
+      number: 2
+      label: LABEL_REPEATED
+      type: TYPE_MESSAGE
+      type_name: ".raftpb.ConfChangeSingle"
+      options {
+        65001: 0
+      }
+      json_name: "changes"
+    }
+    field {
+      name: "context"
+      number: 3
       label: LABEL_OPTIONAL
       type: TYPE_BYTES
-      json_name: "Context"
+      json_name: "context"
     }
   }
   enum_type {
@@ -10756,6 +10839,10 @@ file {
       name: "EntryConfChange"
       number: 1
     }
+    value {
+      name: "EntryConfChangeV2"
+      number: 2
+    }
   }
   enum_type {
     name: "MessageType"
@@ -10836,6 +10923,21 @@ file {
       number: 18
     }
   }
+  enum_type {
+    name: "ConfChangeTransition"
+    value {
+      name: "ConfChangeTransitionAuto"
+      number: 0
+    }
+    value {
+      name: "ConfChangeTransitionJointImplicit"
+      number: 1
+    }
+    value {
+      name: "ConfChangeTransitionJointExplicit"
+      number: 2
+    }
+  }
   enum_type {
     name: "ConfChangeType"
     value {
@@ -10861,14 +10963,17 @@ file {
     63017: 1
     63018: 1
     63020: 1
+    63026: 0
+    63034: 0
+    63035: 0
   }
 }
 file {
   name: "github.com/docker/swarmkit/api/raft.proto"
   package: "docker.swarmkit.v1"
   dependency: "github.com/docker/swarmkit/api/objects.proto"
   dependency: "github.com/docker/swarmkit/api/types.proto"
-  dependency: "github.com/coreos/etcd/raft/raftpb/raft.proto"
+  dependency: "go.etcd.io/etcd/raft/v3/raftpb/raft.proto"
   dependency: "gogoproto/gogo.proto"
   dependency: "github.com/docker/swarmkit/protobuf/plugin/plugin.proto"
   message_type {

api/raft.proto

@@ -4,7 +4,7 @@ package docker.swarmkit.v1;
 
 import "github.com/docker/swarmkit/api/objects.proto";
 import "github.com/docker/swarmkit/api/types.proto";
-import "github.com/coreos/etcd/raft/raftpb/raft.proto";
+import "go.etcd.io/etcd/raft/v3/raftpb/raft.proto";
 import weak "gogoproto/gogo.proto";
 import weak "github.com/docker/swarmkit/protobuf/plugin/plugin.proto";