Skip to content

Commit 7970bed

Browse files
dgrove-ossdgrove-oss
committed
prune mocked appwrappers
1 parent 26e0da9 commit 7970bed

File tree

4 files changed

+0
-164
lines changed

4 files changed

+0
-164
lines changed

‎src/codeflare_sdk/templates/base-template.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ metadata:
55
namespace: default
66
spec:
77
resources:
8-
Items: []
98
GenericItems:
109
- replicas: 1
1110
generictemplate:

‎tests/test-case.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -160,4 +160,3 @@ spec:
160160
optional: true
161161
name: odh-ca-cert
162162
replicas: 1
163-
Items: []

‎tests/test-default-appwrapper.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,3 @@ spec:
158158
optional: true
159159
name: odh-ca-cert
160160
replicas: 1
161-
Items: []

‎tests/unit_test.py

-161
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,6 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
963963
"creationTimestamp": "2024-03-05T09:55:37Z",
964964
"generation": 1,
965965
"labels": {
966-
"appwrapper.mcad.ibm.com": "quicktest",
967966
"controller-tools.k8s.io": "1.0",
968967
"resourceName": "quicktest",
969968
"workload.codeflare.dev/appwrapper": "quicktest",
@@ -1278,93 +1277,6 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
12781277
"resourceName": "quicktest2",
12791278
"orderedinstance": "m4.xlarge_g4dn.xlarge",
12801279
},
1281-
"managedFields": [
1282-
{
1283-
"apiVersion": "ray.io/v1",
1284-
"fieldsType": "FieldsV1",
1285-
"fieldsV1": {
1286-
"f:metadata": {
1287-
"f:labels": {
1288-
".": {},
1289-
"f:workload.codeflare.dev/appwrapper": {},
1290-
"f:controller-tools.k8s.io": {},
1291-
"f:resourceName": {},
1292-
},
1293-
"f:ownerReferences": {
1294-
".": {},
1295-
'k:{"uid":"6334fc1b-471e-4876-8e7b-0b2277679235"}': {},
1296-
},
1297-
},
1298-
"f:spec": {
1299-
".": {},
1300-
"f:autoscalerOptions": {
1301-
".": {},
1302-
"f:idleTimeoutSeconds": {},
1303-
"f:imagePullPolicy": {},
1304-
"f:resources": {
1305-
".": {},
1306-
"f:limits": {
1307-
".": {},
1308-
"f:cpu": {},
1309-
"f:memory": {},
1310-
},
1311-
"f:requests": {
1312-
".": {},
1313-
"f:cpu": {},
1314-
"f:memory": {},
1315-
},
1316-
},
1317-
"f:upscalingMode": {},
1318-
},
1319-
"f:enableInTreeAutoscaling": {},
1320-
"f:headGroupSpec": {
1321-
".": {},
1322-
"f:rayStartParams": {
1323-
".": {},
1324-
"f:block": {},
1325-
"f:dashboard-host": {},
1326-
"f:num-gpus": {},
1327-
},
1328-
"f:serviceType": {},
1329-
"f:template": {
1330-
".": {},
1331-
"f:spec": {".": {}, "f:containers": {}},
1332-
},
1333-
},
1334-
"f:rayVersion": {},
1335-
"f:workerGroupSpecs": {},
1336-
},
1337-
},
1338-
"manager": "mcad-controller",
1339-
"operation": "Update",
1340-
"time": "2023-02-22T16:26:07Z",
1341-
},
1342-
{
1343-
"apiVersion": "ray.io/v1",
1344-
"fieldsType": "FieldsV1",
1345-
"fieldsV1": {
1346-
"f:status": {
1347-
".": {},
1348-
"f:availableWorkerReplicas": {},
1349-
"f:desiredWorkerReplicas": {},
1350-
"f:endpoints": {
1351-
".": {},
1352-
"f:client": {},
1353-
"f:dashboard": {},
1354-
"f:gcs": {},
1355-
},
1356-
"f:lastUpdateTime": {},
1357-
"f:maxWorkerReplicas": {},
1358-
"f:minWorkerReplicas": {},
1359-
"f:state": {},
1360-
}
1361-
},
1362-
"manager": "manager",
1363-
"operation": "Update",
1364-
"subresource": "status",
1365-
"time": "2023-02-22T16:26:16Z",
1366-
},
1367-
],
13681280
"name": "quicktest2",
13691281
"namespace": "ns",
13701282
"ownerReferences": [
@@ -1546,7 +1458,6 @@ def get_aw_obj(group, version, namespace, plural):
15461458
"resources": {
15471459
"GenericItems": [
15481460
{
1549-
"allocated": 0,
15501461
"generictemplate": {
15511462
"apiVersion": "ray.io/v1",
15521463
"kind": "RayCluster",
@@ -1694,12 +1605,9 @@ def get_aw_obj(group, version, namespace, plural):
16941605
},
16951606
},
16961607
"metadata": {},
1697-
"priority": 0,
1698-
"priorityslope": 0,
16991608
"replicas": 1,
17001609
},
17011610
{
1702-
"allocated": 0,
17031611
"generictemplate": {
17041612
"apiVersion": "networking.k8s.io/v1",
17051613
"kind": "Ingress",
@@ -1734,46 +1642,13 @@ def get_aw_obj(group, version, namespace, plural):
17341642
},
17351643
},
17361644
"metadata": {},
1737-
"priority": 0,
1738-
"priorityslope": 0,
17391645
},
17401646
],
1741-
"Items": [],
17421647
"metadata": {},
17431648
},
1744-
"schedulingSpec": {},
1745-
"service": {"spec": {}},
17461649
},
17471650
"status": {
1748-
"canrun": True,
1749-
"conditions": [
1750-
{
1751-
"lastTransitionMicroTime": "2023-02-22T16:26:07.559447Z",
1752-
"lastUpdateMicroTime": "2023-02-22T16:26:07.559447Z",
1753-
"status": "True",
1754-
"type": "Init",
1755-
},
1756-
{
1757-
"lastTransitionMicroTime": "2023-02-22T16:26:07.559551Z",
1758-
"lastUpdateMicroTime": "2023-02-22T16:26:07.559551Z",
1759-
"reason": "AwaitingHeadOfLine",
1760-
"status": "True",
1761-
"type": "Queueing",
1762-
},
1763-
{
1764-
"lastTransitionMicroTime": "2023-02-22T16:26:13.220564Z",
1765-
"lastUpdateMicroTime": "2023-02-22T16:26:13.220564Z",
1766-
"reason": "AppWrapperRunnable",
1767-
"status": "True",
1768-
"type": "Dispatched",
1769-
},
1770-
],
1771-
"controllerfirsttimestamp": "2023-02-22T16:26:07.559447Z",
1772-
"filterignore": True,
1773-
"queuejobstate": "Dispatched",
1774-
"sender": "before manageQueueJob - afterEtcdDispatching",
17751651
"state": "Running",
1776-
"systempriority": 9,
17771652
},
17781653
},
17791654
{
@@ -1787,7 +1662,6 @@ def get_aw_obj(group, version, namespace, plural):
17871662
"resources": {
17881663
"GenericItems": [
17891664
{
1790-
"allocated": 0,
17911665
"generictemplate": {
17921666
"apiVersion": "ray.io/v1",
17931667
"kind": "RayCluster",
@@ -1935,8 +1809,6 @@ def get_aw_obj(group, version, namespace, plural):
19351809
},
19361810
},
19371811
"metadata": {},
1938-
"priority": 0,
1939-
"priorityslope": 0,
19401812
"replicas": 1,
19411813
},
19421814
{
@@ -1960,46 +1832,13 @@ def get_aw_obj(group, version, namespace, plural):
19601832
},
19611833
},
19621834
"metadata": {},
1963-
"priority": 0,
1964-
"priorityslope": 0,
19651835
},
19661836
],
1967-
"Items": [],
19681837
"metadata": {},
19691838
},
1970-
"schedulingSpec": {},
1971-
"service": {"spec": {}},
19721839
},
19731840
"status": {
1974-
"canrun": True,
1975-
"conditions": [
1976-
{
1977-
"lastTransitionMicroTime": "2023-02-22T16:26:07.559447Z",
1978-
"lastUpdateMicroTime": "2023-02-22T16:26:07.559447Z",
1979-
"status": "True",
1980-
"type": "Init",
1981-
},
1982-
{
1983-
"lastTransitionMicroTime": "2023-02-22T16:26:07.559551Z",
1984-
"lastUpdateMicroTime": "2023-02-22T16:26:07.559551Z",
1985-
"reason": "AwaitingHeadOfLine",
1986-
"status": "True",
1987-
"type": "Queueing",
1988-
},
1989-
{
1990-
"lastTransitionMicroTime": "2023-02-22T16:26:13.220564Z",
1991-
"lastUpdateMicroTime": "2023-02-22T16:26:13.220564Z",
1992-
"reason": "AppWrapperRunnable",
1993-
"status": "True",
1994-
"type": "Dispatched",
1995-
},
1996-
],
1997-
"controllerfirsttimestamp": "2023-02-22T16:26:07.559447Z",
1998-
"filterignore": True,
1999-
"queuejobstate": "Dispatched",
2000-
"sender": "before manageQueueJob - afterEtcdDispatching",
20011841
"state": "Suspended",
2002-
"systempriority": 9,
20031842
},
20041843
},
20051844
]

0 commit comments

Comments
 (0)