Skip to content

Commit 8fea6df

Browse files
anishasthanaopenshift-merge-robot
authored andcommitted
MCAD CRD sync 04/20/2023
Signed-off-by: Anish Asthana <anishasthana1@gmail.com>
1 parent 5764181 commit 8fea6df

File tree

3 files changed

+180
-110
lines changed

3 files changed

+180
-110
lines changed

bundle/manifests/mcad.ibm.com_appwrappers.yaml

Lines changed: 89 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
2+
---
13
apiVersion: apiextensions.k8s.io/v1
24
kind: CustomResourceDefinition
35
metadata:
@@ -59,21 +61,13 @@ spec:
5961
reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
6062
type: string
6163
completionstatus:
62-
description: Optional field that drives completion status
63-
of appwrapper. This field within an item of an appwrapper
64-
determines the full state of appwrapper. The completionstatus
65-
field contains a list of conditions that make the associate
66-
item considered completed, for instance :- completion
67-
conditions could be "Complete" or "Failed". The associated
68-
item's level .status.conditions[].type field is monitored
69-
for any one of these conditions. Once all items with
70-
this option is set and the conditionstatus is met the
71-
entire appwrapper state will be changed to one of the
72-
valid appwrapper completion state. Note :- this is an
73-
AND operation for all items where this option is set. See
74-
the list of appwrapper states for a list of valid complete
75-
states.
76-
type: string
64+
description: Optional field that drives completion status of appwrapper.
65+
This field within an item of an appwrapper determines the full state of appwrapper.
66+
The completionstatus field contains a list of conditions that make the associate item considered
67+
completed, for instance :- completion conditions could be "Complete" or "Failed".
68+
The associated item's level .status.conditions[].type field is monitored for any one of these conditions. Once all items with this
69+
option is set and the conditionstatus is met the entire appwrapper state will be changed to one of the valid appwrapper completion state. Note :- this is an AND
70+
operation for all items where this option is set. See the list of appwrapper states for a list of valid complete states.
7771
custompodresources:
7872
description: Optional section that specifies resource requirements
7973
for non-standard k8s resources, follows same format as
@@ -259,36 +253,65 @@ spec:
259253
type: object
260254
type: object
261255
schedulingSpec:
262-
description: SchedSpec specifies the parameters for scheduling.
256+
description: Field 'schedulingSpec' specifies the parameters used for scheduling generic items
257+
wrapped inside AppWrappers. It defines the policy for requeuing jobs based on the number
258+
of running pods.
263259
properties:
264260
minAvailable:
261+
description: Expected number of pods in running and/or completed state. Requeuing is triggered
262+
when the number of running/completed pods is not equal to this value. When not specified,
263+
requeuing is disabled and no check is performed.
265264
type: integer
266-
nodeSelector:
267-
additionalProperties:
268-
type: string
269-
type: object
270265
requeuing:
271-
description: Specification of the requeuing strategy based on
272-
waiting time
266+
description: Specification of the requeuing strategy based on waiting time. Values in this field
267+
control how often the pod check should happen and if requeuing has reached its maximum number of
268+
times.
273269
properties:
274-
growthType:
275-
default: exponential
276-
type: string
277270
initialTimeInSeconds:
271+
description: Value to keep track of the initial wait time. Users cannot set this as it is
272+
taken from 'timeInSeconds'.
278273
type: integer
279-
maxNumRequeuings:
280-
default: 0
274+
timeInSeconds:
275+
description: Initial waiting time before requeuing conditions are checked. This value is
276+
specified by the user, but it may grow as requeuing events happen.
281277
type: integer
278+
default: 300
282279
maxTimeInSeconds:
283-
default: 0
280+
description: Maximum waiting time for requeuing checks
284281
type: integer
282+
default: 0
283+
growthType:
284+
description: Growth strategy to increase the waiting time between requeuing checks. The values
285+
available are 'exponential', 'linear', or 'none'. For example, 'exponential' growth would
286+
double the 'timeInSeconds' value every time a requeuing event is triggered. If the string value
287+
is misspelled or not one of the possible options, the growth behavior is defaulted to 'none'.
288+
type: string
289+
default: "exponential"
285290
numRequeuings:
291+
description: Field to keep track of how many times a requeuing event has been triggered
292+
type: integer
286293
default: 0
294+
maxNumRequeuings:
295+
description: Maximum number of requeuing events allowed. Once this value is reached (e.g.,
296+
'numRequeuings = maxNumRequeuings', no more requeuing checks are performed and the generic
297+
items are stopped and removed from the cluster (AppWrapper remains deployed).
287298
type: integer
288-
timeInSeconds:
289-
default: 300
299+
default: 0
300+
type: object
301+
dispatchDuration:
302+
description: Wall clock duration time of appwrapper in seconds
303+
properties:
304+
expected:
305+
format: int32
306+
type: integer
307+
limit:
308+
format: int32
290309
type: integer
291310
type: object
311+
nodeSelector:
312+
additionalProperties:
313+
type: string
314+
type: object
292315
type: object
293316
selector:
294317
description: A label selector is a label query over a set of resources.
@@ -706,62 +729,38 @@ spec:
706729
- type
707730
type: object
708731
type: array
709-
controllerfirsttimestamp:
710-
description: Microsecond level timestamp when controller first sees
711-
QueueJob (by Informer)
712-
format: date-time
713-
type: string
714-
failed:
715-
description: The number of resources which reached phase Failed.
716-
format: int32
717-
type: integer
718-
filterignore:
719-
description: Tell Informer to ignore this update message (do not generate
720-
a controller event)
721-
type: boolean
722-
isdispatched:
723-
description: Is Dispatched?
724-
type: boolean
725-
local:
726-
description: Indicate if message is a duplicate (for Informer to recognize
727-
duplicate messages)
728-
type: boolean
729-
message:
730-
type: string
731-
pending:
732-
description: The number of pending pods.
733-
format: int32
734-
type: integer
735732
pendingpodconditions:
736733
description: Represent conditions of pod(s) that failed scheduling.
737734
items:
738735
description: Describes scheduling failed condition(s) of a pod
739736
properties:
737+
podname:
738+
description: Name of the pod
739+
type: string
740740
conditions:
741741
description: Failed condition(s) of a pod
742742
items:
743-
description: DeploymentCondition describes the state of a
744-
deployment at a certain point.
743+
description: DeploymentCondition describes the state of a deployment
744+
at a certain point.
745745
properties:
746746
LastProbeTime:
747-
description: Last time the condition transitioned from
748-
one status to another.
747+
description: Last time the condition transitioned from one status
748+
to another.
749749
format: date-time
750750
type: string
751751
LastTransitionTime:
752752
description: The last time this condition was updated.
753753
format: date-time
754754
type: string
755755
message:
756-
description: A human readable message indicating details
757-
about the transition.
756+
description: A human readable message indicating details about
757+
the transition.
758758
type: string
759759
reason:
760760
description: The reason for the condition's last transition.
761761
type: string
762762
status:
763-
description: Status of the condition, one of True, False,
764-
Unknown.
763+
description: Status of the condition, one of True, False, Unknown.
765764
type: string
766765
type:
767766
description: Type of appwrapper condition.
@@ -771,11 +770,34 @@ spec:
771770
- type
772771
type: object
773772
type: array
774-
podname:
775-
description: Name of the pod
776-
type: string
777773
type: object
778774
type: array
775+
controllerfirsttimestamp:
776+
description: Microsecond level timestamp when controller first sees
777+
QueueJob (by Informer)
778+
format: date-time
779+
type: string
780+
failed:
781+
description: The number of resources which reached phase Failed.
782+
format: int32
783+
type: integer
784+
filterignore:
785+
description: Tell Informer to ignore this update message (do not generate
786+
a controller event)
787+
type: boolean
788+
isdispatched:
789+
description: Is Dispatched?
790+
type: boolean
791+
local:
792+
description: Indicate if message is a duplicate (for Informer to recognize
793+
duplicate messages)
794+
type: boolean
795+
message:
796+
type: string
797+
pending:
798+
description: The number of pending pods.
799+
format: int32
800+
type: integer
779801
queuejobstate:
780802
description: State of QueueJob - Init, Queueing, HeadOfLine, Rejoining,
781803
...
@@ -805,9 +827,3 @@ spec:
805827
type: object
806828
served: true
807829
storage: true
808-
status:
809-
acceptedNames:
810-
kind: ""
811-
plural: ""
812-
conditions: null
813-
storedVersions: null

bundle/manifests/mcad.ibm.com_queuejobs.yaml

Lines changed: 46 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
2+
---
13
apiVersion: apiextensions.k8s.io/v1
24
kind: CustomResourceDefinition
35
metadata:
@@ -37,36 +39,65 @@ spec:
3739
schedulerName:
3840
type: string
3941
schedulingSpec:
40-
description: SchedSpec specifies the parameters for scheduling.
42+
description: Field 'schedulingSpec' specifies the parameters used for scheduling generic items
43+
wrapped inside AppWrappers. It defines the policy for requeuing jobs based on the number
44+
of running pods.
4145
properties:
4246
minAvailable:
47+
description: Expected number of pods in running and/or completed state. Requeuing is triggered
48+
when the number of running/completed pods is not equal to this value. When not specified,
49+
requeuing is disabled and no check is performed.
4350
type: integer
44-
nodeSelector:
45-
additionalProperties:
46-
type: string
47-
type: object
4851
requeuing:
49-
description: Specification of the requeuing strategy based on
50-
waiting time
52+
description: Specification of the requeuing strategy based on waiting time. Values in this field
53+
control how often the pod check should happen and if requeuing has reached its maximum number of
54+
times.
5155
properties:
52-
growthType:
53-
default: exponential
54-
type: string
5556
initialTimeInSeconds:
57+
description: Value to keep track of the initial wait time. Users cannot set this as it is
58+
taken from 'timeInSeconds'.
5659
type: integer
57-
maxNumRequeuings:
58-
default: 0
60+
timeInSeconds:
61+
description: Initial waiting time before requeuing conditions are checked. This value is
62+
specified by the user, but it may grow as requeuing events happen.
5963
type: integer
64+
default: 300
6065
maxTimeInSeconds:
61-
default: 0
66+
description: Maximum waiting time for requeuing checks
6267
type: integer
68+
default: 0
69+
growthType:
70+
description: Growth strategy to increase the waiting time between requeuing checks. The values
71+
available are 'exponential', 'linear', or 'none'. For example, 'exponential' growth would
72+
double the 'timeInSeconds' value every time a requeuing event is triggered. If the string value
73+
is misspelled or not one of the possible options, the growth behavior is defaulted to 'none'.
74+
type: string
75+
default: "exponential"
6376
numRequeuings:
77+
description: Field to keep track of how many times a requeuing event has been triggered
78+
type: integer
6479
default: 0
80+
maxNumRequeuings:
81+
description: Maximum number of requeuing events allowed. Once this value is reached (e.g.,
82+
'numRequeuings = maxNumRequeuings', no more requeuing checks are performed and the generic
83+
items are stopped and removed from the cluster (AppWrapper remains deployed).
6584
type: integer
66-
timeInSeconds:
67-
default: 300
85+
default: 0
86+
type: object
87+
dispatchDuration:
88+
description: Wall clock duration time of appwrapper in seconds
89+
properties:
90+
expected:
91+
format: int32
92+
type: integer
93+
limit:
94+
format: int32
6895
type: integer
6996
type: object
97+
nodeSelector:
98+
additionalProperties:
99+
type: string
100+
type: object
70101
type: object
71102
taskSpecs:
72103
description: TaskSpecs specifies the task specification of QueueJob
@@ -6839,9 +6870,3 @@ spec:
68396870
type: object
68406871
served: true
68416872
storage: true
6842-
status:
6843-
acceptedNames:
6844-
kind: ""
6845-
plural: ""
6846-
conditions: null
6847-
storedVersions: null

0 commit comments

Comments
 (0)