Skip to content

Commit 29cb56e

Browse files
csfldfcsfldf
authored
Merge pull request #4 from kubewharf/sjy/pod-resources-server-fix
style(qrm): update custom pod resources server api property index
2 parents 4e01765 + 2de2c41 commit 29cb56e

File tree

1 file changed

+94
-84
lines changed

1 file changed

+94
-84
lines changed

‎releases/1.24/patches/0002-KubeWharf-FEATURE-qos-resource-manager‎

Lines changed: 94 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -6568,7 +6568,7 @@ index 7708f758fa2..5d6387af557 100644
65686568
+ ResourcePlugin = "ResourcePlugin"
65696569
)
65706570
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
6571-
index ac0924b2b16..d178c9be619 100644
6571+
index ac0924b2b16..19b893ea949 100644
65726572
--- a/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.pb.go
65736573
+++ b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.pb.go
65746574
@@ -21,9 +21,11 @@ package v1
@@ -6595,7 +6595,7 @@ index ac0924b2b16..d178c9be619 100644
65956595
+ Devices []*ContainerDevices `protobuf:"bytes,1,rep,name=devices,proto3" json:"devices,omitempty"`
65966596
+ CpuIds []int64 `protobuf:"varint,2,rep,packed,name=cpu_ids,json=cpuIds,proto3" json:"cpu_ids,omitempty"`
65976597
+ Memory []*ContainerMemory `protobuf:"bytes,3,rep,name=memory,proto3" json:"memory,omitempty"`
6598-
+ Resources []*AllocatableTopologyAwareResource `protobuf:"bytes,4,rep,name=resources,proto3" json:"resources,omitempty"`
6598+
+ Resources []*AllocatableTopologyAwareResource `protobuf:"bytes,15,rep,name=resources,proto3" json:"resources,omitempty"`
65996599
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
66006600
+ XXX_sizecache int32 `json:"-"`
66016601
}
@@ -6679,7 +6679,7 @@ index ac0924b2b16..d178c9be619 100644
66796679
+ Devices []*ContainerDevices `protobuf:"bytes,2,rep,name=devices,proto3" json:"devices,omitempty"`
66806680
+ CpuIds []int64 `protobuf:"varint,3,rep,packed,name=cpu_ids,json=cpuIds,proto3" json:"cpu_ids,omitempty"`
66816681
+ Memory []*ContainerMemory `protobuf:"bytes,4,rep,name=memory,proto3" json:"memory,omitempty"`
6682-
+ Resources []*TopologyAwareResource `protobuf:"bytes,5,rep,name=resources,proto3" json:"resources,omitempty"`
6682+
+ Resources []*TopologyAwareResource `protobuf:"bytes,15,rep,name=resources,proto3" json:"resources,omitempty"`
66836683
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
66846684
+ XXX_sizecache int32 `json:"-"`
66856685
}
@@ -7019,67 +7019,67 @@ index ac0924b2b16..d178c9be619 100644
70197019
- 0x71, 0x69, 0xa3, 0x5f, 0x97, 0xf6, 0xc6, 0xe7, 0x99, 0x8d, 0x2e, 0x66, 0x36, 0xfa, 0x39, 0xb3,
70207020
- 0xd1, 0xef, 0x99, 0x8d, 0xbe, 0xfe, 0xb1, 0x37, 0x06, 0x65, 0xfd, 0xd8, 0x3c, 0xfd, 0x1b, 0x00,
70217021
- 0x00, 0xff, 0xff, 0x43, 0x46, 0x5d, 0x7f, 0xac, 0x04, 0x00, 0x00,
7022-
+ // 952 bytes of a gzipped FileDescriptorProto
7022+
+ // 950 bytes of a gzipped FileDescriptorProto
70237023
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcd, 0x6e, 0xdb, 0x46,
7024-
+ 0x10, 0x36, 0x45, 0xfd, 0x58, 0x63, 0xc5, 0x15, 0x36, 0x69, 0x4d, 0x2b, 0xb2, 0xac, 0xb0, 0x31,
7024+
+ 0x10, 0x36, 0x45, 0xfd, 0x58, 0x63, 0xc5, 0x11, 0x36, 0x69, 0x4d, 0x2b, 0xb2, 0xac, 0xb0, 0x31,
70257025
+ 0x20, 0xa0, 0xa9, 0x8c, 0xb8, 0xff, 0x3d, 0x14, 0x51, 0xec, 0xb6, 0x30, 0x90, 0x18, 0x0d, 0xeb,
70267026
+ 0xf6, 0xd0, 0x43, 0x89, 0x15, 0xb9, 0x51, 0x09, 0xd3, 0x5c, 0x9a, 0xbb, 0x72, 0xa1, 0x9e, 0x7a,
70277027
+ 0xe8, 0xa5, 0xb7, 0x3e, 0x44, 0x5f, 0xa2, 0x6f, 0x90, 0x63, 0x6e, 0xcd, 0xb1, 0x71, 0x5f, 0xa4,
7028-
+ 0xd8, 0x5d, 0xf1, 0x47, 0x24, 0x55, 0xd9, 0xa7, 0x9c, 0xb4, 0x9c, 0xf9, 0x66, 0xe6, 0xdb, 0x6f,
7029-
+ 0x66, 0x57, 0x0b, 0x4d, 0x1c, 0x7a, 0xc3, 0x30, 0xa2, 0x9c, 0xa2, 0xca, 0xe5, 0xc3, 0xce, 0xfb,
7030-
+ 0x13, 0x8f, 0xff, 0x34, 0x1d, 0x0f, 0x1d, 0x7a, 0xbe, 0x3f, 0xa1, 0x13, 0xba, 0x2f, 0x5d, 0xe3,
7031-
+ 0xe9, 0x73, 0xf9, 0x25, 0x3f, 0xe4, 0x4a, 0x85, 0x98, 0x3b, 0x70, 0x77, 0xe4, 0xfb, 0xd4, 0xc1,
7028+
+ 0xd8, 0x5d, 0xf1, 0x47, 0x24, 0x55, 0xd9, 0xa7, 0x9e, 0xb4, 0x9c, 0xf9, 0x66, 0xe6, 0xdb, 0x6f,
7029+
+ 0x66, 0x57, 0x0b, 0x4d, 0x1c, 0x7a, 0xc3, 0x30, 0xa2, 0x9c, 0xa2, 0xca, 0xe5, 0xa3, 0xce, 0x7b,
7030+
+ 0x13, 0x8f, 0xff, 0x38, 0x1d, 0x0f, 0x1d, 0x7a, 0xbe, 0x3f, 0xa1, 0x13, 0xba, 0x2f, 0x5d, 0xe3,
7031+
+ 0xe9, 0x0b, 0xf9, 0x25, 0x3f, 0xe4, 0x4a, 0x85, 0x98, 0x3b, 0x70, 0x6f, 0xe4, 0xfb, 0xd4, 0xc1,
70327032
+ 0x1c, 0x8f, 0x7d, 0x62, 0x11, 0x46, 0xa7, 0x91, 0x43, 0x98, 0x45, 0x2e, 0xa6, 0x84, 0x71, 0xf3,
7033-
+ 0x95, 0x06, 0xdd, 0x72, 0x3f, 0x0b, 0x69, 0xc0, 0x08, 0x1a, 0x42, 0xc3, 0x25, 0x97, 0x9e, 0x43,
7034-
+ 0x98, 0xa1, 0xf5, 0xf5, 0xc1, 0xc6, 0xc1, 0x9d, 0xe1, 0xe5, 0xc3, 0xe1, 0x21, 0x0d, 0x38, 0xf6,
7033+
+ 0xb5, 0x06, 0xdd, 0x72, 0x3f, 0x0b, 0x69, 0xc0, 0x08, 0x1a, 0x42, 0xc3, 0x25, 0x97, 0x9e, 0x43,
7034+
+ 0x98, 0xa1, 0xf5, 0xf5, 0xc1, 0xc6, 0xc1, 0xdd, 0xe1, 0xe5, 0xa3, 0xe1, 0x21, 0x0d, 0x38, 0xf6,
70357035
+ 0x02, 0x12, 0x1d, 0x29, 0x9f, 0x15, 0x83, 0xd0, 0x16, 0x34, 0x9c, 0x70, 0x6a, 0x7b, 0x2e, 0x33,
7036-
+ 0x2a, 0x7d, 0x7d, 0xa0, 0x5b, 0x75, 0x27, 0x9c, 0x1e, 0xbb, 0x0c, 0xbd, 0x07, 0xf5, 0x73, 0x72,
7037-
+ 0x4e, 0xa3, 0x99, 0xa1, 0xcb, 0x3c, 0xb7, 0x17, 0xf2, 0x3c, 0x95, 0x2e, 0x6b, 0x0e, 0x41, 0x8f,
7038-
+ 0xa1, 0x19, 0xc5, 0x54, 0x8c, 0xaa, 0xc4, 0xdf, 0x17, 0xf8, 0x0c, 0xd5, 0x53, 0x1a, 0x52, 0x9f,
7039-
+ 0x4e, 0x66, 0xa3, 0x9f, 0x71, 0x94, 0xf0, 0xb6, 0xd2, 0x30, 0x73, 0x1b, 0xb6, 0x9e, 0x78, 0x8c,
7040-
+ 0x7f, 0x43, 0xdd, 0xc2, 0xae, 0x9f, 0x81, 0x51, 0x74, 0xcd, 0x37, 0xfc, 0x11, 0xdc, 0x0a, 0xa9,
7041-
+ 0x6b, 0xa7, 0xe5, 0xd5, 0xb6, 0xdb, 0xa2, 0xfc, 0x42, 0x40, 0x2b, 0xcc, 0x7c, 0x99, 0x7f, 0xea,
7042-
+ 0xd0, 0xca, 0xba, 0x11, 0x82, 0x6a, 0x80, 0xcf, 0x89, 0xa1, 0xf5, 0xb5, 0x41, 0xd3, 0x92, 0x6b,
7043-
+ 0xd4, 0x85, 0xa6, 0xf8, 0x65, 0x21, 0x76, 0x88, 0x51, 0x91, 0x8e, 0xd4, 0x80, 0xb6, 0x61, 0x5d,
7044-
+ 0x56, 0xa6, 0x3e, 0x31, 0x74, 0xe9, 0x6c, 0x88, 0x12, 0xd4, 0x4f, 0x5c, 0x7c, 0x16, 0x12, 0xa3,
7045-
+ 0x9a, 0xb8, 0x4e, 0x67, 0x21, 0x41, 0x1f, 0x03, 0x38, 0xb1, 0x8a, 0xcc, 0xa8, 0x49, 0xb2, 0xef,
7046-
+ 0x2c, 0x68, 0x9b, 0x52, 0xce, 0x20, 0xd1, 0x87, 0x50, 0xf7, 0xf1, 0x98, 0xf8, 0xcc, 0xa8, 0xcb,
7047-
+ 0x98, 0x6e, 0x7e, 0x83, 0xc3, 0x27, 0xd2, 0xfd, 0x65, 0xc0, 0x45, 0x63, 0x14, 0x16, 0x1d, 0xc2,
7048-
+ 0x06, 0x0e, 0x02, 0xca, 0x31, 0xf7, 0x68, 0xc0, 0x8c, 0x86, 0x0c, 0xbd, 0x57, 0x08, 0x1d, 0xa5,
7049-
+ 0x18, 0x15, 0x9f, 0x8d, 0xea, 0x7c, 0x06, 0x1b, 0x99, 0xdc, 0xa8, 0x0d, 0xfa, 0x19, 0x99, 0xcd,
7050-
+ 0x85, 0x12, 0x4b, 0x74, 0x07, 0x6a, 0x97, 0xd8, 0x9f, 0xc6, 0x1a, 0xa9, 0x8f, 0xcf, 0x2b, 0x9f,
7051-
+ 0x6a, 0x9d, 0x2f, 0xa0, 0x9d, 0xcf, 0x7d, 0x93, 0x78, 0xf3, 0x6f, 0x0d, 0x50, 0x51, 0x98, 0xd2,
7052-
+ 0x66, 0x65, 0x26, 0xbf, 0x72, 0xc3, 0xc9, 0xd7, 0x97, 0x4c, 0x7e, 0x75, 0xf5, 0xe4, 0x7f, 0x92,
7053-
+ 0x9d, 0x7c, 0xd5, 0xcd, 0x6d, 0x81, 0x5f, 0x39, 0xee, 0x1c, 0xde, 0xca, 0xe5, 0x44, 0xbb, 0xb0,
7054-
+ 0xa1, 0xb2, 0xaa, 0xc1, 0x51, 0x9b, 0x03, 0x65, 0x92, 0xb3, 0x83, 0xa0, 0xca, 0xbc, 0x5f, 0x94,
7055-
+ 0x4c, 0x55, 0x4b, 0xae, 0xd1, 0x03, 0x58, 0xe7, 0xf3, 0x5a, 0x72, 0x0a, 0xe7, 0xa3, 0x1f, 0xd7,
7056-
+ 0x3f, 0x0e, 0x9e, 0x53, 0x2b, 0x41, 0x98, 0xbf, 0x69, 0xd0, 0xce, 0x4b, 0x82, 0xde, 0x85, 0x5b,
7057-
+ 0x31, 0x2f, 0x3b, 0x23, 0x6b, 0x2b, 0x36, 0x9e, 0x08, 0x79, 0x77, 0x00, 0x94, 0x72, 0xc9, 0x5d,
7058-
+ 0xd1, 0xb4, 0x9a, 0xca, 0x22, 0x44, 0xbb, 0x19, 0x8d, 0x97, 0x3a, 0xbc, 0x5d, 0xaa, 0xd0, 0xf5,
7059-
+ 0xb8, 0x0c, 0xa0, 0xed, 0x31, 0x3b, 0xa0, 0x2e, 0x49, 0xce, 0xbd, 0xd4, 0x64, 0xdd, 0xda, 0xf4,
7060-
+ 0xd8, 0x09, 0x75, 0xd3, 0x74, 0x0f, 0x00, 0x79, 0xcc, 0x66, 0x0e, 0xf6, 0x71, 0x94, 0x62, 0x75,
7061-
+ 0x89, 0x6d, 0x7b, 0xec, 0x5b, 0xe9, 0x48, 0xd0, 0xfb, 0x70, 0x1b, 0x4f, 0x26, 0x11, 0x99, 0x60,
7062-
+ 0x4e, 0x5c, 0xfb, 0x62, 0x8a, 0x03, 0xee, 0xf1, 0x99, 0x3c, 0xc1, 0x9a, 0x85, 0x52, 0xd7, 0xb3,
7063-
+ 0xb9, 0x07, 0x3d, 0x82, 0x2e, 0x8d, 0xbc, 0x89, 0x17, 0x60, 0xdf, 0x2e, 0x8b, 0xac, 0xc9, 0xc8,
7064-
+ 0x4e, 0x8c, 0x19, 0x15, 0x33, 0xfc, 0x00, 0xdd, 0x58, 0x15, 0x1b, 0x0b, 0x25, 0x92, 0x60, 0xdb,
7065-
+ 0xf7, 0x18, 0x9f, 0x1f, 0xf6, 0xe2, 0x48, 0xc5, 0x09, 0xac, 0x6d, 0x5e, 0x66, 0x16, 0xd7, 0x25,
7066-
+ 0x3a, 0x83, 0xbd, 0x84, 0xdd, 0xff, 0x16, 0x69, 0xac, 0x2a, 0x72, 0x2f, 0xce, 0x73, 0xba, 0xac,
7067-
+ 0x98, 0xf9, 0x7b, 0x15, 0xfa, 0xab, 0xae, 0xfb, 0x37, 0xdb, 0xdd, 0xaf, 0x60, 0x37, 0xd3, 0x23,
7068-
+ 0x9c, 0x72, 0xcd, 0x77, 0x7a, 0x27, 0x85, 0x65, 0x76, 0x94, 0xb4, 0xec, 0x02, 0x06, 0x39, 0x35,
7069-
+ 0xcb, 0x72, 0x29, 0x65, 0x6b, 0xab, 0x94, 0xbd, 0xbf, 0xd0, 0xbe, 0x92, 0x72, 0xb2, 0x93, 0x8f,
7070-
+ 0xa0, 0x9b, 0xa1, 0xee, 0xe0, 0x10, 0x3b, 0xa2, 0x44, 0xc2, 0xbb, 0xae, 0xe6, 0x2c, 0xc5, 0x1c,
7071-
+ 0xce, 0x21, 0x09, 0xe9, 0x33, 0xd8, 0xcb, 0x91, 0x2e, 0x64, 0xb9, 0xee, 0x2c, 0x2c, 0x30, 0xce,
7072-
+ 0x17, 0x92, 0xb3, 0x60, 0xe5, 0x4e, 0x77, 0xc2, 0x62, 0x0f, 0x36, 0x93, 0xfe, 0xab, 0x1b, 0x5f,
7073-
+ 0x93, 0xcc, 0x93, 0xa9, 0xf8, 0x5e, 0x18, 0xe5, 0xf5, 0x4e, 0xdd, 0xe4, 0x9e, 0x13, 0x6b, 0xf3,
7074-
+ 0x00, 0x5a, 0xd9, 0xcb, 0x04, 0x99, 0x50, 0x13, 0xf6, 0xf8, 0xff, 0xbe, 0x25, 0x08, 0x9f, 0x7c,
7075-
+ 0xf7, 0x74, 0x24, 0x07, 0x44, 0xb9, 0xcc, 0x0e, 0xac, 0xc7, 0x26, 0xb4, 0x09, 0x95, 0xe3, 0x23,
7076-
+ 0x59, 0x4e, 0xb7, 0x2a, 0xc7, 0x47, 0x07, 0x7f, 0x69, 0x80, 0xb2, 0xff, 0x81, 0x82, 0x38, 0x89,
7077-
+ 0xd0, 0x21, 0x54, 0xa5, 0xe2, 0x77, 0x45, 0xbe, 0x25, 0xef, 0x91, 0x4e, 0xb7, 0xdc, 0xa9, 0x5e,
7078-
+ 0x24, 0xe6, 0x1a, 0xfa, 0x11, 0xb6, 0xbe, 0x26, 0xbc, 0xec, 0x9d, 0x86, 0x76, 0x73, 0xcf, 0xa2,
7079-
+ 0x42, 0xee, 0xfe, 0x72, 0x40, 0x9c, 0xff, 0x71, 0xf7, 0xc5, 0xeb, 0x9e, 0xf6, 0xea, 0x75, 0x6f,
7080-
+ 0xed, 0xd7, 0xab, 0x9e, 0xf6, 0xe2, 0xaa, 0xa7, 0xbd, 0xbc, 0xea, 0x69, 0xff, 0x5c, 0xf5, 0xb4,
7081-
+ 0x3f, 0xfe, 0xed, 0xad, 0x8d, 0xeb, 0xf2, 0x25, 0xf9, 0xc1, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff,
7082-
+ 0xc9, 0x8e, 0xe6, 0x8f, 0x89, 0x0a, 0x00, 0x00,
7036+
+ 0x2a, 0x7d, 0x7d, 0xa0, 0x5b, 0x75, 0x27, 0x9c, 0x1e, 0xbb, 0x0c, 0xbd, 0x0b, 0xf5, 0x73, 0x72,
7037+
+ 0x4e, 0xa3, 0x99, 0xa1, 0xcb, 0x3c, 0x77, 0x16, 0xf2, 0x3c, 0x93, 0x2e, 0x6b, 0x0e, 0x41, 0x4f,
7038+
+ 0xa0, 0x19, 0xc5, 0x54, 0x8c, 0xdb, 0x12, 0xff, 0x40, 0xe0, 0x33, 0x54, 0x4f, 0x69, 0x48, 0x7d,
7039+
+ 0x3a, 0x99, 0x8d, 0x7e, 0xc2, 0x51, 0xc2, 0xdb, 0x4a, 0xc3, 0xcc, 0x6d, 0xd8, 0x7a, 0xea, 0x31,
7040+
+ 0xfe, 0x35, 0x75, 0x0b, 0xbb, 0x7e, 0x0e, 0x46, 0xd1, 0x35, 0xdf, 0xf0, 0x87, 0x70, 0x2b, 0xa4,
7041+
+ 0xae, 0x9d, 0x96, 0x57, 0xdb, 0x6e, 0x8b, 0xf2, 0x0b, 0x01, 0xad, 0x30, 0xf3, 0x65, 0xfe, 0xa1,
7042+
+ 0x43, 0x2b, 0xeb, 0x46, 0x08, 0xaa, 0x01, 0x3e, 0x27, 0x86, 0xd6, 0xd7, 0x06, 0x4d, 0x4b, 0xae,
7043+
+ 0x51, 0x17, 0x9a, 0xe2, 0x97, 0x85, 0xd8, 0x21, 0x46, 0x45, 0x3a, 0x52, 0x03, 0xda, 0x86, 0x75,
7044+
+ 0x59, 0x99, 0xfa, 0xc4, 0xd0, 0xa5, 0xb3, 0x21, 0x4a, 0x50, 0x3f, 0x71, 0xf1, 0x59, 0x48, 0x8c,
7045+
+ 0x6a, 0xe2, 0x3a, 0x9d, 0x85, 0x04, 0x7d, 0x04, 0xe0, 0xc4, 0x2a, 0x32, 0xa3, 0x26, 0xc9, 0xbe,
7046+
+ 0xbd, 0xa0, 0x6d, 0x4a, 0x39, 0x83, 0x44, 0x1f, 0x40, 0xdd, 0xc7, 0x63, 0xe2, 0x33, 0xa3, 0x2e,
7047+
+ 0x63, 0xba, 0xf9, 0x0d, 0x0e, 0x9f, 0x4a, 0xf7, 0x17, 0x01, 0x17, 0x8d, 0x51, 0x58, 0x74, 0x08,
7048+
+ 0x1b, 0x38, 0x08, 0x28, 0xc7, 0xdc, 0xa3, 0x01, 0x33, 0x1a, 0x32, 0xf4, 0x7e, 0x21, 0x74, 0x94,
7049+
+ 0x62, 0x54, 0x7c, 0x36, 0xaa, 0xf3, 0x29, 0x6c, 0x64, 0x72, 0xa3, 0x36, 0xe8, 0x67, 0x64, 0x36,
7050+
+ 0x17, 0x4a, 0x2c, 0xd1, 0x5d, 0xa8, 0x5d, 0x62, 0x7f, 0x1a, 0x6b, 0xa4, 0x3e, 0x3e, 0xab, 0x7c,
7051+
+ 0xa2, 0x75, 0x3e, 0x87, 0x76, 0x3e, 0xf7, 0x4d, 0xe2, 0xcd, 0xbf, 0x34, 0x40, 0x45, 0x61, 0x4a,
7052+
+ 0x9b, 0x95, 0x99, 0xfc, 0xca, 0x0d, 0x27, 0x5f, 0x5f, 0x32, 0xf9, 0xd5, 0xd5, 0x93, 0xff, 0x71,
7053+
+ 0x71, 0xf2, 0xb7, 0x05, 0x7e, 0xe5, 0xb8, 0x73, 0xb8, 0x9d, 0xcb, 0x89, 0x76, 0x61, 0x43, 0x65,
7054+
+ 0x55, 0x83, 0xa3, 0x36, 0x07, 0xca, 0x24, 0x67, 0x07, 0x41, 0x95, 0x79, 0x3f, 0x2b, 0x99, 0xaa,
7055+
+ 0x96, 0x5c, 0xa3, 0x87, 0xb0, 0xce, 0xe7, 0xb5, 0xe4, 0x14, 0xce, 0x47, 0x3f, 0xae, 0x7f, 0x1c,
7056+
+ 0xbc, 0xa0, 0x56, 0x82, 0x30, 0x7f, 0xd5, 0xa0, 0x9d, 0x97, 0x04, 0xbd, 0x03, 0xb7, 0x62, 0x5e,
7057+
+ 0x76, 0x46, 0xd6, 0x56, 0x6c, 0x3c, 0x11, 0xf2, 0xee, 0x00, 0x28, 0xe5, 0x92, 0xbb, 0xa2, 0x69,
7058+
+ 0x35, 0x95, 0x45, 0x88, 0x76, 0x33, 0x1a, 0xaf, 0x74, 0x78, 0xab, 0x54, 0xa1, 0xeb, 0x71, 0x19,
7059+
+ 0x40, 0xdb, 0x63, 0x76, 0x40, 0x5d, 0x92, 0x9c, 0x7b, 0xa9, 0xc9, 0xba, 0xb5, 0xe9, 0xb1, 0x13,
7060+
+ 0xea, 0xa6, 0xe9, 0x1e, 0x02, 0xf2, 0x98, 0xcd, 0x1c, 0xec, 0xe3, 0x28, 0xc5, 0xea, 0x12, 0xdb,
7061+
+ 0xf6, 0xd8, 0x37, 0xd2, 0x91, 0xa0, 0xf7, 0xe1, 0x0e, 0x9e, 0x4c, 0x22, 0x32, 0xc1, 0x9c, 0xb8,
7062+
+ 0xf6, 0xc5, 0x14, 0x07, 0xdc, 0xe3, 0x33, 0x79, 0x82, 0x35, 0x0b, 0xa5, 0xae, 0xe7, 0x73, 0x0f,
7063+
+ 0x7a, 0x0c, 0x5d, 0x1a, 0x79, 0x13, 0x2f, 0xc0, 0xbe, 0x5d, 0x16, 0x59, 0x93, 0x91, 0x9d, 0x18,
7064+
+ 0x33, 0x2a, 0x66, 0xf8, 0x1e, 0xba, 0xb1, 0x2a, 0x36, 0x16, 0x4a, 0x24, 0xc1, 0xb6, 0xef, 0x31,
7065+
+ 0x3e, 0x3f, 0xec, 0xc5, 0x91, 0x8a, 0x13, 0x58, 0xdb, 0xbc, 0xcc, 0x2c, 0xae, 0x4b, 0x74, 0x06,
7066+
+ 0x7b, 0x09, 0xbb, 0xff, 0x2c, 0xd2, 0x58, 0x55, 0xe4, 0x7e, 0x9c, 0xe7, 0x74, 0x59, 0x31, 0xf3,
7067+
+ 0xb7, 0x2a, 0xf4, 0x57, 0x5d, 0xf7, 0xff, 0x6f, 0x77, 0xbf, 0x84, 0xdd, 0x4c, 0x8f, 0x70, 0xca,
7068+
+ 0x35, 0xdf, 0xe9, 0x9d, 0x14, 0x96, 0xd9, 0x51, 0xd2, 0xb2, 0x0b, 0x18, 0xe4, 0xd4, 0x2c, 0xcb,
7069+
+ 0xa5, 0x94, 0xad, 0xad, 0x52, 0xf6, 0xc1, 0x42, 0xfb, 0x4a, 0xca, 0xc9, 0x4e, 0x3e, 0x86, 0x6e,
7070+
+ 0x86, 0xba, 0x83, 0x43, 0xec, 0x88, 0x12, 0x09, 0xef, 0xba, 0x9a, 0xb3, 0x14, 0x73, 0x38, 0x87,
7071+
+ 0x24, 0xa4, 0xcf, 0x60, 0x2f, 0x47, 0xba, 0x90, 0xe5, 0xba, 0xb3, 0xb0, 0xc0, 0x38, 0x5f, 0x48,
7072+
+ 0xce, 0x82, 0x95, 0x3b, 0xdd, 0x09, 0x8b, 0x3d, 0xd8, 0x4c, 0xfa, 0xaf, 0x6e, 0x7c, 0x4d, 0x32,
7073+
+ 0x4f, 0xa6, 0xe2, 0x3b, 0x61, 0x94, 0xd7, 0x3b, 0x75, 0x93, 0x7b, 0x4e, 0xac, 0xcd, 0x03, 0x68,
7074+
+ 0x65, 0x2f, 0x13, 0x64, 0x42, 0x4d, 0xd8, 0xe3, 0xff, 0xfb, 0x96, 0x20, 0x7c, 0xf2, 0xed, 0xb3,
7075+
+ 0x91, 0x1c, 0x10, 0xe5, 0x32, 0x3b, 0xb0, 0x1e, 0x9b, 0xd0, 0x26, 0x54, 0x8e, 0x8f, 0x64, 0x39,
7076+
+ 0xdd, 0xaa, 0x1c, 0x1f, 0x1d, 0xfc, 0xa9, 0x01, 0xca, 0xfe, 0x07, 0x0a, 0xe2, 0x24, 0x42, 0x87,
7077+
+ 0x50, 0x95, 0x8a, 0xdf, 0x13, 0xf9, 0x96, 0xbc, 0x47, 0x3a, 0xdd, 0x72, 0xa7, 0x7a, 0x91, 0x98,
7078+
+ 0x6b, 0xe8, 0x07, 0xd8, 0xfa, 0x8a, 0xf0, 0xb2, 0x77, 0x1a, 0xda, 0xcd, 0x3d, 0x8b, 0x0a, 0xb9,
7079+
+ 0xfb, 0xcb, 0x01, 0x71, 0xfe, 0x27, 0xdd, 0x97, 0x6f, 0x7a, 0xda, 0xeb, 0x37, 0xbd, 0xb5, 0x5f,
7080+
+ 0xae, 0x7a, 0xda, 0xcb, 0xab, 0x9e, 0xf6, 0xea, 0xaa, 0xa7, 0xfd, 0x7d, 0xd5, 0xd3, 0x7e, 0xff,
7081+
+ 0xa7, 0xb7, 0x36, 0xae, 0xcb, 0x97, 0xe4, 0xfb, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xfd, 0xa0,
7082+
+ 0xcf, 0x23, 0x89, 0x0a, 0x00, 0x00,
70837083
}
70847084

70857085
// Reference imports to suppress errors if they are not otherwise used.
@@ -7098,7 +7098,7 @@ index ac0924b2b16..d178c9be619 100644
70987098
+ i = encodeVarintApi(dAtA, i, uint64(size))
70997099
+ }
71007100
+ i--
7101-
+ dAtA[i] = 0x22
7101+
+ dAtA[i] = 0x7a
71027102
+ }
71037103
+ }
71047104
if len(m.Memory) > 0 {
@@ -7189,7 +7189,7 @@ index ac0924b2b16..d178c9be619 100644
71897189
+ i = encodeVarintApi(dAtA, i, uint64(size))
71907190
+ }
71917191
+ i--
7192-
+ dAtA[i] = 0x2a
7192+
+ dAtA[i] = 0x7a
71937193
+ }
71947194
+ }
71957195
if len(m.Memory) > 0 {
@@ -7230,14 +7230,14 @@ index ac0924b2b16..d178c9be619 100644
72307230
if err != nil {
72317231
return 0, err
72327232
}
7233-
@@ -1155,13 +1557,227 @@ func (m *TopologyInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
7233+
@@ -1155,13 +1557,66 @@ func (m *TopologyInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
72347234
i = encodeVarintApi(dAtA, i, uint64(size))
72357235
}
72367236
i--
72377237
- dAtA[i] = 0xa
72387238
+ dAtA[i] = 0x3a
7239-
+ }
7240-
+ }
7239+
}
7240+
}
72417241
+ if len(m.TopologyAwareQuantityList) > 0 {
72427242
+ for iNdEx := len(m.TopologyAwareQuantityList) - 1; iNdEx >= 0; iNdEx-- {
72437243
+ {
@@ -7280,7 +7280,7 @@ index ac0924b2b16..d178c9be619 100644
72807280
+ dAtA[i] = 1
72817281
+ } else {
72827282
+ dAtA[i] = 0
7283-
}
7283+
+ }
72847284
+ i--
72857285
+ dAtA[i] = 0x10
72867286
+ }
@@ -7290,21 +7290,20 @@ index ac0924b2b16..d178c9be619 100644
72907290
+ i = encodeVarintApi(dAtA, i, uint64(len(m.ResourceName)))
72917291
+ i--
72927292
+ dAtA[i] = 0xa
7293-
}
7293+
+ }
72947294
return len(dAtA) - i, nil
72957295
}
72967296

72977297
-func (m *NUMANode) Marshal() (dAtA []byte, err error) {
72987298
+func (m *AllocatableTopologyAwareResource) Marshal() (dAtA []byte, err error) {
7299-
+ size := m.Size()
7300-
+ dAtA = make([]byte, size)
7301-
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
7302-
+ if err != nil {
7303-
+ return nil, err
7304-
+ }
7305-
+ return dAtA[:n], nil
7306-
+}
7307-
+
7299+
size := m.Size()
7300+
dAtA = make([]byte, size)
7301+
n, err := m.MarshalToSizedBuffer(dAtA[:size])
7302+
@@ -1171,7 +1626,168 @@ func (m *NUMANode) Marshal() (dAtA []byte, err error) {
7303+
return dAtA[:n], nil
7304+
}
7305+
7306+
-func (m *NUMANode) MarshalTo(dAtA []byte) (int, error) {
73087307
+func (m *AllocatableTopologyAwareResource) MarshalTo(dAtA []byte) (int, error) {
73097308
+ size := m.Size()
73107309
+ return m.MarshalToSizedBuffer(dAtA[:size])
@@ -7457,9 +7456,19 @@ index ac0924b2b16..d178c9be619 100644
74577456
+}
74587457
+
74597458
+func (m *NUMANode) Marshal() (dAtA []byte, err error) {
7459+
+ size := m.Size()
7460+
+ dAtA = make([]byte, size)
7461+
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
7462+
+ if err != nil {
7463+
+ return nil, err
7464+
+ }
7465+
+ return dAtA[:n], nil
7466+
+}
7467+
+
7468+
+func (m *NUMANode) MarshalTo(dAtA []byte) (int, error) {
74607469
size := m.Size()
7461-
dAtA = make([]byte, size)
7462-
n, err := m.MarshalToSizedBuffer(dAtA[:size])
7470+
return m.MarshalToSizedBuffer(dAtA[:size])
7471+
}
74637472
@@ -1234,6 +1850,12 @@ func (m *AllocatableResourcesResponse) Size() (n int) {
74647473
n += 1 + l + sovApi(uint64(l))
74657474
}
@@ -7768,7 +7777,7 @@ index ac0924b2b16..d178c9be619 100644
77687777
- skippy, err := skipApi(dAtA[iNdEx:])
77697778
- if err != nil {
77707779
- return err
7771-
+ case 4:
7780+
+ case 15:
77727781
+ if wireType != 2 {
77737782
+ return fmt.Errorf("proto: wrong wireType = %d for field Resources", wireType)
77747783
}
@@ -8164,12 +8173,13 @@ index ac0924b2b16..d178c9be619 100644
81648173
- skippy, err := skipApi(dAtA[iNdEx:])
81658174
- if err != nil {
81668175
- return err
8167-
+ case 5:
8168-
+ if wireType != 2 {
8169-
+ return fmt.Errorf("proto: wrong wireType = %d for field Resources", wireType)
8170-
}
8176+
- }
81718177
- if (skippy < 0) || (iNdEx+skippy) < 0 {
81728178
- return ErrInvalidLengthApi
8179+
+ case 15:
8180+
+ if wireType != 2 {
8181+
+ return fmt.Errorf("proto: wrong wireType = %d for field Resources", wireType)
8182+
+ }
81738183
+ var msglen int
81748184
+ for shift := uint(0); ; shift += 7 {
81758185
+ if shift >= 64 {
@@ -8723,14 +8733,14 @@ index ac0924b2b16..d178c9be619 100644
87238733
l := len(dAtA)
87248734
iNdEx := 0
87258735
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
8726-
index add2aad4874..d3610d2a853 100644
8736+
index add2aad4874..115ef896608 100644
87278737
--- a/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.proto
87288738
+++ b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.proto
87298739
@@ -28,6 +28,7 @@ message AllocatableResourcesResponse {
87308740
repeated ContainerDevices devices = 1;
87318741
repeated int64 cpu_ids = 2;
87328742
repeated ContainerMemory memory = 3;
8733-
+ repeated AllocatableTopologyAwareResource resources = 4;
8743+
+ repeated AllocatableTopologyAwareResource resources = 15;
87348744
}
87358745

87368746
// ListPodResourcesRequest is the request made to the PodResourcesLister service
@@ -8751,7 +8761,7 @@ index add2aad4874..d3610d2a853 100644
87518761
repeated ContainerDevices devices = 2;
87528762
repeated int64 cpu_ids = 3;
87538763
repeated ContainerMemory memory = 4;
8754-
+ repeated TopologyAwareResource resources = 5;
8764+
+ repeated TopologyAwareResource resources = 15;
87558765
}
87568766

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

0 commit comments

Comments
 (0)