github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 00:07:50 +00:00
Code Issues Projects Releases Wiki Activity

Change Socket to Node

Browse Source 
Change Node from int in TopologyInfo to type NUMANode which is an int
This commit is contained in:
Louise Daly 2019-07-26 06:35:48 +01:00
parent c1fb5bd508
commit 674ecba935
2 changed files with 349 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

577
pkg/kubelet/apis/deviceplugin/v1beta1/api.pb.go
View File

@ -17,31 +17,6 @@ limitations under the License.
// Code generated by protoc-gen-gogo. DO NOT EDIT. // Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: api.proto // source: api.proto
<<<<<<< HEAD
=======
/*
Package v1beta1 is a generated protocol buffer package.
It is generated from these files:
api.proto
It has these top-level messages:
DevicePluginOptions
RegisterRequest
Empty
ListAndWatchResponse
TopologyInfo
Device
PreStartContainerRequest
PreStartContainerResponse
AllocateRequest
ContainerAllocateRequest
AllocateResponse
ContainerAllocateResponse
Mount
DeviceSpec
*/
>>>>>>> Device Plugin API change to include Topology Info in Devices
package v1beta1 package v1beta1
import ( import (
@ -277,16 +252,91 @@ func (m *ListAndWatchResponse) GetDevices() []*Device {
} }
type TopologyInfo struct { type TopologyInfo struct {
Socket int64 `protobuf:"varint,1,opt,name=socket,proto3" json:"socket,omitempty"` Node *NUMANode `protobuf:"bytes,1,opt,name=node,proto3" json:"node,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_sizecache int32 `json:"-"`
} }
func (m *TopologyInfo) Reset() { *m = TopologyInfo{} } func (m *TopologyInfo) Reset() { *m = TopologyInfo{} }
func (*TopologyInfo) ProtoMessage() {} func (*TopologyInfo) ProtoMessage() {}
func (*TopologyInfo) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{4} } func (*TopologyInfo) Descriptor() ([]byte, []int) {
return fileDescriptor_00212fb1f9d3bf1c, []int{4}
}
func (m *TopologyInfo) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
func (m *TopologyInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
return xxx_messageInfo_TopologyInfo.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
return b[:n], nil
}
}
func (m *TopologyInfo) XXX_Merge(src proto.Message) {
xxx_messageInfo_TopologyInfo.Merge(m, src)
}
func (m *TopologyInfo) XXX_Size() int {
return m.Size()
}
func (m *TopologyInfo) XXX_DiscardUnknown() {
xxx_messageInfo_TopologyInfo.DiscardUnknown(m)
}
func (m *TopologyInfo) GetSocket() int64 { var xxx_messageInfo_TopologyInfo proto.InternalMessageInfo
func (m *TopologyInfo) GetNode() *NUMANode {
if m != nil { if m != nil {
return m.Socket return m.Node
}
return nil
}
type NUMANode struct {
ID int64 `protobuf:"varint,1,opt,name=ID,json=iD,proto3" json:"ID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *NUMANode) Reset() { *m = NUMANode{} }
func (*NUMANode) ProtoMessage() {}
func (*NUMANode) Descriptor() ([]byte, []int) {
return fileDescriptor_00212fb1f9d3bf1c, []int{5}
}
func (m *NUMANode) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
func (m *NUMANode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
return xxx_messageInfo_NUMANode.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
return b[:n], nil
}
}
func (m *NUMANode) XXX_Merge(src proto.Message) {
xxx_messageInfo_NUMANode.Merge(m, src)
}
func (m *NUMANode) XXX_Size() int {
return m.Size()
}
func (m *NUMANode) XXX_DiscardUnknown() {
xxx_messageInfo_NUMANode.DiscardUnknown(m)
}
var xxx_messageInfo_NUMANode proto.InternalMessageInfo
func (m *NUMANode) GetID() int64 {
if m != nil {
return m.ID
} }
return 0 return 0
} }
@ -295,21 +345,19 @@ func (m *TopologyInfo) GetSocket() int64 {
// struct Device { // struct Device {
// ID: "GPU-fef8089b-4820-abfc-e83e-94318197576e", // ID: "GPU-fef8089b-4820-abfc-e83e-94318197576e",
// State: "Healthy", // State: "Healthy",
<<<<<<< HEAD
//}
=======
// Topology: // Topology:
// Socket: 1 // Node:
//ID: 1
//} //}
>>>>>>> Device Plugin API change to include Topology Info in Devices
type Device struct { type Device struct {
// A unique ID assigned by the device plugin used // A unique ID assigned by the device plugin used
// to identify devices during the communication // to identify devices during the communication
// Max length of this field is 63 characters // Max length of this field is 63 characters
ID string `protobuf:"bytes,1,opt,name=ID,json=iD,proto3" json:"ID,omitempty"` ID string `protobuf:"bytes,1,opt,name=ID,json=iD,proto3" json:"ID,omitempty"`
// Health of the device, can be healthy or unhealthy, see constants.go // Health of the device, can be healthy or unhealthy, see constants.go
<<<<<<< HEAD
Health string `protobuf:"bytes,2,opt,name=health,proto3" json:"health,omitempty"` Health string `protobuf:"bytes,2,opt,name=health,proto3" json:"health,omitempty"`
// Topology for device
Topology *TopologyInfo `protobuf:"bytes,3,opt,name=topology,proto3" json:"topology,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
} }
@ -317,7 +365,7 @@ type Device struct {
func (m *Device) Reset() { *m = Device{} } func (m *Device) Reset() { *m = Device{} }
func (*Device) ProtoMessage() {} func (*Device) ProtoMessage() {}
func (*Device) Descriptor() ([]byte, []int) { func (*Device) Descriptor() ([]byte, []int) {
return fileDescriptor_00212fb1f9d3bf1c, []int{4} return fileDescriptor_00212fb1f9d3bf1c, []int{6}
} }
func (m *Device) XXX_Unmarshal(b []byte) error { func (m *Device) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -345,16 +393,6 @@ func (m *Device) XXX_DiscardUnknown() {
} }
var xxx_messageInfo_Device proto.InternalMessageInfo var xxx_messageInfo_Device proto.InternalMessageInfo
=======
Health string `protobuf:"bytes,2,opt,name=health,proto3" json:"health,omitempty"`
// Topology for device
Topology *TopologyInfo `protobuf:"bytes,3,opt,name=topology" json:"topology,omitempty"`
}
func (m *Device) Reset() { *m = Device{} }
func (*Device) ProtoMessage() {}
func (*Device) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{5} }
>>>>>>> Device Plugin API change to include Topology Info in Devices
func (m *Device) GetID() string { func (m *Device) GetID() string {
if m != nil { if m != nil {
@ -387,11 +425,10 @@ type PreStartContainerRequest struct {
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
} }
<<<<<<< HEAD
func (m *PreStartContainerRequest) Reset() { *m = PreStartContainerRequest{} } func (m *PreStartContainerRequest) Reset() { *m = PreStartContainerRequest{} }
func (*PreStartContainerRequest) ProtoMessage() {} func (*PreStartContainerRequest) ProtoMessage() {}
func (*PreStartContainerRequest) Descriptor() ([]byte, []int) { func (*PreStartContainerRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_00212fb1f9d3bf1c, []int{5} return fileDescriptor_00212fb1f9d3bf1c, []int{7}
} }
func (m *PreStartContainerRequest) XXX_Unmarshal(b []byte) error { func (m *PreStartContainerRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -419,11 +456,6 @@ func (m *PreStartContainerRequest) XXX_DiscardUnknown() {
} }
var xxx_messageInfo_PreStartContainerRequest proto.InternalMessageInfo var xxx_messageInfo_PreStartContainerRequest proto.InternalMessageInfo
=======
func (m *PreStartContainerRequest) Reset() { *m = PreStartContainerRequest{} }
func (*PreStartContainerRequest) ProtoMessage() {}
func (*PreStartContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{6} }
>>>>>>> Device Plugin API change to include Topology Info in Devices
func (m *PreStartContainerRequest) GetDevicesIDs() []string { func (m *PreStartContainerRequest) GetDevicesIDs() []string {
if m != nil { if m != nil {
@ -438,11 +470,10 @@ type PreStartContainerResponse struct {
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
} }
<<<<<<< HEAD
func (m *PreStartContainerResponse) Reset() { *m = PreStartContainerResponse{} } func (m *PreStartContainerResponse) Reset() { *m = PreStartContainerResponse{} }
func (*PreStartContainerResponse) ProtoMessage() {} func (*PreStartContainerResponse) ProtoMessage() {}
func (*PreStartContainerResponse) Descriptor() ([]byte, []int) { func (*PreStartContainerResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_00212fb1f9d3bf1c, []int{6} return fileDescriptor_00212fb1f9d3bf1c, []int{8}
} }
func (m *PreStartContainerResponse) XXX_Unmarshal(b []byte) error { func (m *PreStartContainerResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -470,11 +501,6 @@ func (m *PreStartContainerResponse) XXX_DiscardUnknown() {
} }
var xxx_messageInfo_PreStartContainerResponse proto.InternalMessageInfo var xxx_messageInfo_PreStartContainerResponse proto.InternalMessageInfo
=======
func (m *PreStartContainerResponse) Reset() { *m = PreStartContainerResponse{} }
func (*PreStartContainerResponse) ProtoMessage() {}
func (*PreStartContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{7} }
>>>>>>> Device Plugin API change to include Topology Info in Devices
// - Allocate is expected to be called during pod creation since allocation // - Allocate is expected to be called during pod creation since allocation
// failures for any container would result in pod startup failure. // failures for any container would result in pod startup failure.
@ -488,11 +514,10 @@ type AllocateRequest struct {
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
} }
<<<<<<< HEAD
func (m *AllocateRequest) Reset() { *m = AllocateRequest{} } func (m *AllocateRequest) Reset() { *m = AllocateRequest{} }
func (*AllocateRequest) ProtoMessage() {} func (*AllocateRequest) ProtoMessage() {}
func (*AllocateRequest) Descriptor() ([]byte, []int) { func (*AllocateRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_00212fb1f9d3bf1c, []int{7} return fileDescriptor_00212fb1f9d3bf1c, []int{9}
} }
func (m *AllocateRequest) XXX_Unmarshal(b []byte) error { func (m *AllocateRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -520,11 +545,6 @@ func (m *AllocateRequest) XXX_DiscardUnknown() {
} }
var xxx_messageInfo_AllocateRequest proto.InternalMessageInfo var xxx_messageInfo_AllocateRequest proto.InternalMessageInfo
=======
func (m *AllocateRequest) Reset() { *m = AllocateRequest{} }
func (*AllocateRequest) ProtoMessage() {}
func (*AllocateRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{8} }
>>>>>>> Device Plugin API change to include Topology Info in Devices
func (m *AllocateRequest) GetContainerRequests() []*ContainerAllocateRequest { func (m *AllocateRequest) GetContainerRequests() []*ContainerAllocateRequest {
if m != nil { if m != nil {
@ -539,11 +559,10 @@ type ContainerAllocateRequest struct {
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
} }
<<<<<<< HEAD
func (m *ContainerAllocateRequest) Reset() { *m = ContainerAllocateRequest{} } func (m *ContainerAllocateRequest) Reset() { *m = ContainerAllocateRequest{} }
func (*ContainerAllocateRequest) ProtoMessage() {} func (*ContainerAllocateRequest) ProtoMessage() {}
func (*ContainerAllocateRequest) Descriptor() ([]byte, []int) { func (*ContainerAllocateRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_00212fb1f9d3bf1c, []int{8} return fileDescriptor_00212fb1f9d3bf1c, []int{10}
} }
func (m *ContainerAllocateRequest) XXX_Unmarshal(b []byte) error { func (m *ContainerAllocateRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -571,11 +590,6 @@ func (m *ContainerAllocateRequest) XXX_DiscardUnknown() {
} }
var xxx_messageInfo_ContainerAllocateRequest proto.InternalMessageInfo var xxx_messageInfo_ContainerAllocateRequest proto.InternalMessageInfo
=======
func (m *ContainerAllocateRequest) Reset() { *m = ContainerAllocateRequest{} }
func (*ContainerAllocateRequest) ProtoMessage() {}
func (*ContainerAllocateRequest) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{9} }
>>>>>>> Device Plugin API change to include Topology Info in Devices
func (m *ContainerAllocateRequest) GetDevicesIDs() []string { func (m *ContainerAllocateRequest) GetDevicesIDs() []string {
if m != nil { if m != nil {
@ -601,7 +615,7 @@ type AllocateResponse struct {
func (m *AllocateResponse) Reset() { *m = AllocateResponse{} } func (m *AllocateResponse) Reset() { *m = AllocateResponse{} }
func (*AllocateResponse) ProtoMessage() {} func (*AllocateResponse) ProtoMessage() {}
func (*AllocateResponse) Descriptor() ([]byte, []int) { func (*AllocateResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_00212fb1f9d3bf1c, []int{9} return fileDescriptor_00212fb1f9d3bf1c, []int{11}
} }
func (m *AllocateResponse) XXX_Unmarshal(b []byte) error { func (m *AllocateResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -628,13 +642,7 @@ func (m *AllocateResponse) XXX_DiscardUnknown() {
xxx_messageInfo_AllocateResponse.DiscardUnknown(m) xxx_messageInfo_AllocateResponse.DiscardUnknown(m)
} }
<<<<<<< HEAD
var xxx_messageInfo_AllocateResponse proto.InternalMessageInfo var xxx_messageInfo_AllocateResponse proto.InternalMessageInfo
=======
func (m *AllocateResponse) Reset() { *m = AllocateResponse{} }
func (*AllocateResponse) ProtoMessage() {}
func (*AllocateResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{10} }
>>>>>>> Device Plugin API change to include Topology Info in Devices
func (m *AllocateResponse) GetContainerResponses() []*ContainerAllocateResponse { func (m *AllocateResponse) GetContainerResponses() []*ContainerAllocateResponse {
if m != nil { if m != nil {
@ -656,11 +664,10 @@ type ContainerAllocateResponse struct {
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
} }
<<<<<<< HEAD
func (m *ContainerAllocateResponse) Reset() { *m = ContainerAllocateResponse{} } func (m *ContainerAllocateResponse) Reset() { *m = ContainerAllocateResponse{} }
func (*ContainerAllocateResponse) ProtoMessage() {} func (*ContainerAllocateResponse) ProtoMessage() {}
func (*ContainerAllocateResponse) Descriptor() ([]byte, []int) { func (*ContainerAllocateResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_00212fb1f9d3bf1c, []int{10} return fileDescriptor_00212fb1f9d3bf1c, []int{12}
} }
func (m *ContainerAllocateResponse) XXX_Unmarshal(b []byte) error { func (m *ContainerAllocateResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -688,11 +695,6 @@ func (m *ContainerAllocateResponse) XXX_DiscardUnknown() {
} }
var xxx_messageInfo_ContainerAllocateResponse proto.InternalMessageInfo var xxx_messageInfo_ContainerAllocateResponse proto.InternalMessageInfo
=======
func (m *ContainerAllocateResponse) Reset() { *m = ContainerAllocateResponse{} }
func (*ContainerAllocateResponse) ProtoMessage() {}
func (*ContainerAllocateResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{11} }
>>>>>>> Device Plugin API change to include Topology Info in Devices
func (m *ContainerAllocateResponse) GetEnvs() map[string]string { func (m *ContainerAllocateResponse) GetEnvs() map[string]string {
if m != nil { if m != nil {
@ -738,7 +740,7 @@ type Mount struct {
func (m *Mount) Reset() { *m = Mount{} } func (m *Mount) Reset() { *m = Mount{} }
func (*Mount) ProtoMessage() {} func (*Mount) ProtoMessage() {}
func (*Mount) Descriptor() ([]byte, []int) { func (*Mount) Descriptor() ([]byte, []int) {
return fileDescriptor_00212fb1f9d3bf1c, []int{11} return fileDescriptor_00212fb1f9d3bf1c, []int{13}
} }
func (m *Mount) XXX_Unmarshal(b []byte) error { func (m *Mount) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -765,13 +767,7 @@ func (m *Mount) XXX_DiscardUnknown() {
xxx_messageInfo_Mount.DiscardUnknown(m) xxx_messageInfo_Mount.DiscardUnknown(m)
} }
<<<<<<< HEAD
var xxx_messageInfo_Mount proto.InternalMessageInfo var xxx_messageInfo_Mount proto.InternalMessageInfo
=======
func (m *Mount) Reset() { *m = Mount{} }
func (*Mount) ProtoMessage() {}
func (*Mount) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{12} }
>>>>>>> Device Plugin API change to include Topology Info in Devices
func (m *Mount) GetContainerPath() string { func (m *Mount) GetContainerPath() string {
if m != nil { if m != nil {
@ -812,7 +808,7 @@ type DeviceSpec struct {
func (m *DeviceSpec) Reset() { *m = DeviceSpec{} } func (m *DeviceSpec) Reset() { *m = DeviceSpec{} }
func (*DeviceSpec) ProtoMessage() {} func (*DeviceSpec) ProtoMessage() {}
func (*DeviceSpec) Descriptor() ([]byte, []int) { func (*DeviceSpec) Descriptor() ([]byte, []int) {
return fileDescriptor_00212fb1f9d3bf1c, []int{12} return fileDescriptor_00212fb1f9d3bf1c, []int{14}
} }
func (m *DeviceSpec) XXX_Unmarshal(b []byte) error { func (m *DeviceSpec) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -839,13 +835,7 @@ func (m *DeviceSpec) XXX_DiscardUnknown() {
xxx_messageInfo_DeviceSpec.DiscardUnknown(m) xxx_messageInfo_DeviceSpec.DiscardUnknown(m)
} }
<<<<<<< HEAD
var xxx_messageInfo_DeviceSpec proto.InternalMessageInfo var xxx_messageInfo_DeviceSpec proto.InternalMessageInfo
=======
func (m *DeviceSpec) Reset() { *m = DeviceSpec{} }
func (*DeviceSpec) ProtoMessage() {}
func (*DeviceSpec) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{13} }
>>>>>>> Device Plugin API change to include Topology Info in Devices
func (m *DeviceSpec) GetContainerPath() string { func (m *DeviceSpec) GetContainerPath() string {
if m != nil { if m != nil {
@ -874,6 +864,7 @@ func init() {
proto.RegisterType((*Empty)(nil), "v1beta1.Empty") proto.RegisterType((*Empty)(nil), "v1beta1.Empty")
proto.RegisterType((*ListAndWatchResponse)(nil), "v1beta1.ListAndWatchResponse") proto.RegisterType((*ListAndWatchResponse)(nil), "v1beta1.ListAndWatchResponse")
proto.RegisterType((*TopologyInfo)(nil), "v1beta1.TopologyInfo") proto.RegisterType((*TopologyInfo)(nil), "v1beta1.TopologyInfo")
proto.RegisterType((*NUMANode)(nil), "v1beta1.NUMANode")
proto.RegisterType((*Device)(nil), "v1beta1.Device") proto.RegisterType((*Device)(nil), "v1beta1.Device")
proto.RegisterType((*PreStartContainerRequest)(nil), "v1beta1.PreStartContainerRequest") proto.RegisterType((*PreStartContainerRequest)(nil), "v1beta1.PreStartContainerRequest")
proto.RegisterType((*PreStartContainerResponse)(nil), "v1beta1.PreStartContainerResponse") proto.RegisterType((*PreStartContainerResponse)(nil), "v1beta1.PreStartContainerResponse")
@ -890,55 +881,59 @@ func init() {
func init() { proto.RegisterFile("api.proto", fileDescriptor_00212fb1f9d3bf1c) } func init() { proto.RegisterFile("api.proto", fileDescriptor_00212fb1f9d3bf1c) }
var fileDescriptor_00212fb1f9d3bf1c = []byte{ var fileDescriptor_00212fb1f9d3bf1c = []byte{
// 760 bytes of a gzipped FileDescriptorProto // 824 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x4e, 0xdb, 0x4a, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xdd, 0x8e, 0xdb, 0x44,
0x14, 0x8e, 0x13, 0xc8, 0xcf, 0x49, 0x80, 0x30, 0x20, 0x64, 0x0c, 0xd7, 0xca, 0xf5, 0xd5, 0xbd, 0x14, 0x8e, 0x93, 0xdd, 0x8d, 0x73, 0x92, 0xee, 0x66, 0x67, 0x4b, 0xe5, 0x75, 0x8b, 0x15, 0x06,
0xe2, 0x4a, 0x10, 0x20, 0x48, 0xdc, 0x2b, 0x16, 0x55, 0x53, 0x42, 0x5b, 0xa4, 0xb6, 0x44, 0x46, 0x15, 0x2d, 0x52, 0x9b, 0xb2, 0xa9, 0x28, 0xa8, 0x17, 0x88, 0xd0, 0x2c, 0xb0, 0x12, 0xdd, 0x46,
0x55, 0x37, 0x95, 0x22, 0xc7, 0x99, 0xc6, 0x56, 0x93, 0x19, 0xd7, 0x33, 0x89, 0x94, 0x5d, 0x17, 0xb3, 0x54, 0xdc, 0x20, 0x45, 0x8e, 0x33, 0x8d, 0x2d, 0x9c, 0x19, 0xe3, 0x99, 0x44, 0xca, 0x1d,
0x7d, 0x80, 0x3e, 0x44, 0x1f, 0xa3, 0x0f, 0xc0, 0xb2, 0xcb, 0x2e, 0x4b, 0xfa, 0x22, 0x95, 0xc7, 0x17, 0x3c, 0x00, 0x0f, 0xc1, 0x63, 0xf0, 0x00, 0xbd, 0xe4, 0x92, 0x4b, 0x1a, 0x5e, 0x04, 0x79,
0x1e, 0x3b, 0x32, 0x01, 0x5a, 0xa9, 0x3b, 0xcf, 0x77, 0xce, 0xf7, 0xcd, 0x39, 0x67, 0x4e, 0xbe, 0xec, 0xb1, 0x2d, 0x37, 0xbb, 0x0b, 0x52, 0xef, 0x7c, 0x7e, 0xbe, 0x33, 0xdf, 0x9c, 0x73, 0xe6,
0x40, 0xc9, 0xf2, 0xdc, 0xba, 0xe7, 0x53, 0x4e, 0x51, 0x61, 0x7c, 0xd8, 0xc5, 0xdc, 0x3a, 0xd4, 0x33, 0xb4, 0xdc, 0x28, 0xe8, 0x47, 0x31, 0x97, 0x1c, 0x35, 0x57, 0xa7, 0x53, 0x2a, 0xdd, 0x53,
0xf6, 0xfa, 0x2e, 0x77, 0x46, 0xdd, 0xba, 0x4d, 0x87, 0xfb, 0x7d, 0xda, 0xa7, 0xfb, 0x22, 0xde, 0xfb, 0xe1, 0x3c, 0x90, 0xfe, 0x72, 0xda, 0xf7, 0xf8, 0xe2, 0xd1, 0x9c, 0xcf, 0xf9, 0x23, 0x15,
0x1d, 0xbd, 0x11, 0x27, 0x71, 0x10, 0x5f, 0x21, 0xcf, 0x38, 0x85, 0xb5, 0x16, 0x1e, 0xbb, 0x36, 0x9f, 0x2e, 0x5f, 0x29, 0x4b, 0x19, 0xea, 0x2b, 0xc5, 0xe1, 0x67, 0x70, 0x34, 0xa2, 0xab, 0xc0,
0x6e, 0x0f, 0x46, 0x7d, 0x97, 0x5c, 0x78, 0xdc, 0xa5, 0x84, 0xa1, 0x5d, 0x40, 0x9e, 0x8f, 0x3b, 0xa3, 0xe3, 0x70, 0x39, 0x0f, 0xd8, 0x8b, 0x48, 0x06, 0x9c, 0x09, 0xf4, 0x00, 0x50, 0x14, 0xd3,
0x8c, 0x5b, 0x3e, 0xef, 0xf8, 0xf8, 0xdd, 0xc8, 0xf5, 0x71, 0x4f, 0x55, 0x6a, 0xca, 0x4e, 0xd1, 0x89, 0x90, 0x6e, 0x2c, 0x27, 0x31, 0xfd, 0x79, 0x19, 0xc4, 0x74, 0x66, 0x19, 0x3d, 0xe3, 0xc4,
0xac, 0x7a, 0x3e, 0xbe, 0x0c, 0x02, 0x66, 0x84, 0x1b, 0x9f, 0x14, 0x58, 0x31, 0x71, 0xdf, 0x65, 0x24, 0xdd, 0x28, 0xa6, 0x97, 0x49, 0x80, 0x64, 0x7e, 0xfc, 0xbb, 0x01, 0x07, 0x84, 0xce, 0x03,
0x1c, 0xfb, 0x01, 0x88, 0x19, 0x47, 0x2a, 0x14, 0xc6, 0xd8, 0x67, 0x2e, 0x25, 0x82, 0x56, 0x32, 0x21, 0x69, 0x9c, 0x38, 0xa9, 0x90, 0xc8, 0x82, 0xe6, 0x8a, 0xc6, 0x22, 0xe0, 0x4c, 0xc1, 0x5a,
0xe5, 0x11, 0x69, 0x50, 0xc4, 0xa4, 0xe7, 0x51, 0x97, 0x70, 0x35, 0x2b, 0x42, 0xf1, 0x19, 0xfd, 0x44, 0x9b, 0xc8, 0x06, 0x93, 0xb2, 0x59, 0xc4, 0x03, 0x26, 0xad, 0xba, 0x0a, 0xe5, 0x36, 0xfa,
0x05, 0x4b, 0x3e, 0x66, 0x74, 0xe4, 0xdb, 0xb8, 0x43, 0xac, 0x21, 0x56, 0x73, 0x22, 0xa1, 0x22, 0x10, 0x6e, 0xc5, 0x54, 0xf0, 0x65, 0xec, 0xd1, 0x09, 0x73, 0x17, 0xd4, 0x6a, 0xa8, 0x84, 0x8e,
0xc1, 0x17, 0xd6, 0x10, 0xa3, 0x63, 0x28, 0xd0, 0xb0, 0x4e, 0x75, 0xa1, 0xa6, 0xec, 0x94, 0x1b, 0x76, 0x5e, 0xb8, 0x0b, 0x8a, 0x9e, 0x40, 0x93, 0xa7, 0x3c, 0xad, 0x9d, 0x9e, 0x71, 0xd2, 0x1e,
0xdb, 0xf5, 0xa8, 0xfb, 0xfa, 0x9c, 0x5e, 0x4c, 0x99, 0x6c, 0x14, 0x60, 0xf1, 0x6c, 0xe8, 0xf1, 0xdc, 0xeb, 0x67, 0xb7, 0xef, 0x6f, 0xb9, 0x0b, 0xd1, 0xc9, 0xb8, 0x09, 0xbb, 0x67, 0x8b, 0x48,
0x89, 0xd1, 0x84, 0xf5, 0x67, 0x2e, 0xe3, 0x4d, 0xd2, 0x7b, 0x65, 0x71, 0xdb, 0x31, 0x31, 0xf3, 0xae, 0xf1, 0x10, 0x6e, 0x7f, 0x17, 0x08, 0x39, 0x64, 0xb3, 0x1f, 0x5c, 0xe9, 0xf9, 0x84, 0x8a,
0x28, 0x61, 0x18, 0xfd, 0x0b, 0x85, 0x9e, 0x10, 0x60, 0xaa, 0x52, 0xcb, 0xed, 0x94, 0x1b, 0x2b, 0x88, 0x33, 0x41, 0xd1, 0xc7, 0xd0, 0x9c, 0xa9, 0x02, 0xc2, 0x32, 0x7a, 0x8d, 0x93, 0xf6, 0xe0,
0x29, 0x61, 0x53, 0xc6, 0x8d, 0x03, 0xc8, 0x87, 0x10, 0x5a, 0x86, 0xec, 0x79, 0x2b, 0xea, 0x31, 0xa0, 0x52, 0x98, 0xe8, 0x38, 0xfe, 0x14, 0x3a, 0xdf, 0xf3, 0x88, 0x87, 0x7c, 0xbe, 0x3e, 0x67,
0xeb, 0xb6, 0xd0, 0x06, 0xe4, 0x1d, 0x6c, 0x0d, 0xb8, 0x13, 0x35, 0x17, 0x9d, 0x8c, 0x13, 0x50, 0xaf, 0x38, 0xba, 0x0f, 0x3b, 0x8c, 0xcf, 0xa8, 0xba, 0x6b, 0x7b, 0x70, 0x98, 0xe3, 0x2e, 0x5e,
0xdb, 0xd1, 0xe0, 0x4e, 0x29, 0xe1, 0x96, 0x4b, 0x92, 0x61, 0xe9, 0x00, 0x91, 0xf0, 0x79, 0x2b, 0x3e, 0x1f, 0x5e, 0xf0, 0x19, 0x25, 0x2a, 0x8c, 0x6d, 0x30, 0xb5, 0x07, 0xed, 0x43, 0xfd, 0x7c,
0xbc, 0xbb, 0x64, 0xce, 0x20, 0xc6, 0x16, 0x6c, 0xce, 0xe1, 0x86, 0x55, 0x1b, 0x36, 0xac, 0x34, 0xa4, 0x00, 0x0d, 0x52, 0x0f, 0x46, 0xd8, 0x83, 0xbd, 0xf4, 0x94, 0x52, 0xa4, 0x95, 0x44, 0xd0,
0x07, 0x03, 0x6a, 0x5b, 0x1c, 0x4b, 0xbd, 0x36, 0x20, 0x5b, 0xe6, 0x89, 0xe7, 0xc3, 0x8c, 0xcb, 0x1d, 0xd8, 0xf3, 0xa9, 0x1b, 0x4a, 0x3f, 0xeb, 0x57, 0x66, 0xa1, 0x53, 0x30, 0x65, 0x46, 0x42,
0x9e, 0xfe, 0x8c, 0x7b, 0x8a, 0xa5, 0x52, 0x74, 0x73, 0xd5, 0x4e, 0x15, 0xc8, 0x82, 0xea, 0x6f, 0x35, 0xaa, 0x3d, 0x78, 0x2f, 0x3f, 0xb8, 0xcc, 0x8e, 0xe4, 0x69, 0xf8, 0x29, 0x58, 0xe3, 0x6c,
0x4b, 0xbf, 0xb7, 0xfa, 0x3e, 0x54, 0x13, 0x4a, 0x34, 0xea, 0x4b, 0x58, 0x9b, 0xad, 0x30, 0x44, 0x7c, 0xcf, 0x38, 0x93, 0x6e, 0xc0, 0x8a, 0x91, 0x39, 0x00, 0xd9, 0xf5, 0xce, 0x47, 0x69, 0x07,
0x65, 0x89, 0xc6, 0x5d, 0x25, 0x86, 0xa9, 0x26, 0xb2, 0xd3, 0x83, 0x60, 0xc6, 0x87, 0x1c, 0x6c, 0x5a, 0xa4, 0xe4, 0xc1, 0x77, 0xe1, 0x78, 0x0b, 0x36, 0xed, 0x1d, 0xf6, 0xe0, 0x60, 0x18, 0x86,
0xde, 0xca, 0x40, 0x0f, 0x61, 0x01, 0x93, 0xb1, 0xbc, 0x63, 0xf7, 0xfe, 0x3b, 0xea, 0x67, 0x64, 0xdc, 0x73, 0x25, 0xd5, 0xf5, 0xc6, 0x80, 0x3c, 0x9d, 0xa7, 0x96, 0x88, 0x0a, 0xa9, 0x3b, 0xfb,
0xcc, 0xce, 0x08, 0xf7, 0x27, 0xa6, 0x60, 0xa2, 0x7f, 0x20, 0x3f, 0xa4, 0x23, 0xc2, 0x99, 0x9a, 0x41, 0x4e, 0x34, 0x2f, 0x55, 0x81, 0x93, 0x43, 0xaf, 0x42, 0x50, 0x24, 0xec, 0xaf, 0x4a, 0xbf,
0x15, 0x1a, 0xcb, 0xb1, 0xc6, 0xf3, 0x00, 0x36, 0xa3, 0x28, 0xda, 0x4b, 0xf6, 0x28, 0x27, 0x12, 0x91, 0xfd, 0x1c, 0xba, 0x05, 0x24, 0x1b, 0xf8, 0x25, 0x1c, 0x95, 0x19, 0xa6, 0x5e, 0x4d, 0x11,
0xd7, 0x52, 0x7b, 0x74, 0xe9, 0x61, 0x3b, 0xde, 0x25, 0xf4, 0x12, 0xca, 0x16, 0x21, 0x94, 0x5b, 0x5f, 0x47, 0x31, 0x4d, 0x25, 0xc8, 0xab, 0x36, 0x42, 0xe0, 0x5f, 0x1b, 0x70, 0x7c, 0x25, 0x02,
0x72, 0xa7, 0x03, 0xca, 0xd1, 0x4f, 0xd4, 0xd7, 0x4c, 0x58, 0x61, 0x99, 0xb3, 0x3a, 0xda, 0x7f, 0x7d, 0x09, 0x3b, 0x94, 0xad, 0xf4, 0x19, 0x0f, 0x6e, 0x3e, 0xa3, 0x7f, 0xc6, 0x56, 0xe2, 0x8c,
0x50, 0x8a, 0x1b, 0x40, 0x55, 0xc8, 0xbd, 0xc5, 0x93, 0x68, 0x4d, 0x83, 0x4f, 0xb4, 0x0e, 0x8b, 0xc9, 0x78, 0x4d, 0x14, 0x12, 0x7d, 0x04, 0x7b, 0x0b, 0xbe, 0x64, 0x52, 0x58, 0x75, 0x55, 0x63,
0x63, 0x6b, 0x30, 0xc2, 0xd1, 0x9a, 0x86, 0x87, 0x93, 0xec, 0xff, 0x8a, 0xf6, 0x00, 0xaa, 0x69, 0x3f, 0xaf, 0xf1, 0x3c, 0x71, 0x93, 0x2c, 0x8a, 0x1e, 0x16, 0xdb, 0xdc, 0x50, 0x89, 0x47, 0x95,
0xe5, 0x5f, 0xe1, 0x1b, 0x0e, 0x2c, 0x8a, 0x79, 0xa0, 0xbf, 0x61, 0x39, 0x79, 0x64, 0xcf, 0xe2, 0x6d, 0xbe, 0x8c, 0xa8, 0x97, 0x6f, 0x34, 0x7a, 0x09, 0x6d, 0x97, 0x31, 0x2e, 0x5d, 0xfd, 0xb2,
0x4e, 0xc4, 0x5f, 0x8a, 0xd1, 0xb6, 0xc5, 0x1d, 0xb4, 0x05, 0x25, 0x87, 0x32, 0x1e, 0x66, 0x44, 0x12, 0xc8, 0xe3, 0xff, 0xc0, 0x6f, 0x58, 0xa0, 0x52, 0x9a, 0xe5, 0x3a, 0xf6, 0x67, 0xd0, 0xca,
0x8e, 0x10, 0x00, 0x32, 0xe8, 0x63, 0xab, 0xd7, 0xa1, 0x64, 0x30, 0x11, 0x6e, 0x50, 0x34, 0x8b, 0x2f, 0x80, 0xba, 0xd0, 0xf8, 0x89, 0xae, 0xb3, 0xcd, 0x4e, 0x3e, 0xd1, 0x6d, 0xd8, 0x5d, 0xb9,
0x01, 0x70, 0x41, 0x06, 0x13, 0xc3, 0x07, 0x48, 0x06, 0xfa, 0x5b, 0xae, 0xab, 0x41, 0xd9, 0xc3, 0xe1, 0x92, 0x66, 0x9b, 0x9d, 0x1a, 0x4f, 0xeb, 0x9f, 0x1b, 0xf6, 0x17, 0xd0, 0xad, 0x56, 0xfe,
0xfe, 0xd0, 0x65, 0x4c, 0xbc, 0x45, 0x68, 0x3f, 0xb3, 0x50, 0xe3, 0x31, 0x54, 0x42, 0xaf, 0xf3, 0x3f, 0x78, 0xec, 0xc3, 0xae, 0xea, 0x07, 0xba, 0x0f, 0xfb, 0xc5, 0x90, 0x23, 0x57, 0xfa, 0x19,
0xc5, 0x7c, 0xd0, 0x31, 0x14, 0xa5, 0xf7, 0x21, 0x35, 0x7e, 0xb4, 0x94, 0x1d, 0x6a, 0xc9, 0xaa, 0xfe, 0x56, 0xee, 0x1d, 0xbb, 0xd2, 0x47, 0x77, 0xa1, 0xe5, 0x73, 0x21, 0xd3, 0x8c, 0x4c, 0x97,
0x84, 0x16, 0x94, 0x69, 0x7c, 0xce, 0x42, 0x65, 0xd6, 0xae, 0xd0, 0x53, 0xd8, 0x78, 0x82, 0xf9, 0x12, 0x87, 0x0e, 0xc6, 0xd4, 0x9d, 0x4d, 0x38, 0x0b, 0xd3, 0xa7, 0x66, 0x12, 0x33, 0x71, 0xbc,
0x3c, 0x37, 0x4e, 0x91, 0xb5, 0x3b, 0xfd, 0xce, 0xc8, 0xa0, 0x26, 0x54, 0x66, 0xfd, 0xed, 0x06, 0x60, 0xe1, 0x1a, 0xc7, 0x00, 0x45, 0x43, 0xdf, 0xc9, 0x71, 0x3d, 0x68, 0x47, 0x34, 0x5e, 0x04,
0xff, 0x8f, 0xf8, 0x3c, 0xcf, 0x06, 0x8d, 0xcc, 0x81, 0x82, 0x9a, 0x50, 0x94, 0xeb, 0x36, 0xd3, 0x42, 0xa8, 0x59, 0xa4, 0x22, 0x58, 0x76, 0x0d, 0xbe, 0x86, 0x4e, 0xaa, 0xb8, 0xb1, 0xea, 0x0f,
0x55, 0xea, 0x97, 0xaf, 0x6d, 0xce, 0x89, 0x48, 0x11, 0xf4, 0x1a, 0x56, 0x6f, 0x98, 0x16, 0x4a, 0x7a, 0x02, 0xa6, 0x56, 0x60, 0x64, 0xe5, 0x43, 0xab, 0x88, 0xb2, 0x5d, 0xac, 0x4a, 0x2a, 0x84,
0xdc, 0xe7, 0x36, 0x33, 0xd4, 0x8c, 0xbb, 0x52, 0xa4, 0xfa, 0xa3, 0xed, 0xab, 0x6b, 0x5d, 0xf9, 0xb5, 0xc1, 0x1f, 0x75, 0xe8, 0x94, 0x45, 0x13, 0x7d, 0x0b, 0x77, 0xbe, 0xa1, 0x72, 0xdb, 0x3f,
0x7a, 0xad, 0x67, 0xde, 0x4f, 0x75, 0xe5, 0x6a, 0xaa, 0x2b, 0x5f, 0xa6, 0xba, 0xf2, 0x6d, 0xaa, 0xa1, 0x02, 0xb6, 0xaf, 0x55, 0x5d, 0x5c, 0x43, 0x43, 0xe8, 0x94, 0x55, 0xf6, 0x2d, 0xfc, 0xfb,
0x2b, 0x1f, 0xbf, 0xeb, 0x99, 0x6e, 0x5e, 0xfc, 0xbb, 0x1d, 0xfd, 0x08, 0x00, 0x00, 0xff, 0xff, 0xb9, 0xbd, 0x4d, 0x8c, 0x71, 0xed, 0x13, 0x03, 0x0d, 0xc1, 0xd4, 0xeb, 0x56, 0xba, 0x55, 0xe5,
0xb9, 0xc2, 0x87, 0x92, 0x22, 0x07, 0x00, 0x00, 0xe5, 0xdb, 0xc7, 0x5b, 0x22, 0xba, 0x08, 0xfa, 0x11, 0x0e, 0xdf, 0x12, 0x2d, 0x54, 0xa8, 0xcf,
0x55, 0x62, 0x68, 0xe3, 0xeb, 0x52, 0x74, 0xf5, 0xaf, 0xee, 0xbd, 0x7e, 0xe3, 0x18, 0x7f, 0xbd,
0x71, 0x6a, 0xbf, 0x6c, 0x1c, 0xe3, 0xf5, 0xc6, 0x31, 0xfe, 0xdc, 0x38, 0xc6, 0xdf, 0x1b, 0xc7,
0xf8, 0xed, 0x1f, 0xa7, 0x36, 0xdd, 0x53, 0xff, 0xd8, 0xc7, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff,
0xe3, 0xb3, 0x5b, 0x04, 0xa8, 0x07, 0x00, 0x00,
} }
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.
@ -1403,7 +1398,7 @@ func (m *ListAndWatchResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
func (m *TopologyInfo) Marshal() (dAtA []byte, err error) { func (m *TopologyInfo) Marshal() (dAtA []byte, err error) {
size := m.Size() size := m.Size()
dAtA = make([]byte, size) dAtA = make([]byte, size)
n, err := m.MarshalTo(dAtA) n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1411,16 +1406,56 @@ func (m *TopologyInfo) Marshal() (dAtA []byte, err error) {
} }
func (m *TopologyInfo) MarshalTo(dAtA []byte) (int, error) { func (m *TopologyInfo) MarshalTo(dAtA []byte) (int, error) {
var i int size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size])
}
func (m *TopologyInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA)
_ = i _ = i
var l int var l int
_ = l _ = l
if m.Socket != 0 { if m.Node != nil {
dAtA[i] = 0x8 {
i++ size, err := m.Node.MarshalToSizedBuffer(dAtA[:i])
i = encodeVarintApi(dAtA, i, uint64(m.Socket)) if err != nil {
return 0, err
} }
return i, nil i -= size
i = encodeVarintApi(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
}
return len(dAtA) - i, nil
}
func (m *NUMANode) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
return dAtA[:n], nil
}
func (m *NUMANode) MarshalTo(dAtA []byte) (int, error) {
size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size])
}
func (m *NUMANode) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA)
_ = i
var l int
_ = l
if m.ID != 0 {
i = encodeVarintApi(dAtA, i, uint64(m.ID))
i--
dAtA[i] = 0x8
}
return len(dAtA) - i, nil
} }
func (m *Device) Marshal() (dAtA []byte, err error) { func (m *Device) Marshal() (dAtA []byte, err error) {
@ -1443,6 +1478,18 @@ func (m *Device) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i _ = i
var l int var l int
_ = l _ = l
if m.Topology != nil {
{
size, err := m.Topology.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintApi(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x1a
}
if len(m.Health) > 0 { if len(m.Health) > 0 {
i -= len(m.Health) i -= len(m.Health)
copy(dAtA[i:], m.Health) copy(dAtA[i:], m.Health)
@ -1457,21 +1504,7 @@ func (m *Device) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i-- i--
dAtA[i] = 0xa dAtA[i] = 0xa
} }
<<<<<<< HEAD
return len(dAtA) - i, nil return len(dAtA) - i, nil
=======
if m.Topology != nil {
dAtA[i] = 0x1a
i++
i = encodeVarintApi(dAtA, i, uint64(m.Topology.Size()))
n2, err := m.Topology.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
i += n2
}
return i, nil
>>>>>>> Device Plugin API change to include Topology Info in Devices
} }
func (m *PreStartContainerRequest) Marshal() (dAtA []byte, err error) { func (m *PreStartContainerRequest) Marshal() (dAtA []byte, err error) {
@ -1888,10 +1921,26 @@ func (m *ListAndWatchResponse) Size() (n int) {
} }
func (m *TopologyInfo) Size() (n int) { func (m *TopologyInfo) Size() (n int) {
if m == nil {
return 0
}
var l int var l int
_ = l _ = l
if m.Socket != 0 { if m.Node != nil {
n += 1 + sovApi(uint64(m.Socket)) l = m.Node.Size()
n += 1 + l + sovApi(uint64(l))
}
return n
}
func (m *NUMANode) Size() (n int) {
if m == nil {
return 0
}
var l int
_ = l
if m.ID != 0 {
n += 1 + sovApi(uint64(m.ID))
} }
return n return n
} }
@ -2122,7 +2171,17 @@ func (this *TopologyInfo) String() string {
return "nil" return "nil"
} }
s := strings.Join([]string{`&TopologyInfo{`, s := strings.Join([]string{`&TopologyInfo{`,
`Socket:` + fmt.Sprintf("%v", this.Socket) + `,`, `Node:` + strings.Replace(this.Node.String(), "NUMANode", "NUMANode", 1) + `,`,
`}`,
}, "")
return s
}
func (this *NUMANode) String() string {
if this == nil {
return "nil"
}
s := strings.Join([]string{`&NUMANode{`,
`ID:` + fmt.Sprintf("%v", this.ID) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -2134,7 +2193,7 @@ func (this *Device) String() string {
s := strings.Join([]string{`&Device{`, s := strings.Join([]string{`&Device{`,
`ID:` + fmt.Sprintf("%v", this.ID) + `,`, `ID:` + fmt.Sprintf("%v", this.ID) + `,`,
`Health:` + fmt.Sprintf("%v", this.Health) + `,`, `Health:` + fmt.Sprintf("%v", this.Health) + `,`,
`Topology:` + strings.Replace(fmt.Sprintf("%v", this.Topology), "TopologyInfo", "TopologyInfo", 1) + `,`, `Topology:` + strings.Replace(this.Topology.String(), "TopologyInfo", "TopologyInfo", 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@ -2686,7 +2745,7 @@ func (m *TopologyInfo) Unmarshal(dAtA []byte) error {
} }
b := dAtA[iNdEx] b := dAtA[iNdEx]
iNdEx++ iNdEx++
wire |= (uint64(b) & 0x7F) << shift wire |= uint64(b&0x7F) << shift
if b < 0x80 { if b < 0x80 {
break break
} }
@ -2701,10 +2760,10 @@ func (m *TopologyInfo) Unmarshal(dAtA []byte) error {
} }
switch fieldNum { switch fieldNum {
case 1: case 1:
if wireType != 0 { if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Socket", wireType) return fmt.Errorf("proto: wrong wireType = %d for field Node", wireType)
} }
m.Socket = 0 var msglen int
for shift := uint(0); ; shift += 7 { for shift := uint(0); ; shift += 7 {
if shift >= 64 { if shift >= 64 {
return ErrIntOverflowApi return ErrIntOverflowApi
@ -2714,7 +2773,96 @@ func (m *TopologyInfo) Unmarshal(dAtA []byte) error {
} }
b := dAtA[iNdEx] b := dAtA[iNdEx]
iNdEx++ iNdEx++
m.Socket |= (int64(b) & 0x7F) << shift msglen |= int(b&0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthApi
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthApi
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
if m.Node == nil {
m.Node = &NUMANode{}
}
if err := m.Node.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipApi(dAtA[iNdEx:])
if err != nil {
return err
}
if skippy < 0 {
return ErrInvalidLengthApi
}
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthApi
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
}
iNdEx += skippy
}
}
if iNdEx > l {
return io.ErrUnexpectedEOF
}
return nil
}
func (m *NUMANode) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
preIndex := iNdEx
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowApi
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
wire |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
}
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
return fmt.Errorf("proto: NUMANode: wiretype end group for non-group")
}
if fieldNum <= 0 {
return fmt.Errorf("proto: NUMANode: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType)
}
m.ID = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowApi
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
m.ID |= int64(b&0x7F) << shift
if b < 0x80 { if b < 0x80 {
break break
} }
@ -2728,6 +2876,9 @@ func (m *TopologyInfo) Unmarshal(dAtA []byte) error {
if skippy < 0 { if skippy < 0 {
return ErrInvalidLengthApi return ErrInvalidLengthApi
} }
if (iNdEx + skippy) < 0 {
return ErrInvalidLengthApi
}
if (iNdEx + skippy) > l { if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
@ -2847,7 +2998,7 @@ func (m *Device) Unmarshal(dAtA []byte) error {
} }
b := dAtA[iNdEx] b := dAtA[iNdEx]
iNdEx++ iNdEx++
msglen |= (int(b) & 0x7F) << shift msglen |= int(b&0x7F) << shift
if b < 0x80 { if b < 0x80 {
break break
} }
@ -2856,6 +3007,9 @@ func (m *Device) Unmarshal(dAtA []byte) error {
return ErrInvalidLengthApi return ErrInvalidLengthApi
} }
postIndex := iNdEx + msglen postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthApi
}
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
@ -4058,62 +4212,3 @@ var (
ErrInvalidLengthApi = fmt.Errorf("proto: negative length found during unmarshaling") ErrInvalidLengthApi = fmt.Errorf("proto: negative length found during unmarshaling")
ErrIntOverflowApi = fmt.Errorf("proto: integer overflow") ErrIntOverflowApi = fmt.Errorf("proto: integer overflow")
) )
<<<<<<< HEAD
=======
func init() { proto.RegisterFile("api.proto", fileDescriptorApi) }
var fileDescriptorApi = []byte{
// 798 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xdd, 0x4e, 0x33, 0x45,
0x18, 0xee, 0xb6, 0xd0, 0x9f, 0xb7, 0x05, 0xca, 0x80, 0x64, 0x59, 0x70, 0x53, 0xc7, 0x48, 0x30,
0x81, 0x22, 0x25, 0x41, 0xc3, 0x81, 0xb1, 0x52, 0x54, 0x12, 0x95, 0x66, 0xd1, 0x78, 0x62, 0xd2,
0x6c, 0xb7, 0x43, 0x77, 0xc3, 0x76, 0x66, 0xdd, 0x99, 0x36, 0xe9, 0x99, 0x07, 0x5e, 0x80, 0x17,
0xe1, 0x65, 0x78, 0x01, 0x1c, 0x7a, 0xe8, 0xa1, 0xd4, 0x1b, 0xf9, 0xb2, 0xb3, 0xbf, 0x59, 0x0a,
0x7c, 0x5f, 0xf2, 0x9d, 0xf5, 0xfd, 0x79, 0xde, 0x79, 0xde, 0x9f, 0x7d, 0x0a, 0x35, 0xd3, 0x73,
0xda, 0x9e, 0xcf, 0x04, 0x43, 0x95, 0xd9, 0xe9, 0x90, 0x08, 0xf3, 0x54, 0x3b, 0x1e, 0x3b, 0xc2,
0x9e, 0x0e, 0xdb, 0x16, 0x9b, 0x9c, 0x8c, 0xd9, 0x98, 0x9d, 0xc8, 0xf8, 0x70, 0x7a, 0x27, 0x2d,
0x69, 0xc8, 0x5f, 0x21, 0x0e, 0x5f, 0xc2, 0x56, 0x8f, 0xcc, 0x1c, 0x8b, 0xf4, 0xdd, 0xe9, 0xd8,
0xa1, 0x37, 0x9e, 0x70, 0x18, 0xe5, 0xe8, 0x08, 0x90, 0xe7, 0x93, 0x01, 0x17, 0xa6, 0x2f, 0x06,
0x3e, 0xf9, 0x6d, 0xea, 0xf8, 0x64, 0xa4, 0x2a, 0x2d, 0xe5, 0xb0, 0x6a, 0x34, 0x3d, 0x9f, 0xdc,
0x06, 0x01, 0x23, 0xf2, 0xe3, 0xbf, 0x14, 0xd8, 0x30, 0xc8, 0xd8, 0xe1, 0x82, 0xf8, 0x81, 0x93,
0x70, 0x81, 0x54, 0xa8, 0xcc, 0x88, 0xcf, 0x1d, 0x46, 0x25, 0xac, 0x66, 0xc4, 0x26, 0xd2, 0xa0,
0x4a, 0xe8, 0xc8, 0x63, 0x0e, 0x15, 0x6a, 0x51, 0x86, 0x12, 0x1b, 0x7d, 0x0c, 0x6b, 0x3e, 0xe1,
0x6c, 0xea, 0x5b, 0x64, 0x40, 0xcd, 0x09, 0x51, 0x4b, 0x32, 0xa1, 0x11, 0x3b, 0x7f, 0x34, 0x27,
0x04, 0x9d, 0x43, 0x85, 0x85, 0x3c, 0xd5, 0x95, 0x96, 0x72, 0x58, 0xef, 0xec, 0xb7, 0xa3, 0xee,
0xdb, 0x4b, 0x7a, 0x31, 0xe2, 0x64, 0x5c, 0x81, 0xd5, 0xab, 0x89, 0x27, 0xe6, 0xb8, 0x0b, 0xdb,
0xdf, 0x3b, 0x5c, 0x74, 0xe9, 0xe8, 0x17, 0x53, 0x58, 0xb6, 0x41, 0xb8, 0xc7, 0x28, 0x27, 0xe8,
0x53, 0xa8, 0x8c, 0x64, 0x01, 0xae, 0x2a, 0xad, 0xd2, 0x61, 0xbd, 0xb3, 0x91, 0x2b, 0x6c, 0xc4,
0x71, 0x7c, 0x00, 0x8d, 0x9f, 0x98, 0xc7, 0x5c, 0x36, 0x9e, 0x5f, 0xd3, 0x3b, 0x86, 0x76, 0xa0,
0xcc, 0x99, 0x75, 0x4f, 0x84, 0xec, 0xb6, 0x64, 0x44, 0x16, 0xb6, 0xa0, 0x1c, 0x42, 0xd1, 0x3a,
0x14, 0xaf, 0x7b, 0xd1, 0x2c, 0x8a, 0x4e, 0x2f, 0x40, 0xd8, 0xc4, 0x74, 0x85, 0x1d, 0x0d, 0x21,
0xb2, 0xd0, 0x29, 0x54, 0x45, 0x54, 0x59, 0x76, 0x5f, 0xef, 0x7c, 0x90, 0xb0, 0xc8, 0x3e, 0x69,
0x24, 0x69, 0xf8, 0x02, 0xd4, 0x7e, 0xb4, 0x93, 0x4b, 0x46, 0x85, 0xe9, 0xd0, 0x74, 0x0f, 0x3a,
0x40, 0xc4, 0xf9, 0xba, 0x17, 0xb6, 0x55, 0x33, 0x32, 0x1e, 0xbc, 0x07, 0xbb, 0x4b, 0xb0, 0xe1,
0x40, 0xb0, 0x05, 0x1b, 0x5d, 0xd7, 0x65, 0x96, 0x29, 0x48, 0x5c, 0xaf, 0x0f, 0xc8, 0x8a, 0xf3,
0xe4, 0x65, 0x10, 0x2e, 0xe2, 0x71, 0x7d, 0x94, 0x10, 0x4d, 0x4a, 0xe5, 0xe0, 0xc6, 0xa6, 0x95,
0x23, 0xc8, 0x03, 0xf6, 0xcf, 0xa5, 0xbf, 0xca, 0x7e, 0x0c, 0xcd, 0x14, 0x12, 0x6d, 0xf1, 0x16,
0xb6, 0xb2, 0x0c, 0x43, 0x6f, 0x4c, 0x11, 0xbf, 0x44, 0x31, 0x4c, 0x35, 0x90, 0x95, 0x1f, 0x04,
0xc7, 0x7f, 0x94, 0x60, 0xf7, 0x59, 0x04, 0xfa, 0x0a, 0x56, 0x08, 0x9d, 0xc5, 0x6f, 0x1c, 0xbd,
0xfe, 0x46, 0xfb, 0x8a, 0xce, 0xf8, 0x15, 0x15, 0xfe, 0xdc, 0x90, 0x48, 0x74, 0x00, 0xe5, 0x09,
0x9b, 0x52, 0xc1, 0xd5, 0xa2, 0xac, 0xb1, 0x9e, 0xd4, 0xf8, 0x21, 0x70, 0x1b, 0x51, 0x14, 0x1d,
0xa7, 0x27, 0x5a, 0x92, 0x89, 0x5b, 0xb9, 0x13, 0xbd, 0xf5, 0x88, 0x95, 0x9c, 0x29, 0xfa, 0x19,
0xea, 0x26, 0xa5, 0x4c, 0x98, 0xf1, 0xe7, 0x12, 0x40, 0xce, 0xde, 0x82, 0x5f, 0x37, 0x45, 0x85,
0x34, 0xb3, 0x75, 0xb4, 0xcf, 0xa1, 0x96, 0x34, 0x80, 0x9a, 0x50, 0xba, 0x27, 0xf3, 0xe8, 0xb2,
0x83, 0x9f, 0x68, 0x1b, 0x56, 0x67, 0xa6, 0x3b, 0x25, 0xd1, 0x65, 0x87, 0xc6, 0x45, 0xf1, 0x0b,
0x45, 0xfb, 0x12, 0x9a, 0xf9, 0xca, 0xef, 0x82, 0xc7, 0x36, 0xac, 0xca, 0x79, 0xa0, 0x4f, 0x60,
0x3d, 0x5d, 0xb2, 0x67, 0x0a, 0x3b, 0xc2, 0xaf, 0x25, 0xde, 0xbe, 0x29, 0x6c, 0xb4, 0x07, 0x35,
0x9b, 0x71, 0x11, 0x66, 0x44, 0x62, 0x13, 0x38, 0xe2, 0xa0, 0x4f, 0xcc, 0xd1, 0x80, 0x51, 0x37,
0xfc, 0xd4, 0xaa, 0x46, 0x35, 0x70, 0xdc, 0x50, 0x77, 0x8e, 0x7d, 0x80, 0x74, 0xa0, 0xef, 0xe5,
0xb9, 0x16, 0xd4, 0x3d, 0xe2, 0x4f, 0x1c, 0xce, 0xe5, 0x2e, 0x42, 0x65, 0xcb, 0xba, 0x3a, 0xdf,
0x40, 0x23, 0x94, 0x51, 0x5f, 0xce, 0x07, 0x9d, 0x43, 0x35, 0x96, 0x55, 0xa4, 0x26, 0x4b, 0xcb,
0x29, 0xad, 0x96, 0x9e, 0x4a, 0xa8, 0x6e, 0x85, 0xce, 0xdf, 0x45, 0x68, 0x64, 0x95, 0x10, 0x7d,
0x07, 0x3b, 0xdf, 0x12, 0xb1, 0x4c, 0xe8, 0x73, 0x60, 0xed, 0x45, 0x29, 0xc5, 0x05, 0xd4, 0x85,
0x46, 0x56, 0x3a, 0x9f, 0xe0, 0x3f, 0x4c, 0xec, 0x65, 0x0a, 0x8b, 0x0b, 0x9f, 0x29, 0xa8, 0x0b,
0xd5, 0xf8, 0xdc, 0x32, 0x5d, 0xe5, 0xbe, 0x7c, 0x6d, 0x77, 0x49, 0x24, 0x2e, 0x82, 0x7e, 0x85,
0xcd, 0x27, 0xa2, 0x85, 0x52, 0xf5, 0x79, 0x4e, 0x0c, 0x35, 0xfc, 0x52, 0x4a, 0x5c, 0xfd, 0xeb,
0xfd, 0x87, 0x47, 0x5d, 0xf9, 0xf7, 0x51, 0x2f, 0xfc, 0xbe, 0xd0, 0x95, 0x87, 0x85, 0xae, 0xfc,
0xb3, 0xd0, 0x95, 0xff, 0x16, 0xba, 0xf2, 0xe7, 0xff, 0x7a, 0x61, 0x58, 0x96, 0x7f, 0x9c, 0x67,
0x6f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x37, 0x3d, 0xda, 0xc8, 0x7d, 0x07, 0x00, 0x00,
}
>>>>>>> Device Plugin API change to include Topology Info in Devices

9
pkg/kubelet/apis/deviceplugin/v1beta1/api.proto
View File

@ -74,7 +74,11 @@ message ListAndWatchResponse {
} }
message TopologyInfo { message TopologyInfo {
int64 socket = 1; NUMANode node = 1;
}
message NUMANode {
int64 ID = 1;
} }
/* E.g: /* E.g:
@ -82,7 +86,8 @@ message TopologyInfo {
* ID: "GPU-fef8089b-4820-abfc-e83e-94318197576e", * ID: "GPU-fef8089b-4820-abfc-e83e-94318197576e",
* State: "Healthy", * State: "Healthy",
* Topology: * Topology:
* Socket: 1 * Node:
ID: 1
*} */ *} */
message Device { message Device {
// A unique ID assigned by the device plugin used // A unique ID assigned by the device plugin used