Skip to content

Commit

Permalink
Merge pull request #4 from kubewharf/sjy/pod-resources-server-fix
Browse files Browse the repository at this point in the history 
style(qrm): update custom pod resources server api property index
  • Loading branch information
@csfldf
csfldf authored Jan 13, 2023
2 parents 4e01765 + 2de2c41 commit 29cb56e
Showing 1 changed file with 94 additions and 84 deletions.
178 changes: 94 additions & 84 deletions releases/1.24/patches/0002-KubeWharf-FEATURE-qos-resource-manager
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6568,7 +6568,7 @@ index 7708f758fa2..5d6387af557 100644
+ ResourcePlugin = "ResourcePlugin"
)
diff --git a/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.pb.go b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.pb.go
index ac0924b2b16..d178c9be619 100644
index ac0924b2b16..19b893ea949 100644
--- a/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.pb.go
+++ b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.pb.go
@@ -21,9 +21,11 @@ package v1
Expand All @@ -6595,7 +6595,7 @@ index ac0924b2b16..d178c9be619 100644
+ Devices []*ContainerDevices `protobuf:"bytes,1,rep,name=devices,proto3" json:"devices,omitempty"`
+ CpuIds []int64 `protobuf:"varint,2,rep,packed,name=cpu_ids,json=cpuIds,proto3" json:"cpu_ids,omitempty"`
+ Memory []*ContainerMemory `protobuf:"bytes,3,rep,name=memory,proto3" json:"memory,omitempty"`
+ Resources []*AllocatableTopologyAwareResource `protobuf:"bytes,4,rep,name=resources,proto3" json:"resources,omitempty"`
+ Resources []*AllocatableTopologyAwareResource `protobuf:"bytes,15,rep,name=resources,proto3" json:"resources,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
Expand Down Expand Up @@ -6679,7 +6679,7 @@ index ac0924b2b16..d178c9be619 100644
+ Devices []*ContainerDevices `protobuf:"bytes,2,rep,name=devices,proto3" json:"devices,omitempty"`
+ CpuIds []int64 `protobuf:"varint,3,rep,packed,name=cpu_ids,json=cpuIds,proto3" json:"cpu_ids,omitempty"`
+ Memory []*ContainerMemory `protobuf:"bytes,4,rep,name=memory,proto3" json:"memory,omitempty"`
+ Resources []*TopologyAwareResource `protobuf:"bytes,5,rep,name=resources,proto3" json:"resources,omitempty"`
+ Resources []*TopologyAwareResource `protobuf:"bytes,15,rep,name=resources,proto3" json:"resources,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
Expand Down Expand Up @@ -7019,67 +7019,67 @@ index ac0924b2b16..d178c9be619 100644
- 0x71, 0x69, 0xa3, 0x5f, 0x97, 0xf6, 0xc6, 0xe7, 0x99, 0x8d, 0x2e, 0x66, 0x36, 0xfa, 0x39, 0xb3,
- 0xd1, 0xef, 0x99, 0x8d, 0xbe, 0xfe, 0xb1, 0x37, 0x06, 0x65, 0xfd, 0xd8, 0x3c, 0xfd, 0x1b, 0x00,
- 0x00, 0xff, 0xff, 0x43, 0x46, 0x5d, 0x7f, 0xac, 0x04, 0x00, 0x00,
+ // 952 bytes of a gzipped FileDescriptorProto
+ // 950 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcd, 0x6e, 0xdb, 0x46,
+ 0x10, 0x36, 0x45, 0xfd, 0x58, 0x63, 0xc5, 0x15, 0x36, 0x69, 0x4d, 0x2b, 0xb2, 0xac, 0xb0, 0x31,
+ 0x10, 0x36, 0x45, 0xfd, 0x58, 0x63, 0xc5, 0x11, 0x36, 0x69, 0x4d, 0x2b, 0xb2, 0xac, 0xb0, 0x31,
+ 0x20, 0xa0, 0xa9, 0x8c, 0xb8, 0xff, 0x3d, 0x14, 0x51, 0xec, 0xb6, 0x30, 0x90, 0x18, 0x0d, 0xeb,
+ 0xf6, 0xd0, 0x43, 0x89, 0x15, 0xb9, 0x51, 0x09, 0xd3, 0x5c, 0x9a, 0xbb, 0x72, 0xa1, 0x9e, 0x7a,
+ 0xe8, 0xa5, 0xb7, 0x3e, 0x44, 0x5f, 0xa2, 0x6f, 0x90, 0x63, 0x6e, 0xcd, 0xb1, 0x71, 0x5f, 0xa4,
+ 0xd8, 0x5d, 0xf1, 0x47, 0x24, 0x55, 0xd9, 0xa7, 0x9c, 0xb4, 0x9c, 0xf9, 0x66, 0xe6, 0xdb, 0x6f,
+ 0x66, 0x57, 0x0b, 0x4d, 0x1c, 0x7a, 0xc3, 0x30, 0xa2, 0x9c, 0xa2, 0xca, 0xe5, 0xc3, 0xce, 0xfb,
+ 0x13, 0x8f, 0xff, 0x34, 0x1d, 0x0f, 0x1d, 0x7a, 0xbe, 0x3f, 0xa1, 0x13, 0xba, 0x2f, 0x5d, 0xe3,
+ 0xe9, 0x73, 0xf9, 0x25, 0x3f, 0xe4, 0x4a, 0x85, 0x98, 0x3b, 0x70, 0x77, 0xe4, 0xfb, 0xd4, 0xc1,
+ 0xd8, 0x5d, 0xf1, 0x47, 0x24, 0x55, 0xd9, 0xa7, 0x9e, 0xb4, 0x9c, 0xf9, 0x66, 0xe6, 0xdb, 0x6f,
+ 0x66, 0x57, 0x0b, 0x4d, 0x1c, 0x7a, 0xc3, 0x30, 0xa2, 0x9c, 0xa2, 0xca, 0xe5, 0xa3, 0xce, 0x7b,
+ 0x13, 0x8f, 0xff, 0x38, 0x1d, 0x0f, 0x1d, 0x7a, 0xbe, 0x3f, 0xa1, 0x13, 0xba, 0x2f, 0x5d, 0xe3,
+ 0xe9, 0x0b, 0xf9, 0x25, 0x3f, 0xe4, 0x4a, 0x85, 0x98, 0x3b, 0x70, 0x6f, 0xe4, 0xfb, 0xd4, 0xc1,
+ 0x1c, 0x8f, 0x7d, 0x62, 0x11, 0x46, 0xa7, 0x91, 0x43, 0x98, 0x45, 0x2e, 0xa6, 0x84, 0x71, 0xf3,
+ 0x95, 0x06, 0xdd, 0x72, 0x3f, 0x0b, 0x69, 0xc0, 0x08, 0x1a, 0x42, 0xc3, 0x25, 0x97, 0x9e, 0x43,
+ 0x98, 0xa1, 0xf5, 0xf5, 0xc1, 0xc6, 0xc1, 0x9d, 0xe1, 0xe5, 0xc3, 0xe1, 0x21, 0x0d, 0x38, 0xf6,
+ 0xb5, 0x06, 0xdd, 0x72, 0x3f, 0x0b, 0x69, 0xc0, 0x08, 0x1a, 0x42, 0xc3, 0x25, 0x97, 0x9e, 0x43,
+ 0x98, 0xa1, 0xf5, 0xf5, 0xc1, 0xc6, 0xc1, 0xdd, 0xe1, 0xe5, 0xa3, 0xe1, 0x21, 0x0d, 0x38, 0xf6,
+ 0x02, 0x12, 0x1d, 0x29, 0x9f, 0x15, 0x83, 0xd0, 0x16, 0x34, 0x9c, 0x70, 0x6a, 0x7b, 0x2e, 0x33,
+ 0x2a, 0x7d, 0x7d, 0xa0, 0x5b, 0x75, 0x27, 0x9c, 0x1e, 0xbb, 0x0c, 0xbd, 0x07, 0xf5, 0x73, 0x72,
+ 0x4e, 0xa3, 0x99, 0xa1, 0xcb, 0x3c, 0xb7, 0x17, 0xf2, 0x3c, 0x95, 0x2e, 0x6b, 0x0e, 0x41, 0x8f,
+ 0xa1, 0x19, 0xc5, 0x54, 0x8c, 0xaa, 0xc4, 0xdf, 0x17, 0xf8, 0x0c, 0xd5, 0x53, 0x1a, 0x52, 0x9f,
+ 0x4e, 0x66, 0xa3, 0x9f, 0x71, 0x94, 0xf0, 0xb6, 0xd2, 0x30, 0x73, 0x1b, 0xb6, 0x9e, 0x78, 0x8c,
+ 0x7f, 0x43, 0xdd, 0xc2, 0xae, 0x9f, 0x81, 0x51, 0x74, 0xcd, 0x37, 0xfc, 0x11, 0xdc, 0x0a, 0xa9,
+ 0x6b, 0xa7, 0xe5, 0xd5, 0xb6, 0xdb, 0xa2, 0xfc, 0x42, 0x40, 0x2b, 0xcc, 0x7c, 0x99, 0x7f, 0xea,
+ 0xd0, 0xca, 0xba, 0x11, 0x82, 0x6a, 0x80, 0xcf, 0x89, 0xa1, 0xf5, 0xb5, 0x41, 0xd3, 0x92, 0x6b,
+ 0xd4, 0x85, 0xa6, 0xf8, 0x65, 0x21, 0x76, 0x88, 0x51, 0x91, 0x8e, 0xd4, 0x80, 0xb6, 0x61, 0x5d,
+ 0x56, 0xa6, 0x3e, 0x31, 0x74, 0xe9, 0x6c, 0x88, 0x12, 0xd4, 0x4f, 0x5c, 0x7c, 0x16, 0x12, 0xa3,
+ 0x9a, 0xb8, 0x4e, 0x67, 0x21, 0x41, 0x1f, 0x03, 0x38, 0xb1, 0x8a, 0xcc, 0xa8, 0x49, 0xb2, 0xef,
+ 0x2c, 0x68, 0x9b, 0x52, 0xce, 0x20, 0xd1, 0x87, 0x50, 0xf7, 0xf1, 0x98, 0xf8, 0xcc, 0xa8, 0xcb,
+ 0x98, 0x6e, 0x7e, 0x83, 0xc3, 0x27, 0xd2, 0xfd, 0x65, 0xc0, 0x45, 0x63, 0x14, 0x16, 0x1d, 0xc2,
+ 0x06, 0x0e, 0x02, 0xca, 0x31, 0xf7, 0x68, 0xc0, 0x8c, 0x86, 0x0c, 0xbd, 0x57, 0x08, 0x1d, 0xa5,
+ 0x18, 0x15, 0x9f, 0x8d, 0xea, 0x7c, 0x06, 0x1b, 0x99, 0xdc, 0xa8, 0x0d, 0xfa, 0x19, 0x99, 0xcd,
+ 0x85, 0x12, 0x4b, 0x74, 0x07, 0x6a, 0x97, 0xd8, 0x9f, 0xc6, 0x1a, 0xa9, 0x8f, 0xcf, 0x2b, 0x9f,
+ 0x6a, 0x9d, 0x2f, 0xa0, 0x9d, 0xcf, 0x7d, 0x93, 0x78, 0xf3, 0x6f, 0x0d, 0x50, 0x51, 0x98, 0xd2,
+ 0x66, 0x65, 0x26, 0xbf, 0x72, 0xc3, 0xc9, 0xd7, 0x97, 0x4c, 0x7e, 0x75, 0xf5, 0xe4, 0x7f, 0x92,
+ 0x9d, 0x7c, 0xd5, 0xcd, 0x6d, 0x81, 0x5f, 0x39, 0xee, 0x1c, 0xde, 0xca, 0xe5, 0x44, 0xbb, 0xb0,
+ 0xa1, 0xb2, 0xaa, 0xc1, 0x51, 0x9b, 0x03, 0x65, 0x92, 0xb3, 0x83, 0xa0, 0xca, 0xbc, 0x5f, 0x94,
+ 0x4c, 0x55, 0x4b, 0xae, 0xd1, 0x03, 0x58, 0xe7, 0xf3, 0x5a, 0x72, 0x0a, 0xe7, 0xa3, 0x1f, 0xd7,
+ 0x3f, 0x0e, 0x9e, 0x53, 0x2b, 0x41, 0x98, 0xbf, 0x69, 0xd0, 0xce, 0x4b, 0x82, 0xde, 0x85, 0x5b,
+ 0x31, 0x2f, 0x3b, 0x23, 0x6b, 0x2b, 0x36, 0x9e, 0x08, 0x79, 0x77, 0x00, 0x94, 0x72, 0xc9, 0x5d,
+ 0xd1, 0xb4, 0x9a, 0xca, 0x22, 0x44, 0xbb, 0x19, 0x8d, 0x97, 0x3a, 0xbc, 0x5d, 0xaa, 0xd0, 0xf5,
+ 0xb8, 0x0c, 0xa0, 0xed, 0x31, 0x3b, 0xa0, 0x2e, 0x49, 0xce, 0xbd, 0xd4, 0x64, 0xdd, 0xda, 0xf4,
+ 0xd8, 0x09, 0x75, 0xd3, 0x74, 0x0f, 0x00, 0x79, 0xcc, 0x66, 0x0e, 0xf6, 0x71, 0x94, 0x62, 0x75,
+ 0x89, 0x6d, 0x7b, 0xec, 0x5b, 0xe9, 0x48, 0xd0, 0xfb, 0x70, 0x1b, 0x4f, 0x26, 0x11, 0x99, 0x60,
+ 0x4e, 0x5c, 0xfb, 0x62, 0x8a, 0x03, 0xee, 0xf1, 0x99, 0x3c, 0xc1, 0x9a, 0x85, 0x52, 0xd7, 0xb3,
+ 0xb9, 0x07, 0x3d, 0x82, 0x2e, 0x8d, 0xbc, 0x89, 0x17, 0x60, 0xdf, 0x2e, 0x8b, 0xac, 0xc9, 0xc8,
+ 0x4e, 0x8c, 0x19, 0x15, 0x33, 0xfc, 0x00, 0xdd, 0x58, 0x15, 0x1b, 0x0b, 0x25, 0x92, 0x60, 0xdb,
+ 0xf7, 0x18, 0x9f, 0x1f, 0xf6, 0xe2, 0x48, 0xc5, 0x09, 0xac, 0x6d, 0x5e, 0x66, 0x16, 0xd7, 0x25,
+ 0x3a, 0x83, 0xbd, 0x84, 0xdd, 0xff, 0x16, 0x69, 0xac, 0x2a, 0x72, 0x2f, 0xce, 0x73, 0xba, 0xac,
+ 0x98, 0xf9, 0x7b, 0x15, 0xfa, 0xab, 0xae, 0xfb, 0x37, 0xdb, 0xdd, 0xaf, 0x60, 0x37, 0xd3, 0x23,
+ 0x9c, 0x72, 0xcd, 0x77, 0x7a, 0x27, 0x85, 0x65, 0x76, 0x94, 0xb4, 0xec, 0x02, 0x06, 0x39, 0x35,
+ 0xcb, 0x72, 0x29, 0x65, 0x6b, 0xab, 0x94, 0xbd, 0xbf, 0xd0, 0xbe, 0x92, 0x72, 0xb2, 0x93, 0x8f,
+ 0xa0, 0x9b, 0xa1, 0xee, 0xe0, 0x10, 0x3b, 0xa2, 0x44, 0xc2, 0xbb, 0xae, 0xe6, 0x2c, 0xc5, 0x1c,
+ 0xce, 0x21, 0x09, 0xe9, 0x33, 0xd8, 0xcb, 0x91, 0x2e, 0x64, 0xb9, 0xee, 0x2c, 0x2c, 0x30, 0xce,
+ 0x17, 0x92, 0xb3, 0x60, 0xe5, 0x4e, 0x77, 0xc2, 0x62, 0x0f, 0x36, 0x93, 0xfe, 0xab, 0x1b, 0x5f,
+ 0x93, 0xcc, 0x93, 0xa9, 0xf8, 0x5e, 0x18, 0xe5, 0xf5, 0x4e, 0xdd, 0xe4, 0x9e, 0x13, 0x6b, 0xf3,
+ 0x00, 0x5a, 0xd9, 0xcb, 0x04, 0x99, 0x50, 0x13, 0xf6, 0xf8, 0xff, 0xbe, 0x25, 0x08, 0x9f, 0x7c,
+ 0xf7, 0x74, 0x24, 0x07, 0x44, 0xb9, 0xcc, 0x0e, 0xac, 0xc7, 0x26, 0xb4, 0x09, 0x95, 0xe3, 0x23,
+ 0x59, 0x4e, 0xb7, 0x2a, 0xc7, 0x47, 0x07, 0x7f, 0x69, 0x80, 0xb2, 0xff, 0x81, 0x82, 0x38, 0x89,
+ 0xd0, 0x21, 0x54, 0xa5, 0xe2, 0x77, 0x45, 0xbe, 0x25, 0xef, 0x91, 0x4e, 0xb7, 0xdc, 0xa9, 0x5e,
+ 0x24, 0xe6, 0x1a, 0xfa, 0x11, 0xb6, 0xbe, 0x26, 0xbc, 0xec, 0x9d, 0x86, 0x76, 0x73, 0xcf, 0xa2,
+ 0x42, 0xee, 0xfe, 0x72, 0x40, 0x9c, 0xff, 0x71, 0xf7, 0xc5, 0xeb, 0x9e, 0xf6, 0xea, 0x75, 0x6f,
+ 0xed, 0xd7, 0xab, 0x9e, 0xf6, 0xe2, 0xaa, 0xa7, 0xbd, 0xbc, 0xea, 0x69, 0xff, 0x5c, 0xf5, 0xb4,
+ 0x3f, 0xfe, 0xed, 0xad, 0x8d, 0xeb, 0xf2, 0x25, 0xf9, 0xc1, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff,
+ 0xc9, 0x8e, 0xe6, 0x8f, 0x89, 0x0a, 0x00, 0x00,
+ 0x2a, 0x7d, 0x7d, 0xa0, 0x5b, 0x75, 0x27, 0x9c, 0x1e, 0xbb, 0x0c, 0xbd, 0x0b, 0xf5, 0x73, 0x72,
+ 0x4e, 0xa3, 0x99, 0xa1, 0xcb, 0x3c, 0x77, 0x16, 0xf2, 0x3c, 0x93, 0x2e, 0x6b, 0x0e, 0x41, 0x4f,
+ 0xa0, 0x19, 0xc5, 0x54, 0x8c, 0xdb, 0x12, 0xff, 0x40, 0xe0, 0x33, 0x54, 0x4f, 0x69, 0x48, 0x7d,
+ 0x3a, 0x99, 0x8d, 0x7e, 0xc2, 0x51, 0xc2, 0xdb, 0x4a, 0xc3, 0xcc, 0x6d, 0xd8, 0x7a, 0xea, 0x31,
+ 0xfe, 0x35, 0x75, 0x0b, 0xbb, 0x7e, 0x0e, 0x46, 0xd1, 0x35, 0xdf, 0xf0, 0x87, 0x70, 0x2b, 0xa4,
+ 0xae, 0x9d, 0x96, 0x57, 0xdb, 0x6e, 0x8b, 0xf2, 0x0b, 0x01, 0xad, 0x30, 0xf3, 0x65, 0xfe, 0xa1,
+ 0x43, 0x2b, 0xeb, 0x46, 0x08, 0xaa, 0x01, 0x3e, 0x27, 0x86, 0xd6, 0xd7, 0x06, 0x4d, 0x4b, 0xae,
+ 0x51, 0x17, 0x9a, 0xe2, 0x97, 0x85, 0xd8, 0x21, 0x46, 0x45, 0x3a, 0x52, 0x03, 0xda, 0x86, 0x75,
+ 0x59, 0x99, 0xfa, 0xc4, 0xd0, 0xa5, 0xb3, 0x21, 0x4a, 0x50, 0x3f, 0x71, 0xf1, 0x59, 0x48, 0x8c,
+ 0x6a, 0xe2, 0x3a, 0x9d, 0x85, 0x04, 0x7d, 0x04, 0xe0, 0xc4, 0x2a, 0x32, 0xa3, 0x26, 0xc9, 0xbe,
+ 0xbd, 0xa0, 0x6d, 0x4a, 0x39, 0x83, 0x44, 0x1f, 0x40, 0xdd, 0xc7, 0x63, 0xe2, 0x33, 0xa3, 0x2e,
+ 0x63, 0xba, 0xf9, 0x0d, 0x0e, 0x9f, 0x4a, 0xf7, 0x17, 0x01, 0x17, 0x8d, 0x51, 0x58, 0x74, 0x08,
+ 0x1b, 0x38, 0x08, 0x28, 0xc7, 0xdc, 0xa3, 0x01, 0x33, 0x1a, 0x32, 0xf4, 0x7e, 0x21, 0x74, 0x94,
+ 0x62, 0x54, 0x7c, 0x36, 0xaa, 0xf3, 0x29, 0x6c, 0x64, 0x72, 0xa3, 0x36, 0xe8, 0x67, 0x64, 0x36,
+ 0x17, 0x4a, 0x2c, 0xd1, 0x5d, 0xa8, 0x5d, 0x62, 0x7f, 0x1a, 0x6b, 0xa4, 0x3e, 0x3e, 0xab, 0x7c,
+ 0xa2, 0x75, 0x3e, 0x87, 0x76, 0x3e, 0xf7, 0x4d, 0xe2, 0xcd, 0xbf, 0x34, 0x40, 0x45, 0x61, 0x4a,
+ 0x9b, 0x95, 0x99, 0xfc, 0xca, 0x0d, 0x27, 0x5f, 0x5f, 0x32, 0xf9, 0xd5, 0xd5, 0x93, 0xff, 0x71,
+ 0x71, 0xf2, 0xb7, 0x05, 0x7e, 0xe5, 0xb8, 0x73, 0xb8, 0x9d, 0xcb, 0x89, 0x76, 0x61, 0x43, 0x65,
+ 0x55, 0x83, 0xa3, 0x36, 0x07, 0xca, 0x24, 0x67, 0x07, 0x41, 0x95, 0x79, 0x3f, 0x2b, 0x99, 0xaa,
+ 0x96, 0x5c, 0xa3, 0x87, 0xb0, 0xce, 0xe7, 0xb5, 0xe4, 0x14, 0xce, 0x47, 0x3f, 0xae, 0x7f, 0x1c,
+ 0xbc, 0xa0, 0x56, 0x82, 0x30, 0x7f, 0xd5, 0xa0, 0x9d, 0x97, 0x04, 0xbd, 0x03, 0xb7, 0x62, 0x5e,
+ 0x76, 0x46, 0xd6, 0x56, 0x6c, 0x3c, 0x11, 0xf2, 0xee, 0x00, 0x28, 0xe5, 0x92, 0xbb, 0xa2, 0x69,
+ 0x35, 0x95, 0x45, 0x88, 0x76, 0x33, 0x1a, 0xaf, 0x74, 0x78, 0xab, 0x54, 0xa1, 0xeb, 0x71, 0x19,
+ 0x40, 0xdb, 0x63, 0x76, 0x40, 0x5d, 0x92, 0x9c, 0x7b, 0xa9, 0xc9, 0xba, 0xb5, 0xe9, 0xb1, 0x13,
+ 0xea, 0xa6, 0xe9, 0x1e, 0x02, 0xf2, 0x98, 0xcd, 0x1c, 0xec, 0xe3, 0x28, 0xc5, 0xea, 0x12, 0xdb,
+ 0xf6, 0xd8, 0x37, 0xd2, 0x91, 0xa0, 0xf7, 0xe1, 0x0e, 0x9e, 0x4c, 0x22, 0x32, 0xc1, 0x9c, 0xb8,
+ 0xf6, 0xc5, 0x14, 0x07, 0xdc, 0xe3, 0x33, 0x79, 0x82, 0x35, 0x0b, 0xa5, 0xae, 0xe7, 0x73, 0x0f,
+ 0x7a, 0x0c, 0x5d, 0x1a, 0x79, 0x13, 0x2f, 0xc0, 0xbe, 0x5d, 0x16, 0x59, 0x93, 0x91, 0x9d, 0x18,
+ 0x33, 0x2a, 0x66, 0xf8, 0x1e, 0xba, 0xb1, 0x2a, 0x36, 0x16, 0x4a, 0x24, 0xc1, 0xb6, 0xef, 0x31,
+ 0x3e, 0x3f, 0xec, 0xc5, 0x91, 0x8a, 0x13, 0x58, 0xdb, 0xbc, 0xcc, 0x2c, 0xae, 0x4b, 0x74, 0x06,
+ 0x7b, 0x09, 0xbb, 0xff, 0x2c, 0xd2, 0x58, 0x55, 0xe4, 0x7e, 0x9c, 0xe7, 0x74, 0x59, 0x31, 0xf3,
+ 0xb7, 0x2a, 0xf4, 0x57, 0x5d, 0xf7, 0xff, 0x6f, 0x77, 0xbf, 0x84, 0xdd, 0x4c, 0x8f, 0x70, 0xca,
+ 0x35, 0xdf, 0xe9, 0x9d, 0x14, 0x96, 0xd9, 0x51, 0xd2, 0xb2, 0x0b, 0x18, 0xe4, 0xd4, 0x2c, 0xcb,
+ 0xa5, 0x94, 0xad, 0xad, 0x52, 0xf6, 0xc1, 0x42, 0xfb, 0x4a, 0xca, 0xc9, 0x4e, 0x3e, 0x86, 0x6e,
+ 0x86, 0xba, 0x83, 0x43, 0xec, 0x88, 0x12, 0x09, 0xef, 0xba, 0x9a, 0xb3, 0x14, 0x73, 0x38, 0x87,
+ 0x24, 0xa4, 0xcf, 0x60, 0x2f, 0x47, 0xba, 0x90, 0xe5, 0xba, 0xb3, 0xb0, 0xc0, 0x38, 0x5f, 0x48,
+ 0xce, 0x82, 0x95, 0x3b, 0xdd, 0x09, 0x8b, 0x3d, 0xd8, 0x4c, 0xfa, 0xaf, 0x6e, 0x7c, 0x4d, 0x32,
+ 0x4f, 0xa6, 0xe2, 0x3b, 0x61, 0x94, 0xd7, 0x3b, 0x75, 0x93, 0x7b, 0x4e, 0xac, 0xcd, 0x03, 0x68,
+ 0x65, 0x2f, 0x13, 0x64, 0x42, 0x4d, 0xd8, 0xe3, 0xff, 0xfb, 0x96, 0x20, 0x7c, 0xf2, 0xed, 0xb3,
+ 0x91, 0x1c, 0x10, 0xe5, 0x32, 0x3b, 0xb0, 0x1e, 0x9b, 0xd0, 0x26, 0x54, 0x8e, 0x8f, 0x64, 0x39,
+ 0xdd, 0xaa, 0x1c, 0x1f, 0x1d, 0xfc, 0xa9, 0x01, 0xca, 0xfe, 0x07, 0x0a, 0xe2, 0x24, 0x42, 0x87,
+ 0x50, 0x95, 0x8a, 0xdf, 0x13, 0xf9, 0x96, 0xbc, 0x47, 0x3a, 0xdd, 0x72, 0xa7, 0x7a, 0x91, 0x98,
+ 0x6b, 0xe8, 0x07, 0xd8, 0xfa, 0x8a, 0xf0, 0xb2, 0x77, 0x1a, 0xda, 0xcd, 0x3d, 0x8b, 0x0a, 0xb9,
+ 0xfb, 0xcb, 0x01, 0x71, 0xfe, 0x27, 0xdd, 0x97, 0x6f, 0x7a, 0xda, 0xeb, 0x37, 0xbd, 0xb5, 0x5f,
+ 0xae, 0x7a, 0xda, 0xcb, 0xab, 0x9e, 0xf6, 0xea, 0xaa, 0xa7, 0xfd, 0x7d, 0xd5, 0xd3, 0x7e, 0xff,
+ 0xa7, 0xb7, 0x36, 0xae, 0xcb, 0x97, 0xe4, 0xfb, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xfd, 0xa0,
+ 0xcf, 0x23, 0x89, 0x0a, 0x00, 0x00,
}

// Reference imports to suppress errors if they are not otherwise used.
Expand All @@ -7098,7 +7098,7 @@ index ac0924b2b16..d178c9be619 100644
+ i = encodeVarintApi(dAtA, i, uint64(size))
+ }
+ i--
+ dAtA[i] = 0x22
+ dAtA[i] = 0x7a
+ }
+ }
if len(m.Memory) > 0 {
Expand Down Expand Up @@ -7189,7 +7189,7 @@ index ac0924b2b16..d178c9be619 100644
+ i = encodeVarintApi(dAtA, i, uint64(size))
+ }
+ i--
+ dAtA[i] = 0x2a
+ dAtA[i] = 0x7a
+ }
+ }
if len(m.Memory) > 0 {
Expand Down Expand Up @@ -7230,14 +7230,14 @@ index ac0924b2b16..d178c9be619 100644
if err != nil {
return 0, err
}
@@ -1155,13 +1557,227 @@ func (m *TopologyInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
@@ -1155,13 +1557,66 @@ func (m *TopologyInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i = encodeVarintApi(dAtA, i, uint64(size))
}
i--
- dAtA[i] = 0xa
+ dAtA[i] = 0x3a
+ }
+ }
}
}
+ if len(m.TopologyAwareQuantityList) > 0 {
+ for iNdEx := len(m.TopologyAwareQuantityList) - 1; iNdEx >= 0; iNdEx-- {
+ {
Expand Down Expand Up @@ -7280,7 +7280,7 @@ index ac0924b2b16..d178c9be619 100644
+ dAtA[i] = 1
+ } else {
+ dAtA[i] = 0
}
+ }
+ i--
+ dAtA[i] = 0x10
+ }
Expand All @@ -7290,21 +7290,20 @@ index ac0924b2b16..d178c9be619 100644
+ i = encodeVarintApi(dAtA, i, uint64(len(m.ResourceName)))
+ i--
+ dAtA[i] = 0xa
}
+ }
return len(dAtA) - i, nil
}

-func (m *NUMANode) Marshal() (dAtA []byte, err error) {
+func (m *AllocatableTopologyAwareResource) 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
+}
+
size := m.Size()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1171,7 +1626,168 @@ func (m *NUMANode) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil
}

-func (m *NUMANode) MarshalTo(dAtA []byte) (int, error) {
+func (m *AllocatableTopologyAwareResource) MarshalTo(dAtA []byte) (int, error) {
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
Expand Down Expand Up @@ -7457,9 +7456,19 @@ index ac0924b2b16..d178c9be619 100644
+}
+
+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()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
return m.MarshalToSizedBuffer(dAtA[:size])
}
@@ -1234,6 +1850,12 @@ func (m *AllocatableResourcesResponse) Size() (n int) {
n += 1 + l + sovApi(uint64(l))
}
Expand Down Expand Up @@ -7768,7 +7777,7 @@ index ac0924b2b16..d178c9be619 100644
- skippy, err := skipApi(dAtA[iNdEx:])
- if err != nil {
- return err
+ case 4:
+ case 15:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Resources", wireType)
}
Expand Down Expand Up @@ -8164,12 +8173,13 @@ index ac0924b2b16..d178c9be619 100644
- skippy, err := skipApi(dAtA[iNdEx:])
- if err != nil {
- return err
+ case 5:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Resources", wireType)
}
- }
- if (skippy < 0) || (iNdEx+skippy) < 0 {
- return ErrInvalidLengthApi
+ case 15:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Resources", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
Expand Down Expand Up @@ -8723,14 +8733,14 @@ index ac0924b2b16..d178c9be619 100644
l := len(dAtA)
iNdEx := 0
diff --git a/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.proto
index add2aad4874..d3610d2a853 100644
index add2aad4874..115ef896608 100644
--- a/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.proto
+++ b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.proto
@@ -28,6 +28,7 @@ message AllocatableResourcesResponse {
repeated ContainerDevices devices = 1;
repeated int64 cpu_ids = 2;
repeated ContainerMemory memory = 3;
+ repeated AllocatableTopologyAwareResource resources = 4;
+ repeated AllocatableTopologyAwareResource resources = 15;
}

// ListPodResourcesRequest is the request made to the PodResourcesLister service
Expand All @@ -8751,7 +8761,7 @@ index add2aad4874..d3610d2a853 100644
repeated ContainerDevices devices = 2;
repeated int64 cpu_ids = 3;
repeated ContainerMemory memory = 4;
+ repeated TopologyAwareResource resources = 5;
+ repeated TopologyAwareResource resources = 15;
}

// ContainerMemory contains information about memory and hugepages assigned to a container
Expand Down

0 comments on commit 29cb56e

Please sign in to comment.