diff --git a/cli/command/service/generic_resource_opts.go b/cli/command/service/generic_resource_opts.go index 66385888e1..d406d06e64 100644 --- a/cli/command/service/generic_resource_opts.go +++ b/cli/command/service/generic_resource_opts.go @@ -7,14 +7,14 @@ import ( "github.com/pkg/errors" "github.com/docker/docker/api/types/swarm" - swarmapi "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/genericresource" + swarmapi "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/genericresource" ) // GenericResource is a concept that a user can use to advertise user-defined // resources on a node and thus better place services based on these resources. // E.g: NVIDIA GPUs, Intel FPGAs, ... -// See https://github.com/docker/swarmkit/blob/master/design/generic_resources.md +// See https://github.com/moby/swarmkit/blob/de950a7ed842c7b7e47e9451cde9bf8f96031894/design/generic_resources.md // ValidateSingleGenericResource validates that a single entry in the // generic resource list is valid. diff --git a/cli/command/service/opts.go b/cli/command/service/opts.go index f7d7fcfa87..f5ef1d0a1b 100644 --- a/cli/command/service/opts.go +++ b/cli/command/service/opts.go @@ -14,10 +14,10 @@ import ( "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/api/types/versions" "github.com/docker/docker/client" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/defaults" gogotypes "github.com/gogo/protobuf/types" "github.com/google/shlex" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/defaults" "github.com/pkg/errors" "github.com/spf13/pflag" ) diff --git a/cli/command/service/update.go b/cli/command/service/update.go index 2a701ec0bd..ac4db918aa 100644 --- a/cli/command/service/update.go +++ b/cli/command/service/update.go @@ -17,7 +17,7 @@ import ( "github.com/docker/docker/api/types/versions" "github.com/docker/docker/client" units "github.com/docker/go-units" - "github.com/docker/swarmkit/api/defaults" + "github.com/moby/swarmkit/v2/api/defaults" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/vendor.mod b/vendor.mod index 7bf5181d00..1ce61fd503 100644 --- a/vendor.mod +++ b/vendor.mod @@ -14,7 +14,6 @@ require ( github.com/docker/docker-credential-helpers v0.6.4 github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.4.0 - github.com/docker/swarmkit v1.12.1-0.20220307221335-616e8db4c3b0 github.com/fvbommel/sortorder v1.0.2 github.com/gogo/protobuf v1.3.2 github.com/google/go-cmp v0.5.7 @@ -23,6 +22,7 @@ require ( github.com/mattn/go-runewidth v0.0.13 github.com/mitchellh/mapstructure v1.3.2 github.com/moby/buildkit v0.10.0 + github.com/moby/swarmkit/v2 v2.0.0-20220420172245-6068d1894d46 github.com/moby/sys/signal v0.7.0 github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 github.com/morikuni/aec v1.0.0 @@ -78,4 +78,10 @@ require ( replace ( github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220429181837-2ed904cad705+incompatible // master (v22.04-dev) github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2 + + // Resolve dependency hell with github.com/cloudflare/cfssl (transitive via + // swarmkit) by pinning the certificate-transparency-go version. Remove once + // module go.etcd.io/etcd/server/v3 has upgraded its dependency on + // go.opentelemetry.io/otel to v1. + github.com/google/certificate-transparency-go => github.com/google/certificate-transparency-go v1.0.20 ) diff --git a/vendor.sum b/vendor.sum index 21eb300067..2774afea81 100644 --- a/vendor.sum +++ b/vendor.sum @@ -74,8 +74,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004 h1:lkAMpLVBDaj17e85keuznYcH5rqI438v41pKcBl4ZxQ= github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA= +github.com/cloudflare/cfssl v0.0.0-20180323000720-5d63dbd981b5 h1:PqZ3bA4yzwywivzk7PBQWngJp2/PAS0bWRZerKteicY= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= @@ -122,8 +122,6 @@ github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4= github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= -github.com/docker/swarmkit v1.12.1-0.20220307221335-616e8db4c3b0 h1:YehAv2BPLfTm58HW04wRnNy8Oo/CAzWji7mjJ6UJWgM= -github.com/docker/swarmkit v1.12.1-0.20220307221335-616e8db4c3b0/go.mod h1:n3Z4lIEl7g261ptkGDBcYi/3qBMDl9csaAhwi2MPejs= github.com/dvsekhvalnov/jose2go v0.0.0-20170216131308-f21a8cedbbae/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -189,8 +187,8 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/certificate-transparency-go v1.0.10-0.20180222191210-5ab67e519c93 h1:jc2UWq7CbdszqeH6qu1ougXMIUBfSy8Pbh/anURYbGI= -github.com/google/certificate-transparency-go v1.0.10-0.20180222191210-5ab67e519c93/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= +github.com/google/certificate-transparency-go v1.0.20 h1:azETE79toaBOyp+StoEBy8atzQujL0PyBPEmsEeDCXI= +github.com/google/certificate-transparency-go v1.0.20/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -280,6 +278,8 @@ github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYG github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/buildkit v0.10.0 h1:ElHQJJdnj/VR/pfNJwhrjQJj8GXFIwVNGZh/Qbd5tVo= github.com/moby/buildkit v0.10.0/go.mod h1:WvwAZv8aRScHkqc/+X46cRC2CKMKpqcaX+pRvUTtPes= +github.com/moby/swarmkit/v2 v2.0.0-20220420172245-6068d1894d46 h1:FVr9eatIpN7PlE2ZHP850rIJ6AQoZxoZvPSDR+WQY38= +github.com/moby/swarmkit/v2 v2.0.0-20220420172245-6068d1894d46/go.mod h1:/so6Lct4y1x14UprW/loFsOe6xoXVTlvh25V36ULXNQ= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/sys/signal v0.7.0 h1:25RW3d5TnQEoKvRbEKUGay6DCQ46IxAVTT9CUMgmsSI= github.com/moby/sys/signal v0.7.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg= diff --git a/vendor/github.com/docker/swarmkit/LICENSE b/vendor/github.com/moby/swarmkit/v2/LICENSE similarity index 100% rename from vendor/github.com/docker/swarmkit/LICENSE rename to vendor/github.com/moby/swarmkit/v2/LICENSE diff --git a/vendor/github.com/docker/swarmkit/api/README.md b/vendor/github.com/moby/swarmkit/v2/api/README.md similarity index 100% rename from vendor/github.com/docker/swarmkit/api/README.md rename to vendor/github.com/moby/swarmkit/v2/api/README.md diff --git a/vendor/github.com/docker/swarmkit/api/api.pb.txt b/vendor/github.com/moby/swarmkit/v2/api/api.pb.txt similarity index 100% rename from vendor/github.com/docker/swarmkit/api/api.pb.txt rename to vendor/github.com/moby/swarmkit/v2/api/api.pb.txt diff --git a/vendor/github.com/docker/swarmkit/api/ca.pb.go b/vendor/github.com/moby/swarmkit/v2/api/ca.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/ca.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/ca.pb.go index e37dbc97a2..42e77d893d 100644 --- a/vendor/github.com/docker/swarmkit/api/ca.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/api/ca.pb.go @@ -6,11 +6,11 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" @@ -469,11 +469,11 @@ func (m *NodeCertificateStatusResponse) CopyFrom(src interface{}) { *m = *o if o.Status != nil { m.Status = &IssuanceStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Status, o.Status) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Status, o.Status) } if o.Certificate != nil { m.Certificate = &Certificate{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Certificate, o.Certificate) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Certificate, o.Certificate) } } @@ -567,7 +567,7 @@ func (m *GetUnlockKeyResponse) CopyFrom(src interface{}) { m.UnlockKey = make([]byte, len(o.UnlockKey)) copy(m.UnlockKey, o.UnlockKey) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Version, &o.Version) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Version, &o.Version) } // Reference imports to suppress errors if they are not otherwise used. diff --git a/vendor/github.com/docker/swarmkit/api/ca.proto b/vendor/github.com/moby/swarmkit/v2/api/ca.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/ca.proto rename to vendor/github.com/moby/swarmkit/v2/api/ca.proto diff --git a/vendor/github.com/docker/swarmkit/api/control.pb.go b/vendor/github.com/moby/swarmkit/v2/api/control.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/control.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/control.pb.go index 38f1c009bc..a040b9c1fc 100644 --- a/vendor/github.com/docker/swarmkit/api/control.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/api/control.pb.go @@ -6,13 +6,13 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" types "github.com/gogo/protobuf/types" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" @@ -4436,7 +4436,7 @@ func (m *GetNodeResponse) CopyFrom(src interface{}) { *m = *o if o.Node != nil { m.Node = &Node{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Node, o.Node) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Node, o.Node) } } @@ -4455,7 +4455,7 @@ func (m *ListNodesRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListNodesRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -4530,7 +4530,7 @@ func (m *ListNodesResponse) CopyFrom(src interface{}) { m.Nodes = make([]*Node, len(o.Nodes)) for i := range m.Nodes { m.Nodes[i] = &Node{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Nodes[i], o.Nodes[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Nodes[i], o.Nodes[i]) } } @@ -4551,11 +4551,11 @@ func (m *UpdateNodeRequest) CopyFrom(src interface{}) { *m = *o if o.NodeVersion != nil { m.NodeVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.NodeVersion, o.NodeVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.NodeVersion, o.NodeVersion) } if o.Spec != nil { m.Spec = &NodeSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -4574,7 +4574,7 @@ func (m *UpdateNodeResponse) CopyFrom(src interface{}) { *m = *o if o.Node != nil { m.Node = &Node{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Node, o.Node) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Node, o.Node) } } @@ -4633,7 +4633,7 @@ func (m *GetTaskResponse) CopyFrom(src interface{}) { *m = *o if o.Task != nil { m.Task = &Task{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Task, o.Task) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Task, o.Task) } } @@ -4677,7 +4677,7 @@ func (m *ListTasksRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListTasksRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -4755,7 +4755,7 @@ func (m *ListTasksResponse) CopyFrom(src interface{}) { m.Tasks = make([]*Task, len(o.Tasks)) for i := range m.Tasks { m.Tasks[i] = &Task{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Tasks[i], o.Tasks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Tasks[i], o.Tasks[i]) } } @@ -4776,7 +4776,7 @@ func (m *CreateServiceRequest) CopyFrom(src interface{}) { *m = *o if o.Spec != nil { m.Spec = &ServiceSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -4795,7 +4795,7 @@ func (m *CreateServiceResponse) CopyFrom(src interface{}) { *m = *o if o.Service != nil { m.Service = &Service{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Service, o.Service) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Service, o.Service) } } @@ -4829,7 +4829,7 @@ func (m *GetServiceResponse) CopyFrom(src interface{}) { *m = *o if o.Service != nil { m.Service = &Service{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Service, o.Service) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Service, o.Service) } } @@ -4848,11 +4848,11 @@ func (m *UpdateServiceRequest) CopyFrom(src interface{}) { *m = *o if o.ServiceVersion != nil { m.ServiceVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ServiceVersion, o.ServiceVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ServiceVersion, o.ServiceVersion) } if o.Spec != nil { m.Spec = &ServiceSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -4871,7 +4871,7 @@ func (m *UpdateServiceResponse) CopyFrom(src interface{}) { *m = *o if o.Service != nil { m.Service = &Service{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Service, o.Service) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Service, o.Service) } } @@ -4915,7 +4915,7 @@ func (m *ListServicesRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListServicesRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -4978,7 +4978,7 @@ func (m *ListServicesResponse) CopyFrom(src interface{}) { m.Services = make([]*Service, len(o.Services)) for i := range m.Services { m.Services[i] = &Service{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Services[i], o.Services[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Services[i], o.Services[i]) } } @@ -5021,7 +5021,7 @@ func (m *ListServiceStatusesResponse) CopyFrom(src interface{}) { m.Statuses = make([]*ListServiceStatusesResponse_ServiceStatus, len(o.Statuses)) for i := range m.Statuses { m.Statuses[i] = &ListServiceStatusesResponse_ServiceStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Statuses[i], o.Statuses[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Statuses[i], o.Statuses[i]) } } @@ -5057,7 +5057,7 @@ func (m *CreateNetworkRequest) CopyFrom(src interface{}) { *m = *o if o.Spec != nil { m.Spec = &NetworkSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -5076,7 +5076,7 @@ func (m *CreateNetworkResponse) CopyFrom(src interface{}) { *m = *o if o.Network != nil { m.Network = &Network{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Network, o.Network) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Network, o.Network) } } @@ -5110,7 +5110,7 @@ func (m *GetNetworkResponse) CopyFrom(src interface{}) { *m = *o if o.Network != nil { m.Network = &Network{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Network, o.Network) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Network, o.Network) } } @@ -5154,7 +5154,7 @@ func (m *ListNetworksRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListNetworksRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -5212,7 +5212,7 @@ func (m *ListNetworksResponse) CopyFrom(src interface{}) { m.Networks = make([]*Network, len(o.Networks)) for i := range m.Networks { m.Networks[i] = &Network{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) } } @@ -5248,7 +5248,7 @@ func (m *GetClusterResponse) CopyFrom(src interface{}) { *m = *o if o.Cluster != nil { m.Cluster = &Cluster{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Cluster, o.Cluster) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Cluster, o.Cluster) } } @@ -5267,7 +5267,7 @@ func (m *ListClustersRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListClustersRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -5325,7 +5325,7 @@ func (m *ListClustersResponse) CopyFrom(src interface{}) { m.Clusters = make([]*Cluster, len(o.Clusters)) for i := range m.Clusters { m.Clusters[i] = &Cluster{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Clusters[i], o.Clusters[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Clusters[i], o.Clusters[i]) } } @@ -5361,13 +5361,13 @@ func (m *UpdateClusterRequest) CopyFrom(src interface{}) { *m = *o if o.ClusterVersion != nil { m.ClusterVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ClusterVersion, o.ClusterVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ClusterVersion, o.ClusterVersion) } if o.Spec != nil { m.Spec = &ClusterSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Rotation, &o.Rotation) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Rotation, &o.Rotation) } func (m *UpdateClusterResponse) Copy() *UpdateClusterResponse { @@ -5385,7 +5385,7 @@ func (m *UpdateClusterResponse) CopyFrom(src interface{}) { *m = *o if o.Cluster != nil { m.Cluster = &Cluster{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Cluster, o.Cluster) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Cluster, o.Cluster) } } @@ -5419,7 +5419,7 @@ func (m *GetSecretResponse) CopyFrom(src interface{}) { *m = *o if o.Secret != nil { m.Secret = &Secret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secret, o.Secret) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secret, o.Secret) } } @@ -5438,11 +5438,11 @@ func (m *UpdateSecretRequest) CopyFrom(src interface{}) { *m = *o if o.SecretVersion != nil { m.SecretVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.SecretVersion, o.SecretVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.SecretVersion, o.SecretVersion) } if o.Spec != nil { m.Spec = &SecretSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -5461,7 +5461,7 @@ func (m *UpdateSecretResponse) CopyFrom(src interface{}) { *m = *o if o.Secret != nil { m.Secret = &Secret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secret, o.Secret) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secret, o.Secret) } } @@ -5480,7 +5480,7 @@ func (m *ListSecretsRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListSecretsRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -5538,7 +5538,7 @@ func (m *ListSecretsResponse) CopyFrom(src interface{}) { m.Secrets = make([]*Secret, len(o.Secrets)) for i := range m.Secrets { m.Secrets[i] = &Secret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) } } @@ -5559,7 +5559,7 @@ func (m *CreateSecretRequest) CopyFrom(src interface{}) { *m = *o if o.Spec != nil { m.Spec = &SecretSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -5578,7 +5578,7 @@ func (m *CreateSecretResponse) CopyFrom(src interface{}) { *m = *o if o.Secret != nil { m.Secret = &Secret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secret, o.Secret) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secret, o.Secret) } } @@ -5637,7 +5637,7 @@ func (m *GetConfigResponse) CopyFrom(src interface{}) { *m = *o if o.Config != nil { m.Config = &Config{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Config, o.Config) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Config, o.Config) } } @@ -5656,11 +5656,11 @@ func (m *UpdateConfigRequest) CopyFrom(src interface{}) { *m = *o if o.ConfigVersion != nil { m.ConfigVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ConfigVersion, o.ConfigVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ConfigVersion, o.ConfigVersion) } if o.Spec != nil { m.Spec = &ConfigSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -5679,7 +5679,7 @@ func (m *UpdateConfigResponse) CopyFrom(src interface{}) { *m = *o if o.Config != nil { m.Config = &Config{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Config, o.Config) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Config, o.Config) } } @@ -5698,7 +5698,7 @@ func (m *ListConfigsRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListConfigsRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -5756,7 +5756,7 @@ func (m *ListConfigsResponse) CopyFrom(src interface{}) { m.Configs = make([]*Config, len(o.Configs)) for i := range m.Configs { m.Configs[i] = &Config{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) } } @@ -5777,7 +5777,7 @@ func (m *CreateConfigRequest) CopyFrom(src interface{}) { *m = *o if o.Spec != nil { m.Spec = &ConfigSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -5796,7 +5796,7 @@ func (m *CreateConfigResponse) CopyFrom(src interface{}) { *m = *o if o.Config != nil { m.Config = &Config{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Config, o.Config) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Config, o.Config) } } @@ -5840,7 +5840,7 @@ func (m *CreateExtensionRequest) CopyFrom(src interface{}) { *m = *o if o.Annotations != nil { m.Annotations = &Annotations{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Annotations, o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Annotations, o.Annotations) } } @@ -5859,7 +5859,7 @@ func (m *CreateExtensionResponse) CopyFrom(src interface{}) { *m = *o if o.Extension != nil { m.Extension = &Extension{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Extension, o.Extension) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Extension, o.Extension) } } @@ -5918,7 +5918,7 @@ func (m *GetExtensionResponse) CopyFrom(src interface{}) { *m = *o if o.Extension != nil { m.Extension = &Extension{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Extension, o.Extension) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Extension, o.Extension) } } @@ -5937,11 +5937,11 @@ func (m *CreateResourceRequest) CopyFrom(src interface{}) { *m = *o if o.Annotations != nil { m.Annotations = &Annotations{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Annotations, o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Annotations, o.Annotations) } if o.Payload != nil { m.Payload = &types.Any{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Payload, o.Payload) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Payload, o.Payload) } } @@ -5960,7 +5960,7 @@ func (m *CreateResourceResponse) CopyFrom(src interface{}) { *m = *o if o.Resource != nil { m.Resource = &Resource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resource, o.Resource) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resource, o.Resource) } } @@ -6004,15 +6004,15 @@ func (m *UpdateResourceRequest) CopyFrom(src interface{}) { *m = *o if o.ResourceVersion != nil { m.ResourceVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ResourceVersion, o.ResourceVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ResourceVersion, o.ResourceVersion) } if o.Annotations != nil { m.Annotations = &Annotations{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Annotations, o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Annotations, o.Annotations) } if o.Payload != nil { m.Payload = &types.Any{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Payload, o.Payload) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Payload, o.Payload) } } @@ -6031,7 +6031,7 @@ func (m *UpdateResourceResponse) CopyFrom(src interface{}) { *m = *o if o.Resource != nil { m.Resource = &Resource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resource, o.Resource) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resource, o.Resource) } } @@ -6065,7 +6065,7 @@ func (m *GetResourceResponse) CopyFrom(src interface{}) { *m = *o if o.Resource != nil { m.Resource = &Resource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resource, o.Resource) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resource, o.Resource) } } @@ -6084,7 +6084,7 @@ func (m *ListResourcesRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListResourcesRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -6142,7 +6142,7 @@ func (m *ListResourcesResponse) CopyFrom(src interface{}) { m.Resources = make([]*Resource, len(o.Resources)) for i := range m.Resources { m.Resources[i] = &Resource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resources[i], o.Resources[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resources[i], o.Resources[i]) } } @@ -6163,7 +6163,7 @@ func (m *CreateVolumeRequest) CopyFrom(src interface{}) { *m = *o if o.Spec != nil { m.Spec = &VolumeSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -6182,7 +6182,7 @@ func (m *CreateVolumeResponse) CopyFrom(src interface{}) { *m = *o if o.Volume != nil { m.Volume = &Volume{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Volume, o.Volume) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Volume, o.Volume) } } @@ -6216,7 +6216,7 @@ func (m *GetVolumeResponse) CopyFrom(src interface{}) { *m = *o if o.Volume != nil { m.Volume = &Volume{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Volume, o.Volume) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Volume, o.Volume) } } @@ -6235,11 +6235,11 @@ func (m *UpdateVolumeRequest) CopyFrom(src interface{}) { *m = *o if o.VolumeVersion != nil { m.VolumeVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.VolumeVersion, o.VolumeVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.VolumeVersion, o.VolumeVersion) } if o.Spec != nil { m.Spec = &VolumeSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } } @@ -6258,7 +6258,7 @@ func (m *UpdateVolumeResponse) CopyFrom(src interface{}) { *m = *o if o.Volume != nil { m.Volume = &Volume{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Volume, o.Volume) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Volume, o.Volume) } } @@ -6277,7 +6277,7 @@ func (m *ListVolumesRequest) CopyFrom(src interface{}) { *m = *o if o.Filters != nil { m.Filters = &ListVolumesRequest_Filters{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters, o.Filters) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters, o.Filters) } } @@ -6345,7 +6345,7 @@ func (m *ListVolumesResponse) CopyFrom(src interface{}) { m.Volumes = make([]*Volume, len(o.Volumes)) for i := range m.Volumes { m.Volumes[i] = &Volume{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Volumes[i], o.Volumes[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Volumes[i], o.Volumes[i]) } } diff --git a/vendor/github.com/docker/swarmkit/api/control.proto b/vendor/github.com/moby/swarmkit/v2/api/control.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/control.proto rename to vendor/github.com/moby/swarmkit/v2/api/control.proto diff --git a/vendor/github.com/docker/swarmkit/api/deepcopy/copy.go b/vendor/github.com/moby/swarmkit/v2/api/deepcopy/copy.go similarity index 100% rename from vendor/github.com/docker/swarmkit/api/deepcopy/copy.go rename to vendor/github.com/moby/swarmkit/v2/api/deepcopy/copy.go diff --git a/vendor/github.com/docker/swarmkit/api/defaults/service.go b/vendor/github.com/moby/swarmkit/v2/api/defaults/service.go similarity index 97% rename from vendor/github.com/docker/swarmkit/api/defaults/service.go rename to vendor/github.com/moby/swarmkit/v2/api/defaults/service.go index ce1e86435a..461378ffca 100644 --- a/vendor/github.com/docker/swarmkit/api/defaults/service.go +++ b/vendor/github.com/moby/swarmkit/v2/api/defaults/service.go @@ -3,8 +3,8 @@ package defaults import ( "time" - "github.com/docker/swarmkit/api" - "github.com/docker/swarmkit/api/deepcopy" + "github.com/moby/swarmkit/v2/api" + "github.com/moby/swarmkit/v2/api/deepcopy" gogotypes "github.com/gogo/protobuf/types" ) diff --git a/vendor/github.com/docker/swarmkit/api/dispatcher.pb.go b/vendor/github.com/moby/swarmkit/v2/api/dispatcher.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/dispatcher.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/dispatcher.pb.go index 7bde892fc2..00542edd9d 100644 --- a/vendor/github.com/docker/swarmkit/api/dispatcher.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/api/dispatcher.pb.go @@ -6,13 +6,13 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" @@ -1013,7 +1013,7 @@ func (m *SessionRequest) CopyFrom(src interface{}) { *m = *o if o.Description != nil { m.Description = &NodeDescription{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Description, o.Description) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Description, o.Description) } } @@ -1032,13 +1032,13 @@ func (m *SessionMessage) CopyFrom(src interface{}) { *m = *o if o.Node != nil { m.Node = &Node{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Node, o.Node) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Node, o.Node) } if o.Managers != nil { m.Managers = make([]*WeightedPeer, len(o.Managers)) for i := range m.Managers { m.Managers[i] = &WeightedPeer{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Managers[i], o.Managers[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Managers[i], o.Managers[i]) } } @@ -1046,7 +1046,7 @@ func (m *SessionMessage) CopyFrom(src interface{}) { m.NetworkBootstrapKeys = make([]*EncryptionKey, len(o.NetworkBootstrapKeys)) for i := range m.NetworkBootstrapKeys { m.NetworkBootstrapKeys[i] = &EncryptionKey{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.NetworkBootstrapKeys[i], o.NetworkBootstrapKeys[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.NetworkBootstrapKeys[i], o.NetworkBootstrapKeys[i]) } } @@ -1084,7 +1084,7 @@ func (m *HeartbeatResponse) CopyFrom(src interface{}) { o := src.(*HeartbeatResponse) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Period, &o.Period) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Period, &o.Period) } func (m *UpdateTaskStatusRequest) Copy() *UpdateTaskStatusRequest { @@ -1104,7 +1104,7 @@ func (m *UpdateTaskStatusRequest) CopyFrom(src interface{}) { m.Updates = make([]*UpdateTaskStatusRequest_TaskStatusUpdate, len(o.Updates)) for i := range m.Updates { m.Updates[i] = &UpdateTaskStatusRequest_TaskStatusUpdate{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Updates[i], o.Updates[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Updates[i], o.Updates[i]) } } @@ -1125,7 +1125,7 @@ func (m *UpdateTaskStatusRequest_TaskStatusUpdate) CopyFrom(src interface{}) { *m = *o if o.Status != nil { m.Status = &TaskStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Status, o.Status) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Status, o.Status) } } @@ -1156,7 +1156,7 @@ func (m *UpdateVolumeStatusRequest) CopyFrom(src interface{}) { m.Updates = make([]*UpdateVolumeStatusRequest_VolumeStatusUpdate, len(o.Updates)) for i := range m.Updates { m.Updates[i] = &UpdateVolumeStatusRequest_VolumeStatusUpdate{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Updates[i], o.Updates[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Updates[i], o.Updates[i]) } } @@ -1219,7 +1219,7 @@ func (m *TasksMessage) CopyFrom(src interface{}) { m.Tasks = make([]*Task, len(o.Tasks)) for i := range m.Tasks { m.Tasks[i] = &Task{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Tasks[i], o.Tasks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Tasks[i], o.Tasks[i]) } } @@ -1259,25 +1259,25 @@ func (m *Assignment) CopyFrom(src interface{}) { v := Assignment_Task{ Task: &Task{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Task, o.GetTask()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Task, o.GetTask()) m.Item = &v case *Assignment_Secret: v := Assignment_Secret{ Secret: &Secret{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Secret, o.GetSecret()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Secret, o.GetSecret()) m.Item = &v case *Assignment_Config: v := Assignment_Config{ Config: &Config{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Config, o.GetConfig()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Config, o.GetConfig()) m.Item = &v case *Assignment_Volume: v := Assignment_Volume{ Volume: &VolumeAssignment{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Volume, o.GetVolume()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Volume, o.GetVolume()) m.Item = &v } } @@ -1299,7 +1299,7 @@ func (m *AssignmentChange) CopyFrom(src interface{}) { *m = *o if o.Assignment != nil { m.Assignment = &Assignment{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Assignment, o.Assignment) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Assignment, o.Assignment) } } @@ -1320,7 +1320,7 @@ func (m *AssignmentsMessage) CopyFrom(src interface{}) { m.Changes = make([]*AssignmentChange, len(o.Changes)) for i := range m.Changes { m.Changes[i] = &AssignmentChange{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Changes[i], o.Changes[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Changes[i], o.Changes[i]) } } diff --git a/vendor/github.com/docker/swarmkit/api/dispatcher.proto b/vendor/github.com/moby/swarmkit/v2/api/dispatcher.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/dispatcher.proto rename to vendor/github.com/moby/swarmkit/v2/api/dispatcher.proto diff --git a/vendor/github.com/docker/swarmkit/api/genericresource/helpers.go b/vendor/github.com/moby/swarmkit/v2/api/genericresource/helpers.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/genericresource/helpers.go rename to vendor/github.com/moby/swarmkit/v2/api/genericresource/helpers.go index 350ab730c1..8c29100357 100644 --- a/vendor/github.com/docker/swarmkit/api/genericresource/helpers.go +++ b/vendor/github.com/moby/swarmkit/v2/api/genericresource/helpers.go @@ -1,7 +1,7 @@ package genericresource import ( - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // NewSet creates a set object diff --git a/vendor/github.com/docker/swarmkit/api/genericresource/parse.go b/vendor/github.com/moby/swarmkit/v2/api/genericresource/parse.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/genericresource/parse.go rename to vendor/github.com/moby/swarmkit/v2/api/genericresource/parse.go index f39a7077a8..7c2a359138 100644 --- a/vendor/github.com/docker/swarmkit/api/genericresource/parse.go +++ b/vendor/github.com/moby/swarmkit/v2/api/genericresource/parse.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) func newParseError(format string, args ...interface{}) error { diff --git a/vendor/github.com/docker/swarmkit/api/genericresource/resource_management.go b/vendor/github.com/moby/swarmkit/v2/api/genericresource/resource_management.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/genericresource/resource_management.go rename to vendor/github.com/moby/swarmkit/v2/api/genericresource/resource_management.go index 506257ab97..86a358363f 100644 --- a/vendor/github.com/docker/swarmkit/api/genericresource/resource_management.go +++ b/vendor/github.com/moby/swarmkit/v2/api/genericresource/resource_management.go @@ -3,7 +3,7 @@ package genericresource import ( "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // Claim assigns GenericResources to a task by taking them from the diff --git a/vendor/github.com/docker/swarmkit/api/genericresource/string.go b/vendor/github.com/moby/swarmkit/v2/api/genericresource/string.go similarity index 97% rename from vendor/github.com/docker/swarmkit/api/genericresource/string.go rename to vendor/github.com/moby/swarmkit/v2/api/genericresource/string.go index 5e388bebb0..ded52ffed7 100644 --- a/vendor/github.com/docker/swarmkit/api/genericresource/string.go +++ b/vendor/github.com/moby/swarmkit/v2/api/genericresource/string.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) func discreteToString(d *api.GenericResource_DiscreteResourceSpec) string { diff --git a/vendor/github.com/docker/swarmkit/api/genericresource/validate.go b/vendor/github.com/moby/swarmkit/v2/api/genericresource/validate.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/genericresource/validate.go rename to vendor/github.com/moby/swarmkit/v2/api/genericresource/validate.go index 0ad49ff75f..19f2040a70 100644 --- a/vendor/github.com/docker/swarmkit/api/genericresource/validate.go +++ b/vendor/github.com/moby/swarmkit/v2/api/genericresource/validate.go @@ -3,7 +3,7 @@ package genericresource import ( "fmt" - "github.com/docker/swarmkit/api" + "github.com/moby/swarmkit/v2/api" ) // ValidateTask validates that the task only uses integers diff --git a/vendor/github.com/docker/swarmkit/api/health.pb.go b/vendor/github.com/moby/swarmkit/v2/api/health.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/health.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/health.pb.go index 3ca506a031..b5795d4da0 100644 --- a/vendor/github.com/docker/swarmkit/api/health.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/api/health.pb.go @@ -6,10 +6,10 @@ package api import ( context "context" fmt "fmt" - raftselector "github.com/docker/swarmkit/manager/raftselector" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" diff --git a/vendor/github.com/docker/swarmkit/api/health.proto b/vendor/github.com/moby/swarmkit/v2/api/health.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/health.proto rename to vendor/github.com/moby/swarmkit/v2/api/health.proto diff --git a/vendor/github.com/docker/swarmkit/api/logbroker.pb.go b/vendor/github.com/moby/swarmkit/v2/api/logbroker.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/logbroker.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/logbroker.pb.go index 1b95b226c7..05cacafd78 100644 --- a/vendor/github.com/docker/swarmkit/api/logbroker.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/api/logbroker.pb.go @@ -6,12 +6,12 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" @@ -686,7 +686,7 @@ func (m *LogSubscriptionOptions) CopyFrom(src interface{}) { if o.Since != nil { m.Since = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Since, o.Since) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Since, o.Since) } } @@ -763,10 +763,10 @@ func (m *LogMessage) CopyFrom(src interface{}) { o := src.(*LogMessage) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Context, &o.Context) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Context, &o.Context) if o.Timestamp != nil { m.Timestamp = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Timestamp, o.Timestamp) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Timestamp, o.Timestamp) } if o.Data != nil { m.Data = make([]byte, len(o.Data)) @@ -775,7 +775,7 @@ func (m *LogMessage) CopyFrom(src interface{}) { if o.Attrs != nil { m.Attrs = make([]LogAttr, len(o.Attrs)) for i := range m.Attrs { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Attrs[i], &o.Attrs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Attrs[i], &o.Attrs[i]) } } @@ -796,11 +796,11 @@ func (m *SubscribeLogsRequest) CopyFrom(src interface{}) { *m = *o if o.Selector != nil { m.Selector = &LogSelector{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Selector, o.Selector) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Selector, o.Selector) } if o.Options != nil { m.Options = &LogSubscriptionOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Options, o.Options) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Options, o.Options) } } @@ -820,7 +820,7 @@ func (m *SubscribeLogsMessage) CopyFrom(src interface{}) { if o.Messages != nil { m.Messages = make([]LogMessage, len(o.Messages)) for i := range m.Messages { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Messages[i], &o.Messages[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Messages[i], &o.Messages[i]) } } @@ -851,11 +851,11 @@ func (m *SubscriptionMessage) CopyFrom(src interface{}) { *m = *o if o.Selector != nil { m.Selector = &LogSelector{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Selector, o.Selector) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Selector, o.Selector) } if o.Options != nil { m.Options = &LogSubscriptionOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Options, o.Options) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Options, o.Options) } } @@ -875,7 +875,7 @@ func (m *PublishLogsMessage) CopyFrom(src interface{}) { if o.Messages != nil { m.Messages = make([]LogMessage, len(o.Messages)) for i := range m.Messages { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Messages[i], &o.Messages[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Messages[i], &o.Messages[i]) } } diff --git a/vendor/github.com/docker/swarmkit/api/logbroker.proto b/vendor/github.com/moby/swarmkit/v2/api/logbroker.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/logbroker.proto rename to vendor/github.com/moby/swarmkit/v2/api/logbroker.proto diff --git a/vendor/github.com/docker/swarmkit/api/objects.pb.go b/vendor/github.com/moby/swarmkit/v2/api/objects.pb.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/objects.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/objects.pb.go index d3cd6c0ce4..cbd14db42f 100644 --- a/vendor/github.com/docker/swarmkit/api/objects.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/api/objects.pb.go @@ -6,12 +6,12 @@ package api import ( fmt "fmt" github_com_docker_go_events "github.com/docker/go-events" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" types "github.com/gogo/protobuf/types" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" io "io" math "math" math_bits "math/bits" @@ -963,14 +963,14 @@ func (m *Meta) CopyFrom(src interface{}) { o := src.(*Meta) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Version, &o.Version) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Version, &o.Version) if o.CreatedAt != nil { m.CreatedAt = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.CreatedAt, o.CreatedAt) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.CreatedAt, o.CreatedAt) } if o.UpdatedAt != nil { m.UpdatedAt = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.UpdatedAt, o.UpdatedAt) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.UpdatedAt, o.UpdatedAt) } } @@ -987,27 +987,27 @@ func (m *Node) CopyFrom(src interface{}) { o := src.(*Node) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) if o.Description != nil { m.Description = &NodeDescription{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Description, o.Description) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Description, o.Description) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Status, &o.Status) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Status, &o.Status) if o.ManagerStatus != nil { m.ManagerStatus = &ManagerStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ManagerStatus, o.ManagerStatus) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ManagerStatus, o.ManagerStatus) } if o.Attachment != nil { m.Attachment = &NetworkAttachment{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Attachment, o.Attachment) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Attachment, o.Attachment) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Certificate, &o.Certificate) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Certificate, &o.Certificate) if o.Attachments != nil { m.Attachments = make([]*NetworkAttachment, len(o.Attachments)) for i := range m.Attachments { m.Attachments[i] = &NetworkAttachment{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Attachments[i], o.Attachments[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Attachments[i], o.Attachments[i]) } } @@ -1026,31 +1026,31 @@ func (m *Service) CopyFrom(src interface{}) { o := src.(*Service) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) if o.SpecVersion != nil { m.SpecVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.SpecVersion, o.SpecVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.SpecVersion, o.SpecVersion) } if o.PreviousSpec != nil { m.PreviousSpec = &ServiceSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.PreviousSpec, o.PreviousSpec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.PreviousSpec, o.PreviousSpec) } if o.PreviousSpecVersion != nil { m.PreviousSpecVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.PreviousSpecVersion, o.PreviousSpecVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.PreviousSpecVersion, o.PreviousSpecVersion) } if o.Endpoint != nil { m.Endpoint = &Endpoint{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Endpoint, o.Endpoint) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Endpoint, o.Endpoint) } if o.UpdateStatus != nil { m.UpdateStatus = &UpdateStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.UpdateStatus, o.UpdateStatus) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.UpdateStatus, o.UpdateStatus) } if o.JobStatus != nil { m.JobStatus = &JobStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.JobStatus, o.JobStatus) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.JobStatus, o.JobStatus) } } @@ -1069,13 +1069,13 @@ func (m *Endpoint) CopyFrom(src interface{}) { *m = *o if o.Spec != nil { m.Spec = &EndpointSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Spec, o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Spec, o.Spec) } if o.Ports != nil { m.Ports = make([]*PortConfig, len(o.Ports)) for i := range m.Ports { m.Ports[i] = &PortConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Ports[i], o.Ports[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Ports[i], o.Ports[i]) } } @@ -1083,7 +1083,7 @@ func (m *Endpoint) CopyFrom(src interface{}) { m.VirtualIPs = make([]*Endpoint_VirtualIP, len(o.VirtualIPs)) for i := range m.VirtualIPs { m.VirtualIPs[i] = &Endpoint_VirtualIP{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.VirtualIPs[i], o.VirtualIPs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.VirtualIPs[i], o.VirtualIPs[i]) } } @@ -1117,48 +1117,48 @@ func (m *Task) CopyFrom(src interface{}) { o := src.(*Task) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) if o.SpecVersion != nil { m.SpecVersion = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.SpecVersion, o.SpecVersion) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.SpecVersion, o.SpecVersion) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.ServiceAnnotations, &o.ServiceAnnotations) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Status, &o.Status) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.ServiceAnnotations, &o.ServiceAnnotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Status, &o.Status) if o.Networks != nil { m.Networks = make([]*NetworkAttachment, len(o.Networks)) for i := range m.Networks { m.Networks[i] = &NetworkAttachment{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) } } if o.Endpoint != nil { m.Endpoint = &Endpoint{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Endpoint, o.Endpoint) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Endpoint, o.Endpoint) } if o.LogDriver != nil { m.LogDriver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.LogDriver, o.LogDriver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.LogDriver, o.LogDriver) } if o.AssignedGenericResources != nil { m.AssignedGenericResources = make([]*GenericResource, len(o.AssignedGenericResources)) for i := range m.AssignedGenericResources { m.AssignedGenericResources[i] = &GenericResource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AssignedGenericResources[i], o.AssignedGenericResources[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AssignedGenericResources[i], o.AssignedGenericResources[i]) } } if o.JobIteration != nil { m.JobIteration = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.JobIteration, o.JobIteration) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.JobIteration, o.JobIteration) } if o.Volumes != nil { m.Volumes = make([]*VolumeAttachment, len(o.Volumes)) for i := range m.Volumes { m.Volumes[i] = &VolumeAttachment{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Volumes[i], o.Volumes[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Volumes[i], o.Volumes[i]) } } @@ -1179,7 +1179,7 @@ func (m *NetworkAttachment) CopyFrom(src interface{}) { *m = *o if o.Network != nil { m.Network = &Network{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Network, o.Network) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Network, o.Network) } if o.Addresses != nil { m.Addresses = make([]string, len(o.Addresses)) @@ -1213,15 +1213,15 @@ func (m *Network) CopyFrom(src interface{}) { o := src.(*Network) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) if o.DriverState != nil { m.DriverState = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.DriverState, o.DriverState) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.DriverState, o.DriverState) } if o.IPAM != nil { m.IPAM = &IPAMOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.IPAM, o.IPAM) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.IPAM, o.IPAM) } } @@ -1238,14 +1238,14 @@ func (m *Cluster) CopyFrom(src interface{}) { o := src.(*Cluster) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.RootCA, &o.RootCA) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.RootCA, &o.RootCA) if o.NetworkBootstrapKeys != nil { m.NetworkBootstrapKeys = make([]*EncryptionKey, len(o.NetworkBootstrapKeys)) for i := range m.NetworkBootstrapKeys { m.NetworkBootstrapKeys[i] = &EncryptionKey{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.NetworkBootstrapKeys[i], o.NetworkBootstrapKeys[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.NetworkBootstrapKeys[i], o.NetworkBootstrapKeys[i]) } } @@ -1253,7 +1253,7 @@ func (m *Cluster) CopyFrom(src interface{}) { m.BlacklistedCertificates = make(map[string]*BlacklistedCertificate, len(o.BlacklistedCertificates)) for k, v := range o.BlacklistedCertificates { m.BlacklistedCertificates[k] = &BlacklistedCertificate{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.BlacklistedCertificates[k], v) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.BlacklistedCertificates[k], v) } } @@ -1261,7 +1261,7 @@ func (m *Cluster) CopyFrom(src interface{}) { m.UnlockKeys = make([]*EncryptionKey, len(o.UnlockKeys)) for i := range m.UnlockKeys { m.UnlockKeys[i] = &EncryptionKey{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.UnlockKeys[i], o.UnlockKeys[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.UnlockKeys[i], o.UnlockKeys[i]) } } @@ -1285,8 +1285,8 @@ func (m *Secret) CopyFrom(src interface{}) { o := src.(*Secret) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) } func (m *Config) Copy() *Config { @@ -1302,8 +1302,8 @@ func (m *Config) CopyFrom(src interface{}) { o := src.(*Config) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) } func (m *Resource) Copy() *Resource { @@ -1319,11 +1319,11 @@ func (m *Resource) CopyFrom(src interface{}) { o := src.(*Resource) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) if o.Payload != nil { m.Payload = &types.Any{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Payload, o.Payload) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Payload, o.Payload) } } @@ -1340,8 +1340,8 @@ func (m *Extension) CopyFrom(src interface{}) { o := src.(*Extension) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) } func (m *Volume) Copy() *Volume { @@ -1357,19 +1357,19 @@ func (m *Volume) CopyFrom(src interface{}) { o := src.(*Volume) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Meta, &o.Meta) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Spec, &o.Spec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Meta, &o.Meta) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Spec, &o.Spec) if o.PublishStatus != nil { m.PublishStatus = make([]*VolumePublishStatus, len(o.PublishStatus)) for i := range m.PublishStatus { m.PublishStatus[i] = &VolumePublishStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.PublishStatus[i], o.PublishStatus[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.PublishStatus[i], o.PublishStatus[i]) } } if o.VolumeInfo != nil { m.VolumeInfo = &VolumeInfo{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.VolumeInfo, o.VolumeInfo) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.VolumeInfo, o.VolumeInfo) } } diff --git a/vendor/github.com/docker/swarmkit/api/objects.proto b/vendor/github.com/moby/swarmkit/v2/api/objects.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/objects.proto rename to vendor/github.com/moby/swarmkit/v2/api/objects.proto diff --git a/vendor/github.com/docker/swarmkit/api/raft.pb.go b/vendor/github.com/moby/swarmkit/v2/api/raft.pb.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/raft.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/raft.pb.go index a4619a40e2..96fa855077 100644 --- a/vendor/github.com/docker/swarmkit/api/raft.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/api/raft.pb.go @@ -6,9 +6,9 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" proto "github.com/gogo/protobuf/proto" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" raftpb "go.etcd.io/etcd/raft/v3/raftpb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -877,7 +877,7 @@ func (m *RaftMember) CopyFrom(src interface{}) { o := src.(*RaftMember) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Status, &o.Status) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Status, &o.Status) } func (m *JoinRequest) Copy() *JoinRequest { @@ -912,7 +912,7 @@ func (m *JoinResponse) CopyFrom(src interface{}) { m.Members = make([]*RaftMember, len(o.Members)) for i := range m.Members { m.Members[i] = &RaftMember{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Members[i], o.Members[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Members[i], o.Members[i]) } } @@ -938,7 +938,7 @@ func (m *LeaveRequest) CopyFrom(src interface{}) { *m = *o if o.Node != nil { m.Node = &RaftMember{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Node, o.Node) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Node, o.Node) } } @@ -1018,7 +1018,7 @@ func (m *InternalRaftRequest) CopyFrom(src interface{}) { if o.Action != nil { m.Action = make([]StoreAction, len(o.Action)) for i := range m.Action { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Action[i], &o.Action[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Action[i], &o.Action[i]) } } @@ -1043,61 +1043,61 @@ func (m *StoreAction) CopyFrom(src interface{}) { v := StoreAction_Node{ Node: &Node{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Node, o.GetNode()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Node, o.GetNode()) m.Target = &v case *StoreAction_Service: v := StoreAction_Service{ Service: &Service{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Service, o.GetService()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Service, o.GetService()) m.Target = &v case *StoreAction_Task: v := StoreAction_Task{ Task: &Task{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Task, o.GetTask()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Task, o.GetTask()) m.Target = &v case *StoreAction_Network: v := StoreAction_Network{ Network: &Network{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Network, o.GetNetwork()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Network, o.GetNetwork()) m.Target = &v case *StoreAction_Cluster: v := StoreAction_Cluster{ Cluster: &Cluster{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Cluster, o.GetCluster()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Cluster, o.GetCluster()) m.Target = &v case *StoreAction_Secret: v := StoreAction_Secret{ Secret: &Secret{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Secret, o.GetSecret()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Secret, o.GetSecret()) m.Target = &v case *StoreAction_Resource: v := StoreAction_Resource{ Resource: &Resource{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Resource, o.GetResource()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Resource, o.GetResource()) m.Target = &v case *StoreAction_Extension: v := StoreAction_Extension{ Extension: &Extension{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Extension, o.GetExtension()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Extension, o.GetExtension()) m.Target = &v case *StoreAction_Config: v := StoreAction_Config{ Config: &Config{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Config, o.GetConfig()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Config, o.GetConfig()) m.Target = &v case *StoreAction_Volume: v := StoreAction_Volume{ Volume: &Volume{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Volume, o.GetVolume()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Volume, o.GetVolume()) m.Target = &v } } diff --git a/vendor/github.com/docker/swarmkit/api/raft.proto b/vendor/github.com/moby/swarmkit/v2/api/raft.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/raft.proto rename to vendor/github.com/moby/swarmkit/v2/api/raft.proto diff --git a/vendor/github.com/docker/swarmkit/api/resource.pb.go b/vendor/github.com/moby/swarmkit/v2/api/resource.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/resource.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/resource.pb.go index 8c9cf71e26..3466e44073 100644 --- a/vendor/github.com/docker/swarmkit/api/resource.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/api/resource.pb.go @@ -6,11 +6,11 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" @@ -263,7 +263,7 @@ func (m *AttachNetworkRequest) CopyFrom(src interface{}) { *m = *o if o.Config != nil { m.Config = &NetworkAttachmentConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Config, o.Config) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Config, o.Config) } } diff --git a/vendor/github.com/docker/swarmkit/api/resource.proto b/vendor/github.com/moby/swarmkit/v2/api/resource.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/resource.proto rename to vendor/github.com/moby/swarmkit/v2/api/resource.proto diff --git a/vendor/github.com/docker/swarmkit/api/snapshot.pb.go b/vendor/github.com/moby/swarmkit/v2/api/snapshot.pb.go similarity index 97% rename from vendor/github.com/docker/swarmkit/api/snapshot.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/snapshot.pb.go index 00233f6d1f..7ab5d978d0 100644 --- a/vendor/github.com/docker/swarmkit/api/snapshot.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/api/snapshot.pb.go @@ -5,8 +5,8 @@ package api import ( fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" proto "github.com/gogo/protobuf/proto" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" io "io" math "math" math_bits "math/bits" @@ -235,7 +235,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Nodes = make([]*Node, len(o.Nodes)) for i := range m.Nodes { m.Nodes[i] = &Node{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Nodes[i], o.Nodes[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Nodes[i], o.Nodes[i]) } } @@ -243,7 +243,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Services = make([]*Service, len(o.Services)) for i := range m.Services { m.Services[i] = &Service{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Services[i], o.Services[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Services[i], o.Services[i]) } } @@ -251,7 +251,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Networks = make([]*Network, len(o.Networks)) for i := range m.Networks { m.Networks[i] = &Network{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) } } @@ -259,7 +259,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Tasks = make([]*Task, len(o.Tasks)) for i := range m.Tasks { m.Tasks[i] = &Task{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Tasks[i], o.Tasks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Tasks[i], o.Tasks[i]) } } @@ -267,7 +267,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Clusters = make([]*Cluster, len(o.Clusters)) for i := range m.Clusters { m.Clusters[i] = &Cluster{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Clusters[i], o.Clusters[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Clusters[i], o.Clusters[i]) } } @@ -275,7 +275,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Secrets = make([]*Secret, len(o.Secrets)) for i := range m.Secrets { m.Secrets[i] = &Secret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) } } @@ -283,7 +283,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Resources = make([]*Resource, len(o.Resources)) for i := range m.Resources { m.Resources[i] = &Resource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resources[i], o.Resources[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resources[i], o.Resources[i]) } } @@ -291,7 +291,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Extensions = make([]*Extension, len(o.Extensions)) for i := range m.Extensions { m.Extensions[i] = &Extension{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Extensions[i], o.Extensions[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Extensions[i], o.Extensions[i]) } } @@ -299,7 +299,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Configs = make([]*Config, len(o.Configs)) for i := range m.Configs { m.Configs[i] = &Config{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) } } @@ -307,7 +307,7 @@ func (m *StoreSnapshot) CopyFrom(src interface{}) { m.Volumes = make([]*Volume, len(o.Volumes)) for i := range m.Volumes { m.Volumes[i] = &Volume{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Volumes[i], o.Volumes[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Volumes[i], o.Volumes[i]) } } @@ -330,7 +330,7 @@ func (m *ClusterSnapshot) CopyFrom(src interface{}) { m.Members = make([]*RaftMember, len(o.Members)) for i := range m.Members { m.Members[i] = &RaftMember{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Members[i], o.Members[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Members[i], o.Members[i]) } } @@ -354,8 +354,8 @@ func (m *Snapshot) CopyFrom(src interface{}) { o := src.(*Snapshot) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Membership, &o.Membership) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Store, &o.Store) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Membership, &o.Membership) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Store, &o.Store) } func (m *StoreSnapshot) Marshal() (dAtA []byte, err error) { diff --git a/vendor/github.com/docker/swarmkit/api/snapshot.proto b/vendor/github.com/moby/swarmkit/v2/api/snapshot.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/snapshot.proto rename to vendor/github.com/moby/swarmkit/v2/api/snapshot.proto diff --git a/vendor/github.com/docker/swarmkit/api/specs.pb.go b/vendor/github.com/moby/swarmkit/v2/api/specs.pb.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/specs.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/specs.pb.go index 216be651f9..a789d5a95e 100644 --- a/vendor/github.com/docker/swarmkit/api/specs.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/api/specs.pb.go @@ -5,11 +5,11 @@ package api import ( fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" types "github.com/gogo/protobuf/types" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" io "io" math "math" math_bits "math/bits" @@ -1604,7 +1604,7 @@ func (m *NodeSpec) CopyFrom(src interface{}) { o := src.(*NodeSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) } func (m *ServiceSpec) Copy() *ServiceSpec { @@ -1620,27 +1620,27 @@ func (m *ServiceSpec) CopyFrom(src interface{}) { o := src.(*ServiceSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Task, &o.Task) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Task, &o.Task) if o.Update != nil { m.Update = &UpdateConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Update, o.Update) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Update, o.Update) } if o.Rollback != nil { m.Rollback = &UpdateConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Rollback, o.Rollback) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Rollback, o.Rollback) } if o.Networks != nil { m.Networks = make([]*NetworkAttachmentConfig, len(o.Networks)) for i := range m.Networks { m.Networks[i] = &NetworkAttachmentConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) } } if o.Endpoint != nil { m.Endpoint = &EndpointSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Endpoint, o.Endpoint) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Endpoint, o.Endpoint) } if o.Mode != nil { switch o.Mode.(type) { @@ -1648,25 +1648,25 @@ func (m *ServiceSpec) CopyFrom(src interface{}) { v := ServiceSpec_Replicated{ Replicated: &ReplicatedService{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Replicated, o.GetReplicated()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Replicated, o.GetReplicated()) m.Mode = &v case *ServiceSpec_Global: v := ServiceSpec_Global{ Global: &GlobalService{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Global, o.GetGlobal()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Global, o.GetGlobal()) m.Mode = &v case *ServiceSpec_ReplicatedJob: v := ServiceSpec_ReplicatedJob{ ReplicatedJob: &ReplicatedJob{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.ReplicatedJob, o.GetReplicatedJob()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.ReplicatedJob, o.GetReplicatedJob()) m.Mode = &v case *ServiceSpec_GlobalJob: v := ServiceSpec_GlobalJob{ GlobalJob: &GlobalJob{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.GlobalJob, o.GetGlobalJob()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.GlobalJob, o.GetGlobalJob()) m.Mode = &v } } @@ -1738,32 +1738,32 @@ func (m *TaskSpec) CopyFrom(src interface{}) { *m = *o if o.Resources != nil { m.Resources = &ResourceRequirements{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resources, o.Resources) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resources, o.Resources) } if o.Restart != nil { m.Restart = &RestartPolicy{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Restart, o.Restart) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Restart, o.Restart) } if o.Placement != nil { m.Placement = &Placement{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Placement, o.Placement) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Placement, o.Placement) } if o.LogDriver != nil { m.LogDriver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.LogDriver, o.LogDriver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.LogDriver, o.LogDriver) } if o.Networks != nil { m.Networks = make([]*NetworkAttachmentConfig, len(o.Networks)) for i := range m.Networks { m.Networks[i] = &NetworkAttachmentConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Networks[i], o.Networks[i]) } } if o.ResourceReferences != nil { m.ResourceReferences = make([]ResourceReference, len(o.ResourceReferences)) for i := range m.ResourceReferences { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.ResourceReferences[i], &o.ResourceReferences[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.ResourceReferences[i], &o.ResourceReferences[i]) } } @@ -1773,19 +1773,19 @@ func (m *TaskSpec) CopyFrom(src interface{}) { v := TaskSpec_Attachment{ Attachment: &NetworkAttachmentSpec{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Attachment, o.GetAttachment()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Attachment, o.GetAttachment()) m.Runtime = &v case *TaskSpec_Container: v := TaskSpec_Container{ Container: &ContainerSpec{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Container, o.GetContainer()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Container, o.GetContainer()) m.Runtime = &v case *TaskSpec_Generic: v := TaskSpec_Generic{ Generic: &GenericRuntimeSpec{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Generic, o.GetGeneric()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Generic, o.GetGeneric()) m.Runtime = &v } } @@ -1822,7 +1822,7 @@ func (m *GenericRuntimeSpec) CopyFrom(src interface{}) { *m = *o if o.Payload != nil { m.Payload = &types.Any{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Payload, o.Payload) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Payload, o.Payload) } } @@ -1883,32 +1883,32 @@ func (m *ContainerSpec) CopyFrom(src interface{}) { if o.Privileges != nil { m.Privileges = &Privileges{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Privileges, o.Privileges) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Privileges, o.Privileges) } if o.Init != nil { m.Init = &types.BoolValue{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Init, o.Init) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Init, o.Init) } if o.Mounts != nil { m.Mounts = make([]Mount, len(o.Mounts)) for i := range m.Mounts { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Mounts[i], &o.Mounts[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Mounts[i], &o.Mounts[i]) } } if o.StopGracePeriod != nil { m.StopGracePeriod = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.StopGracePeriod, o.StopGracePeriod) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.StopGracePeriod, o.StopGracePeriod) } if o.PullOptions != nil { m.PullOptions = &ContainerSpec_PullOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.PullOptions, o.PullOptions) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.PullOptions, o.PullOptions) } if o.Secrets != nil { m.Secrets = make([]*SecretReference, len(o.Secrets)) for i := range m.Secrets { m.Secrets[i] = &SecretReference{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) } } @@ -1916,7 +1916,7 @@ func (m *ContainerSpec) CopyFrom(src interface{}) { m.Configs = make([]*ConfigReference, len(o.Configs)) for i := range m.Configs { m.Configs[i] = &ConfigReference{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) } } @@ -1927,11 +1927,11 @@ func (m *ContainerSpec) CopyFrom(src interface{}) { if o.DNSConfig != nil { m.DNSConfig = &ContainerSpec_DNSConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.DNSConfig, o.DNSConfig) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.DNSConfig, o.DNSConfig) } if o.Healthcheck != nil { m.Healthcheck = &HealthConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Healthcheck, o.Healthcheck) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Healthcheck, o.Healthcheck) } if o.Sysctls != nil { m.Sysctls = make(map[string]string, len(o.Sysctls)) @@ -1954,7 +1954,7 @@ func (m *ContainerSpec) CopyFrom(src interface{}) { m.Ulimits = make([]*ContainerSpec_Ulimit, len(o.Ulimits)) for i := range m.Ulimits { m.Ulimits[i] = &ContainerSpec_Ulimit{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Ulimits[i], o.Ulimits[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Ulimits[i], o.Ulimits[i]) } } @@ -2037,7 +2037,7 @@ func (m *EndpointSpec) CopyFrom(src interface{}) { m.Ports = make([]*PortConfig, len(o.Ports)) for i := range m.Ports { m.Ports[i] = &PortConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Ports[i], o.Ports[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Ports[i], o.Ports[i]) } } @@ -2056,14 +2056,14 @@ func (m *NetworkSpec) CopyFrom(src interface{}) { o := src.(*NetworkSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) if o.DriverConfig != nil { m.DriverConfig = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.DriverConfig, o.DriverConfig) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.DriverConfig, o.DriverConfig) } if o.IPAM != nil { m.IPAM = &IPAMOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.IPAM, o.IPAM) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.IPAM, o.IPAM) } if o.ConfigFrom != nil { switch o.ConfigFrom.(type) { @@ -2090,14 +2090,14 @@ func (m *ClusterSpec) CopyFrom(src interface{}) { o := src.(*ClusterSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.AcceptancePolicy, &o.AcceptancePolicy) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Orchestration, &o.Orchestration) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Raft, &o.Raft) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Dispatcher, &o.Dispatcher) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.CAConfig, &o.CAConfig) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.TaskDefaults, &o.TaskDefaults) - github_com_docker_swarmkit_api_deepcopy.Copy(&m.EncryptionConfig, &o.EncryptionConfig) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.AcceptancePolicy, &o.AcceptancePolicy) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Orchestration, &o.Orchestration) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Raft, &o.Raft) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Dispatcher, &o.Dispatcher) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.CAConfig, &o.CAConfig) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.TaskDefaults, &o.TaskDefaults) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.EncryptionConfig, &o.EncryptionConfig) } func (m *SecretSpec) Copy() *SecretSpec { @@ -2113,18 +2113,18 @@ func (m *SecretSpec) CopyFrom(src interface{}) { o := src.(*SecretSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) if o.Data != nil { m.Data = make([]byte, len(o.Data)) copy(m.Data, o.Data) } if o.Templating != nil { m.Templating = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Templating, o.Templating) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Templating, o.Templating) } if o.Driver != nil { m.Driver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Driver, o.Driver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Driver, o.Driver) } } @@ -2141,14 +2141,14 @@ func (m *ConfigSpec) CopyFrom(src interface{}) { o := src.(*ConfigSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) if o.Data != nil { m.Data = make([]byte, len(o.Data)) copy(m.Data, o.Data) } if o.Templating != nil { m.Templating = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Templating, o.Templating) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Templating, o.Templating) } } @@ -2165,30 +2165,30 @@ func (m *VolumeSpec) CopyFrom(src interface{}) { o := src.(*VolumeSpec) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Annotations, &o.Annotations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Annotations, &o.Annotations) if o.Driver != nil { m.Driver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Driver, o.Driver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Driver, o.Driver) } if o.AccessMode != nil { m.AccessMode = &VolumeAccessMode{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AccessMode, o.AccessMode) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AccessMode, o.AccessMode) } if o.Secrets != nil { m.Secrets = make([]*VolumeSecret, len(o.Secrets)) for i := range m.Secrets { m.Secrets[i] = &VolumeSecret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) } } if o.AccessibilityRequirements != nil { m.AccessibilityRequirements = &TopologyRequirement{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AccessibilityRequirements, o.AccessibilityRequirements) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AccessibilityRequirements, o.AccessibilityRequirements) } if o.CapacityRange != nil { m.CapacityRange = &CapacityRange{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.CapacityRange, o.CapacityRange) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.CapacityRange, o.CapacityRange) } } diff --git a/vendor/github.com/docker/swarmkit/api/specs.proto b/vendor/github.com/moby/swarmkit/v2/api/specs.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/specs.proto rename to vendor/github.com/moby/swarmkit/v2/api/specs.proto diff --git a/vendor/github.com/docker/swarmkit/api/storeobject.go b/vendor/github.com/moby/swarmkit/v2/api/storeobject.go similarity index 100% rename from vendor/github.com/docker/swarmkit/api/storeobject.go rename to vendor/github.com/moby/swarmkit/v2/api/storeobject.go diff --git a/vendor/github.com/docker/swarmkit/api/types.pb.go b/vendor/github.com/moby/swarmkit/v2/api/types.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/api/types.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/types.pb.go index f916111cd5..779e3e10c7 100644 --- a/vendor/github.com/docker/swarmkit/api/types.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/api/types.pb.go @@ -6,12 +6,12 @@ package api import ( encoding_binary "encoding/binary" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/gogo/protobuf/types" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" io "io" math "math" math_bits "math/bits" @@ -5455,7 +5455,7 @@ func (m *Annotations) CopyFrom(src interface{}) { if o.Indices != nil { m.Indices = make([]IndexEntry, len(o.Indices)) for i := range m.Indices { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Indices[i], &o.Indices[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Indices[i], &o.Indices[i]) } } @@ -5510,13 +5510,13 @@ func (m *GenericResource) CopyFrom(src interface{}) { v := GenericResource_NamedResourceSpec{ NamedResourceSpec: &NamedGenericResource{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.NamedResourceSpec, o.GetNamedResourceSpec()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.NamedResourceSpec, o.GetNamedResourceSpec()) m.Resource = &v case *GenericResource_DiscreteResourceSpec: v := GenericResource_DiscreteResourceSpec{ DiscreteResourceSpec: &DiscreteGenericResource{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.DiscreteResourceSpec, o.GetDiscreteResourceSpec()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.DiscreteResourceSpec, o.GetDiscreteResourceSpec()) m.Resource = &v } } @@ -5540,7 +5540,7 @@ func (m *Resources) CopyFrom(src interface{}) { m.Generic = make([]*GenericResource, len(o.Generic)) for i := range m.Generic { m.Generic[i] = &GenericResource{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Generic[i], o.Generic[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Generic[i], o.Generic[i]) } } @@ -5561,19 +5561,19 @@ func (m *ResourceRequirements) CopyFrom(src interface{}) { *m = *o if o.Limits != nil { m.Limits = &Resources{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Limits, o.Limits) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Limits, o.Limits) } if o.Reservations != nil { m.Reservations = &Resources{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Reservations, o.Reservations) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Reservations, o.Reservations) } if o.SwapBytes != nil { m.SwapBytes = &types.Int64Value{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.SwapBytes, o.SwapBytes) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.SwapBytes, o.SwapBytes) } if o.MemorySwappiness != nil { m.MemorySwappiness = &types.Int64Value{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.MemorySwappiness, o.MemorySwappiness) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.MemorySwappiness, o.MemorySwappiness) } } @@ -5630,7 +5630,7 @@ func (m *EngineDescription) CopyFrom(src interface{}) { if o.Plugins != nil { m.Plugins = make([]PluginDescription, len(o.Plugins)) for i := range m.Plugins { - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Plugins[i], &o.Plugins[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Plugins[i], &o.Plugins[i]) } } @@ -5651,25 +5651,25 @@ func (m *NodeDescription) CopyFrom(src interface{}) { *m = *o if o.Platform != nil { m.Platform = &Platform{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Platform, o.Platform) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Platform, o.Platform) } if o.Resources != nil { m.Resources = &Resources{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Resources, o.Resources) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Resources, o.Resources) } if o.Engine != nil { m.Engine = &EngineDescription{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Engine, o.Engine) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Engine, o.Engine) } if o.TLSInfo != nil { m.TLSInfo = &NodeTLSInfo{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.TLSInfo, o.TLSInfo) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.TLSInfo, o.TLSInfo) } if o.CSIInfo != nil { m.CSIInfo = make([]*NodeCSIInfo, len(o.CSIInfo)) for i := range m.CSIInfo { m.CSIInfo[i] = &NodeCSIInfo{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.CSIInfo[i], o.CSIInfo[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.CSIInfo[i], o.CSIInfo[i]) } } @@ -5717,7 +5717,7 @@ func (m *NodeCSIInfo) CopyFrom(src interface{}) { *m = *o if o.AccessibleTopology != nil { m.AccessibleTopology = &Topology{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AccessibleTopology, o.AccessibleTopology) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AccessibleTopology, o.AccessibleTopology) } } @@ -5781,15 +5781,15 @@ func (m *Mount) CopyFrom(src interface{}) { *m = *o if o.BindOptions != nil { m.BindOptions = &Mount_BindOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.BindOptions, o.BindOptions) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.BindOptions, o.BindOptions) } if o.VolumeOptions != nil { m.VolumeOptions = &Mount_VolumeOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.VolumeOptions, o.VolumeOptions) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.VolumeOptions, o.VolumeOptions) } if o.TmpfsOptions != nil { m.TmpfsOptions = &Mount_TmpfsOptions{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.TmpfsOptions, o.TmpfsOptions) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.TmpfsOptions, o.TmpfsOptions) } } @@ -5830,7 +5830,7 @@ func (m *Mount_VolumeOptions) CopyFrom(src interface{}) { if o.DriverConfig != nil { m.DriverConfig = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.DriverConfig, o.DriverConfig) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.DriverConfig, o.DriverConfig) } } @@ -5864,11 +5864,11 @@ func (m *RestartPolicy) CopyFrom(src interface{}) { *m = *o if o.Delay != nil { m.Delay = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Delay, o.Delay) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Delay, o.Delay) } if o.Window != nil { m.Window = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Window, o.Window) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Window, o.Window) } } @@ -5885,10 +5885,10 @@ func (m *UpdateConfig) CopyFrom(src interface{}) { o := src.(*UpdateConfig) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Delay, &o.Delay) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Delay, &o.Delay) if o.Monitor != nil { m.Monitor = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Monitor, o.Monitor) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Monitor, o.Monitor) } } @@ -5907,11 +5907,11 @@ func (m *UpdateStatus) CopyFrom(src interface{}) { *m = *o if o.StartedAt != nil { m.StartedAt = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.StartedAt, o.StartedAt) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.StartedAt, o.StartedAt) } if o.CompletedAt != nil { m.CompletedAt = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.CompletedAt, o.CompletedAt) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.CompletedAt, o.CompletedAt) } } @@ -5947,7 +5947,7 @@ func (m *PortStatus) CopyFrom(src interface{}) { m.Ports = make([]*PortConfig, len(o.Ports)) for i := range m.Ports { m.Ports[i] = &PortConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Ports[i], o.Ports[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Ports[i], o.Ports[i]) } } @@ -5968,15 +5968,15 @@ func (m *TaskStatus) CopyFrom(src interface{}) { *m = *o if o.Timestamp != nil { m.Timestamp = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Timestamp, o.Timestamp) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Timestamp, o.Timestamp) } if o.PortStatus != nil { m.PortStatus = &PortStatus{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.PortStatus, o.PortStatus) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.PortStatus, o.PortStatus) } if o.AppliedAt != nil { m.AppliedAt = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AppliedAt, o.AppliedAt) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AppliedAt, o.AppliedAt) } if o.RuntimeStatus != nil { switch o.RuntimeStatus.(type) { @@ -5984,7 +5984,7 @@ func (m *TaskStatus) CopyFrom(src interface{}) { v := TaskStatus_Container{ Container: &ContainerStatus{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Container, o.GetContainer()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Container, o.GetContainer()) m.RuntimeStatus = &v } } @@ -6097,13 +6097,13 @@ func (m *IPAMOptions) CopyFrom(src interface{}) { *m = *o if o.Driver != nil { m.Driver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Driver, o.Driver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Driver, o.Driver) } if o.Configs != nil { m.Configs = make([]*IPAMConfig, len(o.Configs)) for i := range m.Configs { m.Configs[i] = &IPAMConfig{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Configs[i], o.Configs[i]) } } @@ -6139,7 +6139,7 @@ func (m *WeightedPeer) CopyFrom(src interface{}) { *m = *o if o.Peer != nil { m.Peer = &Peer{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Peer, o.Peer) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Peer, o.Peer) } } @@ -6175,7 +6175,7 @@ func (m *AcceptancePolicy) CopyFrom(src interface{}) { m.Policies = make([]*AcceptancePolicy_RoleAdmissionPolicy, len(o.Policies)) for i := range m.Policies { m.Policies[i] = &AcceptancePolicy_RoleAdmissionPolicy{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Policies[i], o.Policies[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Policies[i], o.Policies[i]) } } @@ -6196,7 +6196,7 @@ func (m *AcceptancePolicy_RoleAdmissionPolicy) CopyFrom(src interface{}) { *m = *o if o.Secret != nil { m.Secret = &AcceptancePolicy_RoleAdmissionPolicy_Secret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secret, o.Secret) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secret, o.Secret) } } @@ -6260,13 +6260,13 @@ func (m *CAConfig) CopyFrom(src interface{}) { *m = *o if o.NodeCertExpiry != nil { m.NodeCertExpiry = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.NodeCertExpiry, o.NodeCertExpiry) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.NodeCertExpiry, o.NodeCertExpiry) } if o.ExternalCAs != nil { m.ExternalCAs = make([]*ExternalCA, len(o.ExternalCAs)) for i := range m.ExternalCAs { m.ExternalCAs[i] = &ExternalCA{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ExternalCAs[i], o.ExternalCAs[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ExternalCAs[i], o.ExternalCAs[i]) } } @@ -6310,7 +6310,7 @@ func (m *TaskDefaults) CopyFrom(src interface{}) { *m = *o if o.LogDriver != nil { m.LogDriver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.LogDriver, o.LogDriver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.LogDriver, o.LogDriver) } } @@ -6329,7 +6329,7 @@ func (m *DispatcherConfig) CopyFrom(src interface{}) { *m = *o if o.HeartbeatPeriod != nil { m.HeartbeatPeriod = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.HeartbeatPeriod, o.HeartbeatPeriod) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.HeartbeatPeriod, o.HeartbeatPeriod) } } @@ -6397,7 +6397,7 @@ func (m *PlacementPreference) CopyFrom(src interface{}) { v := PlacementPreference_Spread{ Spread: &SpreadOver{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Spread, o.GetSpread()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Spread, o.GetSpread()) m.Preference = &v } } @@ -6426,7 +6426,7 @@ func (m *Placement) CopyFrom(src interface{}) { m.Preferences = make([]*PlacementPreference, len(o.Preferences)) for i := range m.Preferences { m.Preferences[i] = &PlacementPreference{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Preferences[i], o.Preferences[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Preferences[i], o.Preferences[i]) } } @@ -6434,7 +6434,7 @@ func (m *Placement) CopyFrom(src interface{}) { m.Platforms = make([]*Platform, len(o.Platforms)) for i := range m.Platforms { m.Platforms[i] = &Platform{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Platforms[i], o.Platforms[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Platforms[i], o.Platforms[i]) } } @@ -6476,10 +6476,10 @@ func (m *RootCA) CopyFrom(src interface{}) { m.CACert = make([]byte, len(o.CACert)) copy(m.CACert, o.CACert) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.JoinTokens, &o.JoinTokens) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.JoinTokens, &o.JoinTokens) if o.RootRotation != nil { m.RootRotation = &RootRotation{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.RootRotation, o.RootRotation) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.RootRotation, o.RootRotation) } } @@ -6500,7 +6500,7 @@ func (m *Certificate) CopyFrom(src interface{}) { m.CSR = make([]byte, len(o.CSR)) copy(m.CSR, o.CSR) } - github_com_docker_swarmkit_api_deepcopy.Copy(&m.Status, &o.Status) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.Status, &o.Status) if o.Certificate != nil { m.Certificate = make([]byte, len(o.Certificate)) copy(m.Certificate, o.Certificate) @@ -6585,7 +6585,7 @@ func (m *SecretReference) CopyFrom(src interface{}) { v := SecretReference_File{ File: &FileTarget{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.File, o.GetFile()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.File, o.GetFile()) m.Target = &v } } @@ -6611,13 +6611,13 @@ func (m *ConfigReference) CopyFrom(src interface{}) { v := ConfigReference_File{ File: &FileTarget{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.File, o.GetFile()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.File, o.GetFile()) m.Target = &v case *ConfigReference_Runtime: v := ConfigReference_Runtime{ Runtime: &RuntimeTarget{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Runtime, o.GetRuntime()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Runtime, o.GetRuntime()) m.Target = &v } } @@ -6639,7 +6639,7 @@ func (m *BlacklistedCertificate) CopyFrom(src interface{}) { *m = *o if o.Expiry != nil { m.Expiry = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Expiry, o.Expiry) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Expiry, o.Expiry) } } @@ -6663,15 +6663,15 @@ func (m *HealthConfig) CopyFrom(src interface{}) { if o.Interval != nil { m.Interval = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Interval, o.Interval) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Interval, o.Interval) } if o.Timeout != nil { m.Timeout = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Timeout, o.Timeout) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Timeout, o.Timeout) } if o.StartPeriod != nil { m.StartPeriod = &types.Duration{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.StartPeriod, o.StartPeriod) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.StartPeriod, o.StartPeriod) } } @@ -6740,11 +6740,11 @@ func (m *Privileges) CopyFrom(src interface{}) { *m = *o if o.CredentialSpec != nil { m.CredentialSpec = &Privileges_CredentialSpec{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.CredentialSpec, o.CredentialSpec) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.CredentialSpec, o.CredentialSpec) } if o.SELinuxContext != nil { m.SELinuxContext = &Privileges_SELinuxContext{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.SELinuxContext, o.SELinuxContext) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.SELinuxContext, o.SELinuxContext) } } @@ -6811,10 +6811,10 @@ func (m *JobStatus) CopyFrom(src interface{}) { o := src.(*JobStatus) *m = *o - github_com_docker_swarmkit_api_deepcopy.Copy(&m.JobIteration, &o.JobIteration) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(&m.JobIteration, &o.JobIteration) if o.LastExecution != nil { m.LastExecution = &types.Timestamp{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.LastExecution, o.LastExecution) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.LastExecution, o.LastExecution) } } @@ -6837,13 +6837,13 @@ func (m *VolumeAccessMode) CopyFrom(src interface{}) { v := VolumeAccessMode_Block{ Block: &VolumeAccessMode_BlockVolume{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Block, o.GetBlock()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Block, o.GetBlock()) m.AccessType = &v case *VolumeAccessMode_Mount: v := VolumeAccessMode_Mount{ Mount: &VolumeAccessMode_MountVolume{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Mount, o.GetMount()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Mount, o.GetMount()) m.AccessType = &v } } @@ -6941,7 +6941,7 @@ func (m *VolumeInfo) CopyFrom(src interface{}) { m.AccessibleTopology = make([]*Topology, len(o.AccessibleTopology)) for i := range m.AccessibleTopology { m.AccessibleTopology[i] = &Topology{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AccessibleTopology[i], o.AccessibleTopology[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AccessibleTopology[i], o.AccessibleTopology[i]) } } @@ -6977,7 +6977,7 @@ func (m *VolumeAssignment) CopyFrom(src interface{}) { *m = *o if o.Driver != nil { m.Driver = &Driver{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Driver, o.Driver) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Driver, o.Driver) } if o.VolumeContext != nil { m.VolumeContext = make(map[string]string, len(o.VolumeContext)) @@ -6995,13 +6995,13 @@ func (m *VolumeAssignment) CopyFrom(src interface{}) { if o.AccessMode != nil { m.AccessMode = &VolumeAccessMode{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AccessMode, o.AccessMode) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AccessMode, o.AccessMode) } if o.Secrets != nil { m.Secrets = make([]*VolumeSecret, len(o.Secrets)) for i := range m.Secrets { m.Secrets[i] = &VolumeSecret{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Secrets[i], o.Secrets[i]) } } @@ -7039,7 +7039,7 @@ func (m *TopologyRequirement) CopyFrom(src interface{}) { m.Requisite = make([]*Topology, len(o.Requisite)) for i := range m.Requisite { m.Requisite[i] = &Topology{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Requisite[i], o.Requisite[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Requisite[i], o.Requisite[i]) } } @@ -7047,7 +7047,7 @@ func (m *TopologyRequirement) CopyFrom(src interface{}) { m.Preferred = make([]*Topology, len(o.Preferred)) for i := range m.Preferred { m.Preferred[i] = &Topology{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Preferred[i], o.Preferred[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Preferred[i], o.Preferred[i]) } } @@ -7090,7 +7090,7 @@ func (m *VolumeCapability) CopyFrom(src interface{}) { *m = *o if o.AccessMode != nil { m.AccessMode = &VolumeCapability_AccessMode{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.AccessMode, o.AccessMode) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.AccessMode, o.AccessMode) } if o.AccessType != nil { switch o.AccessType.(type) { @@ -7098,13 +7098,13 @@ func (m *VolumeCapability) CopyFrom(src interface{}) { v := VolumeCapability_Block{ Block: &VolumeCapability_BlockVolume{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Block, o.GetBlock()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Block, o.GetBlock()) m.AccessType = &v case *VolumeCapability_Mount: v := VolumeCapability_Mount{ Mount: &VolumeCapability_MountVolume{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Mount, o.GetMount()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Mount, o.GetMount()) m.AccessType = &v } } diff --git a/vendor/github.com/docker/swarmkit/api/types.proto b/vendor/github.com/moby/swarmkit/v2/api/types.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/types.proto rename to vendor/github.com/moby/swarmkit/v2/api/types.proto diff --git a/vendor/github.com/docker/swarmkit/api/watch.pb.go b/vendor/github.com/moby/swarmkit/v2/api/watch.pb.go similarity index 98% rename from vendor/github.com/docker/swarmkit/api/watch.pb.go rename to vendor/github.com/moby/swarmkit/v2/api/watch.pb.go index 2ff66cb5aa..9203d58db1 100644 --- a/vendor/github.com/docker/swarmkit/api/watch.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/api/watch.pb.go @@ -6,11 +6,11 @@ package api import ( context "context" fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" - raftselector "github.com/docker/swarmkit/manager/raftselector" - _ "github.com/docker/swarmkit/protobuf/plugin" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" + raftselector "github.com/moby/swarmkit/v2/manager/raftselector" + _ "github.com/moby/swarmkit/v2/protobuf/plugin" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" metadata "google.golang.org/grpc/metadata" @@ -920,61 +920,61 @@ func (m *Object) CopyFrom(src interface{}) { v := Object_Node{ Node: &Node{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Node, o.GetNode()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Node, o.GetNode()) m.Object = &v case *Object_Service: v := Object_Service{ Service: &Service{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Service, o.GetService()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Service, o.GetService()) m.Object = &v case *Object_Network: v := Object_Network{ Network: &Network{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Network, o.GetNetwork()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Network, o.GetNetwork()) m.Object = &v case *Object_Task: v := Object_Task{ Task: &Task{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Task, o.GetTask()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Task, o.GetTask()) m.Object = &v case *Object_Cluster: v := Object_Cluster{ Cluster: &Cluster{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Cluster, o.GetCluster()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Cluster, o.GetCluster()) m.Object = &v case *Object_Secret: v := Object_Secret{ Secret: &Secret{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Secret, o.GetSecret()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Secret, o.GetSecret()) m.Object = &v case *Object_Resource: v := Object_Resource{ Resource: &Resource{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Resource, o.GetResource()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Resource, o.GetResource()) m.Object = &v case *Object_Extension: v := Object_Extension{ Extension: &Extension{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Extension, o.GetExtension()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Extension, o.GetExtension()) m.Object = &v case *Object_Config: v := Object_Config{ Config: &Config{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Config, o.GetConfig()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Config, o.GetConfig()) m.Object = &v case *Object_Volume: v := Object_Volume{ Volume: &Volume{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Volume, o.GetVolume()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Volume, o.GetVolume()) m.Object = &v } } @@ -1050,13 +1050,13 @@ func (m *SelectBy) CopyFrom(src interface{}) { v := SelectBy_Custom{ Custom: &SelectByCustom{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Custom, o.GetCustom()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Custom, o.GetCustom()) m.By = &v case *SelectBy_CustomPrefix: v := SelectBy_CustomPrefix{ CustomPrefix: &SelectByCustom{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.CustomPrefix, o.GetCustomPrefix()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.CustomPrefix, o.GetCustomPrefix()) m.By = &v case *SelectBy_ServiceID: v := SelectBy_ServiceID{ @@ -1072,7 +1072,7 @@ func (m *SelectBy) CopyFrom(src interface{}) { v := SelectBy_Slot{ Slot: &SelectBySlot{}, } - github_com_docker_swarmkit_api_deepcopy.Copy(v.Slot, o.GetSlot()) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(v.Slot, o.GetSlot()) m.By = &v case *SelectBy_DesiredState: v := SelectBy_DesiredState{ @@ -1131,13 +1131,13 @@ func (m *WatchRequest) CopyFrom(src interface{}) { m.Entries = make([]*WatchRequest_WatchEntry, len(o.Entries)) for i := range m.Entries { m.Entries[i] = &WatchRequest_WatchEntry{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Entries[i], o.Entries[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Entries[i], o.Entries[i]) } } if o.ResumeFrom != nil { m.ResumeFrom = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.ResumeFrom, o.ResumeFrom) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.ResumeFrom, o.ResumeFrom) } } @@ -1158,7 +1158,7 @@ func (m *WatchRequest_WatchEntry) CopyFrom(src interface{}) { m.Filters = make([]*SelectBy, len(o.Filters)) for i := range m.Filters { m.Filters[i] = &SelectBy{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Filters[i], o.Filters[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Filters[i], o.Filters[i]) } } @@ -1181,13 +1181,13 @@ func (m *WatchMessage) CopyFrom(src interface{}) { m.Events = make([]*WatchMessage_Event, len(o.Events)) for i := range m.Events { m.Events[i] = &WatchMessage_Event{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Events[i], o.Events[i]) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Events[i], o.Events[i]) } } if o.Version != nil { m.Version = &Version{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Version, o.Version) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Version, o.Version) } } @@ -1206,11 +1206,11 @@ func (m *WatchMessage_Event) CopyFrom(src interface{}) { *m = *o if o.Object != nil { m.Object = &Object{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.Object, o.Object) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.Object, o.Object) } if o.OldObject != nil { m.OldObject = &Object{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.OldObject, o.OldObject) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.OldObject, o.OldObject) } } diff --git a/vendor/github.com/docker/swarmkit/api/watch.proto b/vendor/github.com/moby/swarmkit/v2/api/watch.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/api/watch.proto rename to vendor/github.com/moby/swarmkit/v2/api/watch.proto diff --git a/vendor/github.com/docker/swarmkit/manager/raftselector/raftselector.go b/vendor/github.com/moby/swarmkit/v2/manager/raftselector/raftselector.go similarity index 100% rename from vendor/github.com/docker/swarmkit/manager/raftselector/raftselector.go rename to vendor/github.com/moby/swarmkit/v2/manager/raftselector/raftselector.go diff --git a/vendor/github.com/docker/swarmkit/protobuf/plugin/helpers.go b/vendor/github.com/moby/swarmkit/v2/protobuf/plugin/helpers.go similarity index 100% rename from vendor/github.com/docker/swarmkit/protobuf/plugin/helpers.go rename to vendor/github.com/moby/swarmkit/v2/protobuf/plugin/helpers.go diff --git a/vendor/github.com/docker/swarmkit/protobuf/plugin/plugin.pb.go b/vendor/github.com/moby/swarmkit/v2/protobuf/plugin/plugin.pb.go similarity index 99% rename from vendor/github.com/docker/swarmkit/protobuf/plugin/plugin.pb.go rename to vendor/github.com/moby/swarmkit/v2/protobuf/plugin/plugin.pb.go index 1ff8cdc382..d947c8b530 100644 --- a/vendor/github.com/docker/swarmkit/protobuf/plugin/plugin.pb.go +++ b/vendor/github.com/moby/swarmkit/v2/protobuf/plugin/plugin.pb.go @@ -5,10 +5,10 @@ package plugin import ( fmt "fmt" - github_com_docker_swarmkit_api_deepcopy "github.com/docker/swarmkit/api/deepcopy" github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto" proto "github.com/gogo/protobuf/proto" descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" + github_com_moby_swarmkit_v2_api_deepcopy "github.com/moby/swarmkit/v2/api/deepcopy" io "io" math "math" math_bits "math/bits" @@ -267,7 +267,7 @@ func (m *StoreObject) CopyFrom(src interface{}) { *m = *o if o.WatchSelectors != nil { m.WatchSelectors = &WatchSelectors{} - github_com_docker_swarmkit_api_deepcopy.Copy(m.WatchSelectors, o.WatchSelectors) + github_com_moby_swarmkit_v2_api_deepcopy.Copy(m.WatchSelectors, o.WatchSelectors) } } diff --git a/vendor/github.com/docker/swarmkit/protobuf/plugin/plugin.proto b/vendor/github.com/moby/swarmkit/v2/protobuf/plugin/plugin.proto similarity index 100% rename from vendor/github.com/docker/swarmkit/protobuf/plugin/plugin.proto rename to vendor/github.com/moby/swarmkit/v2/protobuf/plugin/plugin.proto diff --git a/vendor/modules.txt b/vendor/modules.txt index 9427214920..798755b7bb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -96,14 +96,6 @@ github.com/docker/go-metrics # github.com/docker/go-units v0.4.0 ## explicit github.com/docker/go-units -# github.com/docker/swarmkit v1.12.1-0.20220307221335-616e8db4c3b0 -## explicit -github.com/docker/swarmkit/api -github.com/docker/swarmkit/api/deepcopy -github.com/docker/swarmkit/api/defaults -github.com/docker/swarmkit/api/genericresource -github.com/docker/swarmkit/manager/raftselector -github.com/docker/swarmkit/protobuf/plugin # github.com/fvbommel/sortorder v1.0.2 ## explicit; go 1.13 github.com/fvbommel/sortorder @@ -165,6 +157,14 @@ github.com/mitchellh/mapstructure ## explicit; go 1.17 github.com/moby/buildkit/frontend/dockerfile/dockerignore github.com/moby/buildkit/util/appcontext +# github.com/moby/swarmkit/v2 v2.0.0-20220420172245-6068d1894d46 +## explicit; go 1.17 +github.com/moby/swarmkit/v2/api +github.com/moby/swarmkit/v2/api/deepcopy +github.com/moby/swarmkit/v2/api/defaults +github.com/moby/swarmkit/v2/api/genericresource +github.com/moby/swarmkit/v2/manager/raftselector +github.com/moby/swarmkit/v2/protobuf/plugin # github.com/moby/sys/signal v0.7.0 ## explicit; go 1.16 github.com/moby/sys/signal @@ -392,3 +392,4 @@ gotest.tools/v3/poll gotest.tools/v3/skip # github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220429181837-2ed904cad705+incompatible # github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2 +# github.com/google/certificate-transparency-go => github.com/google/certificate-transparency-go v1.0.20