mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
vendor: github.com/Microsoft/hcsshim v0.8.22
No significant changes for our vendored code, but reverts back containerd minimal dependency to v1.4.9. full diff: https://github.com/Microsoft/hcsshim/compare/v0.8.20...v0.8.22 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
c09789c114
commit
c97d09b1e1
4 changed files with 42 additions and 2 deletions
|
@ -1,5 +1,5 @@
|
||||||
github.com/Azure/go-ansiterm d185dfc1b5a126116ea5a19e148e29d16b4574c9
|
github.com/Azure/go-ansiterm d185dfc1b5a126116ea5a19e148e29d16b4574c9
|
||||||
github.com/Microsoft/hcsshim 3ad51c76263bad09548a40e1996960814a12a870 # v0.8.20
|
github.com/Microsoft/hcsshim 717ae58b49c5e73b746938f94ae3c696ebd5d932 # v0.8.22
|
||||||
github.com/Microsoft/go-winio 6c24dfa01eb5906508a5ad06f4f6534a9be47456 # v0.5.1
|
github.com/Microsoft/go-winio 6c24dfa01eb5906508a5ad06f4f6534a9be47456 # v0.5.1
|
||||||
github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a
|
github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a
|
||||||
github.com/golang/gddo 72a348e765d293ed6d1ded7b699591f14d6cd921
|
github.com/golang/gddo 72a348e765d293ed6d1ded7b699591f14d6cd921
|
||||||
|
|
5
vendor/github.com/Microsoft/hcsshim/go.mod
generated
vendored
5
vendor/github.com/Microsoft/hcsshim/go.mod
generated
vendored
|
@ -6,7 +6,9 @@ require (
|
||||||
github.com/Microsoft/go-winio v0.4.17
|
github.com/Microsoft/go-winio v0.4.17
|
||||||
github.com/containerd/cgroups v1.0.1
|
github.com/containerd/cgroups v1.0.1
|
||||||
github.com/containerd/console v1.0.2
|
github.com/containerd/console v1.0.2
|
||||||
github.com/containerd/containerd v1.5.1
|
github.com/containerd/containerd v1.4.9
|
||||||
|
github.com/containerd/continuity v0.1.0 // indirect
|
||||||
|
github.com/containerd/fifo v1.0.0 // indirect
|
||||||
github.com/containerd/go-runc v1.0.0
|
github.com/containerd/go-runc v1.0.0
|
||||||
github.com/containerd/ttrpc v1.0.2
|
github.com/containerd/ttrpc v1.0.2
|
||||||
github.com/containerd/typeurl v1.0.2
|
github.com/containerd/typeurl v1.0.2
|
||||||
|
@ -19,6 +21,7 @@ require (
|
||||||
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
|
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
|
||||||
golang.org/x/sys v0.0.0-20210324051608-47abb6519492
|
golang.org/x/sys v0.0.0-20210324051608-47abb6519492
|
||||||
google.golang.org/grpc v1.33.2
|
google.golang.org/grpc v1.33.2
|
||||||
|
gotest.tools/v3 v3.0.3 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
replace (
|
replace (
|
||||||
|
|
8
vendor/github.com/Microsoft/hcsshim/hnsendpoint.go
generated
vendored
8
vendor/github.com/Microsoft/hcsshim/hnsendpoint.go
generated
vendored
|
@ -7,6 +7,9 @@ import (
|
||||||
// HNSEndpoint represents a network endpoint in HNS
|
// HNSEndpoint represents a network endpoint in HNS
|
||||||
type HNSEndpoint = hns.HNSEndpoint
|
type HNSEndpoint = hns.HNSEndpoint
|
||||||
|
|
||||||
|
// HNSEndpointStats represent the stats for an networkendpoint in HNS
|
||||||
|
type HNSEndpointStats = hns.EndpointStats
|
||||||
|
|
||||||
// Namespace represents a Compartment.
|
// Namespace represents a Compartment.
|
||||||
type Namespace = hns.Namespace
|
type Namespace = hns.Namespace
|
||||||
|
|
||||||
|
@ -108,3 +111,8 @@ func GetHNSEndpointByID(endpointID string) (*HNSEndpoint, error) {
|
||||||
func GetHNSEndpointByName(endpointName string) (*HNSEndpoint, error) {
|
func GetHNSEndpointByName(endpointName string) (*HNSEndpoint, error) {
|
||||||
return hns.GetHNSEndpointByName(endpointName)
|
return hns.GetHNSEndpointByName(endpointName)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetHNSEndpointStats gets the endpoint stats by ID
|
||||||
|
func GetHNSEndpointStats(endpointName string) (*HNSEndpointStats, error) {
|
||||||
|
return hns.GetHNSEndpointStats(endpointName)
|
||||||
|
}
|
||||||
|
|
29
vendor/github.com/Microsoft/hcsshim/internal/hns/hnsendpoint.go
generated
vendored
29
vendor/github.com/Microsoft/hcsshim/internal/hns/hnsendpoint.go
generated
vendored
|
@ -30,6 +30,7 @@ type HNSEndpoint struct {
|
||||||
EnableLowMetric bool `json:",omitempty"`
|
EnableLowMetric bool `json:",omitempty"`
|
||||||
Namespace *Namespace `json:",omitempty"`
|
Namespace *Namespace `json:",omitempty"`
|
||||||
EncapOverhead uint16 `json:",omitempty"`
|
EncapOverhead uint16 `json:",omitempty"`
|
||||||
|
SharedContainers []string `json:",omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
//SystemType represents the type of the system on which actions are done
|
//SystemType represents the type of the system on which actions are done
|
||||||
|
@ -57,6 +58,18 @@ type EndpointResquestResponse struct {
|
||||||
Error string
|
Error string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// EndpointStats is the object that has stats for a given endpoint
|
||||||
|
type EndpointStats struct {
|
||||||
|
BytesReceived uint64 `json:"BytesReceived"`
|
||||||
|
BytesSent uint64 `json:"BytesSent"`
|
||||||
|
DroppedPacketsIncoming uint64 `json:"DroppedPacketsIncoming"`
|
||||||
|
DroppedPacketsOutgoing uint64 `json:"DroppedPacketsOutgoing"`
|
||||||
|
EndpointID string `json:"EndpointId"`
|
||||||
|
InstanceID string `json:"InstanceId"`
|
||||||
|
PacketsReceived uint64 `json:"PacketsReceived"`
|
||||||
|
PacketsSent uint64 `json:"PacketsSent"`
|
||||||
|
}
|
||||||
|
|
||||||
// HNSEndpointRequest makes a HNS call to modify/query a network endpoint
|
// HNSEndpointRequest makes a HNS call to modify/query a network endpoint
|
||||||
func HNSEndpointRequest(method, path, request string) (*HNSEndpoint, error) {
|
func HNSEndpointRequest(method, path, request string) (*HNSEndpoint, error) {
|
||||||
endpoint := &HNSEndpoint{}
|
endpoint := &HNSEndpoint{}
|
||||||
|
@ -79,11 +92,27 @@ func HNSListEndpointRequest() ([]HNSEndpoint, error) {
|
||||||
return endpoint, nil
|
return endpoint, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// hnsEndpointStatsRequest makes a HNS call to query the stats for a given endpoint ID
|
||||||
|
func hnsEndpointStatsRequest(id string) (*EndpointStats, error) {
|
||||||
|
var stats EndpointStats
|
||||||
|
err := hnsCall("GET", "/endpointstats/"+id, "", &stats)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &stats, nil
|
||||||
|
}
|
||||||
|
|
||||||
// GetHNSEndpointByID get the Endpoint by ID
|
// GetHNSEndpointByID get the Endpoint by ID
|
||||||
func GetHNSEndpointByID(endpointID string) (*HNSEndpoint, error) {
|
func GetHNSEndpointByID(endpointID string) (*HNSEndpoint, error) {
|
||||||
return HNSEndpointRequest("GET", endpointID, "")
|
return HNSEndpointRequest("GET", endpointID, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetHNSEndpointStats get the stats for a n Endpoint by ID
|
||||||
|
func GetHNSEndpointStats(endpointID string) (*EndpointStats, error) {
|
||||||
|
return hnsEndpointStatsRequest(endpointID)
|
||||||
|
}
|
||||||
|
|
||||||
// GetHNSEndpointByName gets the endpoint filtered by Name
|
// GetHNSEndpointByName gets the endpoint filtered by Name
|
||||||
func GetHNSEndpointByName(endpointName string) (*HNSEndpoint, error) {
|
func GetHNSEndpointByName(endpointName string) (*HNSEndpoint, error) {
|
||||||
hnsResponse, err := HNSListEndpointRequest()
|
hnsResponse, err := HNSListEndpointRequest()
|
||||||
|
|
Loading…
Reference in a new issue