Skip to content

regenerate protos and update protoc to v3.14.0, rm deprecated github.com/golang/protobuf dependency #3238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thaJeztah wants to merge 3 commits into
base: master
Choose a base branch
from
+68 −17
Open

regenerate protos and update protoc to v3.14.0, rm deprecated github.com/golang/protobuf dependency #3238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68255c8
regenerate protos
thaJeztah Jun 8, 2026
38aa662
update protoc to v3.14.0
thaJeztah Jun 8, 2026
0b76ced
manager/csi: rm deprecated github.com/golang/protobuf import
thaJeztah Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

ARG GO_VERSION=1.24
ARG PROTOC_VERSION=3.11.4
ARG PROTOC_VERSION=3.14.0
ARG GOLANGCI_LINT_VERSION=v2.1.5
ARG DEBIAN_FRONTEND=noninteractive

Expand Down
69 changes: 60 additions & 9 deletions api/api.pb.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ file {
java_package: "com.google.protobuf"
java_outer_classname: "TimestampProto"
java_multiple_files: true
go_package: "github.com/golang/protobuf/ptypes/timestamp"
go_package: "google.golang.org/protobuf/types/known/timestamppb"
cc_enable_arenas: true
objc_class_prefix: "GPB"
csharp_namespace: "Google.Protobuf.WellKnownTypes"
Expand Down Expand Up @@ -53,7 +53,7 @@ file {
java_package: "com.google.protobuf"
java_outer_classname: "DurationProto"
java_multiple_files: true
go_package: "github.com/golang/protobuf/ptypes/duration"
go_package: "google.golang.org/protobuf/types/known/durationpb"
cc_enable_arenas: true
objc_class_prefix: "GPB"
csharp_namespace: "Google.Protobuf.WellKnownTypes"
Expand Down Expand Up @@ -157,7 +157,7 @@ file {
java_package: "com.google.protobuf"
java_outer_classname: "WrappersProto"
java_multiple_files: true
go_package: "github.com/golang/protobuf/ptypes/wrappers"
go_package: "google.golang.org/protobuf/types/known/wrapperspb"
cc_enable_arenas: true
objc_class_prefix: "GPB"
csharp_namespace: "Google.Protobuf.WellKnownTypes"
Expand Down Expand Up @@ -484,6 +484,13 @@ file {
type_name: ".google.protobuf.FieldOptions"
json_name: "options"
}
field {
name: "proto3_optional"
number: 17
label: LABEL_OPTIONAL
type: TYPE_BOOL
json_name: "proto3Optional"
}
enum_type {
name: "Type"
value {
Expand Down Expand Up @@ -853,7 +860,7 @@ file {
number: 31
label: LABEL_OPTIONAL
type: TYPE_BOOL
default_value: "false"
default_value: "true"
json_name: "ccEnableArenas"
}
field {
Expand Down Expand Up @@ -1405,7 +1412,7 @@ file {
java_package: "com.google.protobuf"
java_outer_classname: "DescriptorProtos"
optimize_for: SPEED
go_package: "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"
go_package: "google.golang.org/protobuf/types/descriptorpb"
cc_enable_arenas: true
objc_class_prefix: "GPB"
csharp_namespace: "Google.Protobuf.Reflection"
Expand Down Expand Up @@ -5208,7 +5215,7 @@ file {
java_package: "com.google.protobuf"
java_outer_classname: "AnyProto"
java_multiple_files: true
go_package: "github.com/golang/protobuf/ptypes/any"
go_package: "google.golang.org/protobuf/types/known/anypb"
objc_class_prefix: "GPB"
csharp_namespace: "Google.Protobuf.WellKnownTypes"
}
Expand Down Expand Up @@ -10590,7 +10597,7 @@ file {
syntax: "proto3"
}
file {
name: "go.etcd.io/etcd/raft/v3/raftpb/raft.proto"
name: "go.etcd.io/raft/v3/raftpb/raft.proto"
package: "raftpb"
dependency: "gogoproto/gogo.proto"
message_type {
Expand Down Expand Up @@ -10773,14 +10780,24 @@ file {
}
json_name: "commit"
}
field {
name: "vote"
number: 13
label: LABEL_OPTIONAL
type: TYPE_UINT64
options {
65001: 0
}
json_name: "vote"
}
field {
name: "snapshot"
number: 9
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".raftpb.Snapshot"
options {
65001: 0
65001: 1
}
json_name: "snapshot"
}
Expand Down Expand Up @@ -10809,8 +10826,22 @@ file {
number: 12
label: LABEL_OPTIONAL
type: TYPE_BYTES
options {
65001: 1
}
json_name: "context"
}
field {
name: "responses"
number: 14
label: LABEL_REPEATED
type: TYPE_MESSAGE
type_name: ".raftpb.Message"
options {
65001: 0
}
json_name: "responses"
}
}
message_type {
name: "HardState"
Expand Down Expand Up @@ -11079,6 +11110,26 @@ file {
name: "MsgPreVoteResp"
number: 18
}
value {
name: "MsgStorageAppend"
number: 19
}
value {
name: "MsgStorageAppendResp"
number: 20
}
value {
name: "MsgStorageApply"
number: 21
}
value {
name: "MsgStorageApplyResp"
number: 22
}
value {
name: "MsgForgetLeader"
number: 23
}
}
enum_type {
name: "ConfChangeTransition"
Expand Down Expand Up @@ -11130,7 +11181,7 @@ file {
package: "docker.swarmkit.v1"
dependency: "github.com/docker/swarmkit/api/objects.proto"
dependency: "github.com/docker/swarmkit/api/types.proto"
dependency: "go.etcd.io/etcd/raft/v3/raftpb/raft.proto"
dependency: "go.etcd.io/raft/v3/raftpb/raft.proto"
dependency: "gogoproto/gogo.proto"
dependency: "github.com/docker/swarmkit/protobuf/plugin/plugin.proto"
message_type {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ require (
github.com/docker/go-metrics v0.0.1
github.com/fernet/fernet-go v0.0.0-20211208181803-9f70042a33ee
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.5.4
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/hashicorp/go-memdb v1.3.2
github.com/onsi/ginkgo v1.16.5
Expand Down Expand Up @@ -48,6 +47,7 @@ require (
// - https://github.com/moby/swarmkit/commit/4343384f11737119c3fa1524da2cb2707c70e04a
// - https://github.com/moby/swarmkit/commit/8a2b6fd64944bcef8154ced28f90aeec6abfeb04
google.golang.org/grpc v1.71.1
google.golang.org/protobuf v1.36.5
)

require (
Expand All @@ -59,6 +59,7 @@ require (
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/certificate-transparency-go v1.1.4 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
Expand Down Expand Up @@ -88,7 +89,6 @@ require (
golang.org/x/text v0.23.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions manager/csi/fakes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sync"

"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/golang/protobuf/ptypes/wrappers"
"google.golang.org/grpc"
"google.golang.org/protobuf/types/known/wrapperspb"

"github.com/moby/swarmkit/v2/api"
mobyplugin "github.com/moby/swarmkit/v2/node/plugin"
Expand Down Expand Up @@ -78,7 +78,7 @@ func (f *fakeIdentityClient) GetPluginCapabilities(ctx context.Context, _ *csi.G

func (f *fakeIdentityClient) Probe(ctx context.Context, in *csi.ProbeRequest, _ ...grpc.CallOption) (*csi.ProbeResponse, error) {
return &csi.ProbeResponse{
Ready: &wrappers.BoolValue{
Ready: &wrapperspb.BoolValue{
Value: true,
},
}, nil
Expand Down
6 changes: 3 additions & 3 deletions swarmd/go.work.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,6 @@ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
Expand All @@ -745,7 +744,6 @@ github.com/google/cel-go v0.17.1 h1:s2151PDGy/eqpCI80/8dl4VL3xTkqI/YubXLXCFw0mw=
github.com/google/cel-go v0.17.1/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
github.com/google/flatbuffers v2.0.8+incompatible h1:ivUb1cGomAB101ZM1T0nOiWz9pSrTMoa9+EiY7igmkM=
github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
Expand Down Expand Up @@ -1081,12 +1079,14 @@ go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4 h1:c2HOrn5iMezYjSlGPncknSEr/8x5LELb/ilJbXi9DEA=
golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136 h1:A1gGSx58LAGVHUUsOf7IiR0u8Xb6W51gRwfDBhkdcaw=
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4=
golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
Expand Down Expand Up @@ -1181,7 +1181,6 @@ google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFN
google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20 h1:MLBCGN1O7GzIx+cBiwfYPwtmZ41U3Mn/cotLJciaArI=
google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20/go.mod h1:Nr5H8+MlGWr5+xX/STzdoEqJrO+YteqFbMyCsrb6mH0=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
Expand All @@ -1206,6 +1205,7 @@ gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w
gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=
honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
k8s.io/api v0.22.5 h1:xk7C+rMjF/EGELiD560jdmwzrB788mfcHiNbMQLIVI8=
k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs=
Expand Down
Loading