@@ -212,10 +212,10 @@ func TestSandboxTemplate_CreateSandboxFromTemplateResolvesWorkloadAndGovernance(
212212 Workload : & types.SandboxWorkloadConfig {
213213 Image : "registry.example.com/agent:latest" ,
214214 Environment : map [string ]string {"FEATURE_FLAG" : "on" },
215- Resources : & types.SandboxResources {
216- CPU : "2" ,
217- Memory : "4Gi" ,
218- GPU : & types.SandboxGPURequirements {Count : & gpuCount },
215+ Resources : & types.ResourceRequirements {
216+ CPU : & types. CPUResourceRequirements { Limit : "2" } ,
217+ Memory : & types. MemoryResourceRequirements { Limit : "4Gi" } ,
218+ GPU : & types.GPUResourceRequirements {Count : & gpuCount },
219219 },
220220 },
221221 DriverConfig : map [string ]any {
@@ -242,11 +242,16 @@ func TestSandboxTemplate_CreateSandboxFromTemplateResolvesWorkloadAndGovernance(
242242 assert .Equal (t , map [string ]string {"FEATURE_FLAG" : "on" }, created .Spec .Environment )
243243 require .NotNil (t , created .Spec .Template )
244244 assert .Equal (t , "registry.example.com/agent:latest" , created .Spec .Template .Image )
245- assert .Equal ( t , map [ string ] any { "limits" : map [ string ] any { "cpu" : "2" , "memory" : "4Gi" }} , created .Spec .Template .Resources )
245+ assert .Nil ( t , created .Spec .Template .Resources )
246246 assert .Equal (t , "kata-containers" , created .Spec .Template .DriverConfig ["kubernetes" ].(map [string ]any )["runtime_class_name" ])
247- assert .True (t , created .Spec .GPU )
248- require .NotNil (t , created .Spec .GPUCount )
249- assert .Equal (t , uint32 (1 ), * created .Spec .GPUCount )
247+ require .NotNil (t , created .Spec .ResourceRequirements )
248+ require .NotNil (t , created .Spec .ResourceRequirements .CPU )
249+ assert .Equal (t , "2" , created .Spec .ResourceRequirements .CPU .Limit )
250+ require .NotNil (t , created .Spec .ResourceRequirements .Memory )
251+ assert .Equal (t , "4Gi" , created .Spec .ResourceRequirements .Memory .Limit )
252+ require .NotNil (t , created .Spec .ResourceRequirements .GPU )
253+ require .NotNil (t , created .Spec .ResourceRequirements .GPU .Count )
254+ assert .Equal (t , uint32 (1 ), * created .Spec .ResourceRequirements .GPU .Count )
250255 assert .Equal (t , []string {"github" }, created .Spec .Providers )
251256 require .NotNil (t , created .Spec .Policy )
252257 assert .Equal (t , uint32 (1 ), created .Spec .Policy .Version )
@@ -276,11 +281,10 @@ func TestSandboxTemplate_CreateSandboxFromTemplateRejectsWorkloadOverrides(t *te
276281 "template" : {
277282 Template : & types.SandboxTemplate {Image : "registry.example.com/override:latest" },
278283 },
279- "gpu_count" : {
280- GPUCount : & gpuCount ,
281- },
282- "gpu" : {
283- GPU : true ,
284+ "resources" : {
285+ ResourceRequirements : & types.ResourceRequirements {
286+ GPU : & types.GPUResourceRequirements {Count : & gpuCount },
287+ },
284288 },
285289 }
286290
@@ -306,8 +310,8 @@ func TestSandboxTemplate_DefaultGpuRequestRoundTripsTemplate(t *testing.T) {
306310 Name : "default-gpu" ,
307311 Spec : types.SandboxWorkloadTemplateSpec {
308312 Workload : & types.SandboxWorkloadConfig {
309- Resources : & types.SandboxResources {
310- GPU : & types.SandboxGPURequirements {},
313+ Resources : & types.ResourceRequirements {
314+ GPU : & types.GPUResourceRequirements {},
311315 },
312316 },
313317 },
@@ -333,8 +337,8 @@ func TestSandboxTemplate_CreateSandboxFromTemplatePreservesDefaultGPURequest(t *
333337 Spec : types.SandboxWorkloadTemplateSpec {
334338 Workload : & types.SandboxWorkloadConfig {
335339 Image : "registry.example.com/agent:latest" ,
336- Resources : & types.SandboxResources {
337- GPU : & types.SandboxGPURequirements {},
340+ Resources : & types.ResourceRequirements {
341+ GPU : & types.GPUResourceRequirements {},
338342 },
339343 },
340344 },
@@ -350,8 +354,9 @@ func TestSandboxTemplate_CreateSandboxFromTemplatePreservesDefaultGPURequest(t *
350354 )
351355
352356 require .NoError (t , err )
353- assert .True (t , created .Spec .GPU )
354- assert .Nil (t , created .Spec .GPUCount )
357+ require .NotNil (t , created .Spec .ResourceRequirements )
358+ require .NotNil (t , created .Spec .ResourceRequirements .GPU )
359+ assert .Nil (t , created .Spec .ResourceRequirements .GPU .Count )
355360}
356361
357362func TestSandboxTemplate_DeepCopy (t * testing.T ) {
@@ -436,8 +441,8 @@ func TestSandboxTemplate_CreateRejectsInvalidTemplate(t *testing.T) {
436441 Spec : types.SandboxWorkloadTemplateSpec {
437442 Workload : & types.SandboxWorkloadConfig {
438443 Image : "registry.example.com/agent:latest" ,
439- Resources : & types.SandboxResources {
440- GPU : & types.SandboxGPURequirements {Count : & zeroGPUCount },
444+ Resources : & types.ResourceRequirements {
445+ GPU : & types.GPUResourceRequirements {Count : & zeroGPUCount },
441446 },
442447 },
443448 },
0 commit comments