Skip to content

Commit 5bd5de5

Browse files
asm582asm582
committed
fix test
1 parent 2014c16 commit 5bd5de5

File tree

1 file changed

+45
-60
lines changed

1 file changed

+45
-60
lines changed

‎test/e2e/util.go‎

Lines changed: 45 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -347,15 +347,14 @@ func createJobEx(context *context, job *jobSpec) ([]*batchv1.Job, *arbv1.AppWrap
347347
MinAvailable: schedSpecMin,
348348
},
349349
AggrResources: arbv1.AppWrapperResourceList{
350-
Items: []arbv1.AppWrapperResource{
350+
GenericItems: []arbv1.AppWrapperGenericResource{
351351
{
352352
ObjectMeta: metav1.ObjectMeta{
353353
Name: fmt.Sprintf("%s-%s", job.name, "resource1"),
354354
Namespace: ns,
355355
},
356-
Replicas: 1,
357-
Type: arbv1.ResourceTypePod,
358-
Template: runtime.RawExtension{
356+
DesiredAvailable: 1,
357+
GenericTemplate: runtime.RawExtension{
359358
Raw: rb,
360359
},
361360
},
@@ -977,15 +976,14 @@ func createDeploymentAW(context *context, name string) *arbv1.AppWrapper {
977976
MinAvailable: schedSpecMin,
978977
},
979978
AggrResources: arbv1.AppWrapperResourceList{
980-
Items: []arbv1.AppWrapperResource{
979+
GenericItems: []arbv1.AppWrapperGenericResource{
981980
{
982981
ObjectMeta: metav1.ObjectMeta{
983982
Name: fmt.Sprintf("%s-%s", name, "item1"),
984983
Namespace: context.namespace,
985984
},
986-
Replicas: 1,
987-
Type: arbv1.ResourceTypeDeployment,
988-
Template: runtime.RawExtension{
985+
DesiredAvailable: 1,
986+
GenericTemplate: runtime.RawExtension{
989987
Raw: rb,
990988
},
991989
},
@@ -1058,15 +1056,14 @@ func createDeploymentAWwith900CPU(context *context, name string) *arbv1.AppWrapp
10581056
MinAvailable: schedSpecMin,
10591057
},
10601058
AggrResources: arbv1.AppWrapperResourceList{
1061-
Items: []arbv1.AppWrapperResource{
1059+
GenericItems: []arbv1.AppWrapperGenericResource{
10621060
{
10631061
ObjectMeta: metav1.ObjectMeta{
10641062
Name: fmt.Sprintf("%s-%s", name, "item1"),
10651063
Namespace: context.namespace,
10661064
},
1067-
Replicas: 1,
1068-
Type: arbv1.ResourceTypeDeployment,
1069-
Template: runtime.RawExtension{
1065+
DesiredAvailable: 1,
1066+
GenericTemplate: runtime.RawExtension{
10701067
Raw: rb,
10711068
},
10721069
},
@@ -1139,15 +1136,14 @@ func createDeploymentAWwith550CPU(context *context, name string) *arbv1.AppWrapp
11391136
MinAvailable: schedSpecMin,
11401137
},
11411138
AggrResources: arbv1.AppWrapperResourceList{
1142-
Items: []arbv1.AppWrapperResource{
1139+
GenericItems: []arbv1.AppWrapperGenericResource{
11431140
{
11441141
ObjectMeta: metav1.ObjectMeta{
11451142
Name: fmt.Sprintf("%s-%s", name, "item1"),
11461143
Namespace: context.namespace,
11471144
},
1148-
Replicas: 1,
1149-
Type: arbv1.ResourceTypeDeployment,
1150-
Template: runtime.RawExtension{
1145+
DesiredAvailable: 1,
1146+
GenericTemplate: runtime.RawExtension{
11511147
Raw: rb,
11521148
},
11531149
},
@@ -1220,15 +1216,14 @@ func createDeploymentAWwith125CPU(context *context, name string) *arbv1.AppWrapp
12201216
MinAvailable: schedSpecMin,
12211217
},
12221218
AggrResources: arbv1.AppWrapperResourceList{
1223-
Items: []arbv1.AppWrapperResource{
1219+
GenericItems: []arbv1.AppWrapperGenericResource{
12241220
{
12251221
ObjectMeta: metav1.ObjectMeta{
12261222
Name: fmt.Sprintf("%s-%s", name, "item1"),
12271223
Namespace: context.namespace,
12281224
},
1229-
Replicas: 1,
1230-
Type: arbv1.ResourceTypeDeployment,
1231-
Template: runtime.RawExtension{
1225+
DesiredAvailable: 1,
1226+
GenericTemplate: runtime.RawExtension{
12321227
Raw: rb,
12331228
},
12341229
},
@@ -1301,15 +1296,14 @@ func createDeploymentAWwith126CPU(context *context, name string) *arbv1.AppWrapp
13011296
MinAvailable: schedSpecMin,
13021297
},
13031298
AggrResources: arbv1.AppWrapperResourceList{
1304-
Items: []arbv1.AppWrapperResource{
1299+
GenericItems: []arbv1.AppWrapperGenericResource{
13051300
{
13061301
ObjectMeta: metav1.ObjectMeta{
13071302
Name: fmt.Sprintf("%s-%s", name, "item1"),
13081303
Namespace: context.namespace,
13091304
},
1310-
Replicas: 1,
1311-
Type: arbv1.ResourceTypeDeployment,
1312-
Template: runtime.RawExtension{
1305+
DesiredAvailable: 1,
1306+
GenericTemplate: runtime.RawExtension{
13131307
Raw: rb,
13141308
},
13151309
},
@@ -1382,15 +1376,14 @@ func createDeploymentAWwith350CPU(context *context, name string) *arbv1.AppWrapp
13821376
MinAvailable: schedSpecMin,
13831377
},
13841378
AggrResources: arbv1.AppWrapperResourceList{
1385-
Items: []arbv1.AppWrapperResource{
1379+
GenericItems: []arbv1.AppWrapperGenericResource{
13861380
{
13871381
ObjectMeta: metav1.ObjectMeta{
13881382
Name: fmt.Sprintf("%s-%s", name, "item1"),
13891383
Namespace: context.namespace,
13901384
},
1391-
Replicas: 1,
1392-
Type: arbv1.ResourceTypeDeployment,
1393-
Template: runtime.RawExtension{
1385+
DesiredAvailable: 1,
1386+
GenericTemplate: runtime.RawExtension{
13941387
Raw: rb,
13951388
},
13961389
},
@@ -1463,15 +1456,14 @@ func createDeploymentAWwith351CPU(context *context, name string) *arbv1.AppWrapp
14631456
MinAvailable: schedSpecMin,
14641457
},
14651458
AggrResources: arbv1.AppWrapperResourceList{
1466-
Items: []arbv1.AppWrapperResource{
1459+
GenericItems: []arbv1.AppWrapperGenericResource{
14671460
{
14681461
ObjectMeta: metav1.ObjectMeta{
14691462
Name: fmt.Sprintf("%s-%s", name, "item1"),
14701463
Namespace: context.namespace,
14711464
},
1472-
Replicas: 1,
1473-
Type: arbv1.ResourceTypeDeployment,
1474-
Template: runtime.RawExtension{
1465+
DesiredAvailable: 1,
1466+
GenericTemplate: runtime.RawExtension{
14751467
Raw: rb,
14761468
},
14771469
},
@@ -1544,15 +1536,14 @@ func createDeploymentAWwith426CPU(context *context, name string) *arbv1.AppWrapp
15441536
MinAvailable: schedSpecMin,
15451537
},
15461538
AggrResources: arbv1.AppWrapperResourceList{
1547-
Items: []arbv1.AppWrapperResource{
1539+
GenericItems: []arbv1.AppWrapperGenericResource{
15481540
{
15491541
ObjectMeta: metav1.ObjectMeta{
15501542
Name: fmt.Sprintf("%s-%s", name, "item1"),
15511543
Namespace: context.namespace,
15521544
},
1553-
Replicas: 1,
1554-
Type: arbv1.ResourceTypeDeployment,
1555-
Template: runtime.RawExtension{
1545+
DesiredAvailable: 1,
1546+
GenericTemplate: runtime.RawExtension{
15561547
Raw: rb,
15571548
},
15581549
},
@@ -1625,15 +1616,14 @@ func createDeploymentAWwith425CPU(context *context, name string) *arbv1.AppWrapp
16251616
MinAvailable: schedSpecMin,
16261617
},
16271618
AggrResources: arbv1.AppWrapperResourceList{
1628-
Items: []arbv1.AppWrapperResource{
1619+
GenericItems: []arbv1.AppWrapperGenericResource{
16291620
{
16301621
ObjectMeta: metav1.ObjectMeta{
16311622
Name: fmt.Sprintf("%s-%s", name, "item1"),
16321623
Namespace: context.namespace,
16331624
},
1634-
Replicas: 1,
1635-
Type: arbv1.ResourceTypeDeployment,
1636-
Template: runtime.RawExtension{
1625+
DesiredAvailable: 1,
1626+
GenericTemplate: runtime.RawExtension{
16371627
Raw: rb,
16381628
},
16391629
},
@@ -2690,11 +2680,10 @@ func createNamespaceAW(context *context, name string) *arbv1.AppWrapper {
26902680
MinAvailable: schedSpecMin,
26912681
},
26922682
AggrResources: arbv1.AppWrapperResourceList{
2693-
Items: []arbv1.AppWrapperResource{
2683+
GenericItems: []arbv1.AppWrapperGenericResource{
26942684
{
2695-
Replicas: 1,
2696-
Type: arbv1.ResourceTypeNamespace,
2697-
Template: runtime.RawExtension{
2685+
DesiredAvailable: 1,
2686+
GenericTemplate: runtime.RawExtension{
26982687
Raw: rb,
26992688
},
27002689
},
@@ -2801,15 +2790,14 @@ func createStatefulSetAW(context *context, name string) *arbv1.AppWrapper {
28012790
MinAvailable: schedSpecMin,
28022791
},
28032792
AggrResources: arbv1.AppWrapperResourceList{
2804-
Items: []arbv1.AppWrapperResource{
2793+
GenericItems: []arbv1.AppWrapperGenericResource{
28052794
{
28062795
ObjectMeta: metav1.ObjectMeta{
28072796
Name: fmt.Sprintf("%s-%s", name, "item1"),
28082797
Namespace: context.namespace,
28092798
},
2810-
Replicas: 1,
2811-
Type: arbv1.ResourceTypeStatefulSet,
2812-
Template: runtime.RawExtension{
2799+
DesiredAvailable: 1,
2800+
GenericTemplate: runtime.RawExtension{
28132801
Raw: rb,
28142802
},
28152803
},
@@ -2941,15 +2929,14 @@ func createBadPodTemplateAW(context *context, name string) *arbv1.AppWrapper {
29412929
MinAvailable: schedSpecMin,
29422930
},
29432931
AggrResources: arbv1.AppWrapperResourceList{
2944-
Items: []arbv1.AppWrapperResource{
2932+
GenericItems: []arbv1.AppWrapperGenericResource{
29452933
{
29462934
ObjectMeta: metav1.ObjectMeta{
29472935
Name: fmt.Sprintf("%s-%s", name, "item"),
29482936
Namespace: context.namespace,
29492937
},
2950-
Replicas: 2,
2951-
Type: arbv1.ResourceTypePod,
2952-
Template: runtime.RawExtension{
2938+
DesiredAvailable: 2,
2939+
GenericTemplate: runtime.RawExtension{
29532940
Raw: rb,
29542941
},
29552942
},
@@ -3008,15 +2995,14 @@ func createPodTemplateAW(context *context, name string) *arbv1.AppWrapper {
30082995
MinAvailable: schedSpecMin,
30092996
},
30102997
AggrResources: arbv1.AppWrapperResourceList{
3011-
Items: []arbv1.AppWrapperResource{
2998+
GenericItems: []arbv1.AppWrapperGenericResource{
30122999
{
30133000
ObjectMeta: metav1.ObjectMeta{
30143001
Name: fmt.Sprintf("%s-%s", name, "item"),
30153002
Namespace: context.namespace,
30163003
},
3017-
Replicas: 2,
3018-
Type: arbv1.ResourceTypePod,
3019-
Template: runtime.RawExtension{
3004+
DesiredAvailable: 2,
3005+
GenericTemplate: runtime.RawExtension{
30203006
Raw: rb,
30213007
},
30223008
},
@@ -3082,15 +3068,14 @@ func createPodCheckFailedStatusAW(context *context, name string) *arbv1.AppWrapp
30823068
MinAvailable: schedSpecMin,
30833069
},
30843070
AggrResources: arbv1.AppWrapperResourceList{
3085-
Items: []arbv1.AppWrapperResource{
3071+
GenericItems: []arbv1.AppWrapperGenericResource{
30863072
{
30873073
ObjectMeta: metav1.ObjectMeta{
30883074
Name: fmt.Sprintf("%s-%s", name, "item"),
30893075
Namespace: context.namespace,
30903076
},
3091-
Replicas: 1,
3092-
Type: arbv1.ResourceTypePod,
3093-
Template: runtime.RawExtension{
3077+
DesiredAvailable: 1,
3078+
GenericTemplate: runtime.RawExtension{
30943079
Raw: rb,
30953080
},
30963081
},

0 commit comments

Comments
 (0)