Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c59c47d
Added conditions to AppWrapper CRD.
dmatch01 Nov 12, 2020
9de4206
Reduced repeating conditions and coded reason for condition instead o…
dmatch01 Nov 13, 2020
6174473
Debugging statements.
dmatch01 Nov 13, 2020
d9450fa
Debugging statements.
dmatch01 Nov 13, 2020
1bd9095
Debugging statements.
dmatch01 Nov 13, 2020
0380c5c
Debugging statements.
dmatch01 Nov 13, 2020
a474ab5
Added additional debugging.
dmatch01 Nov 14, 2020
2d54f9b
Added additional debugging.
dmatch01 Nov 14, 2020
e5f3f76
Added additional debugging.
dmatch01 Nov 14, 2020
be348f0
Added additional debugging.
dmatch01 Nov 14, 2020
dc865d6
Added additional debugging.
dmatch01 Nov 14, 2020
4365053
Added additional debugging.
dmatch01 Nov 15, 2020
810e06e
Removedadditional debugging.
dmatch01 Nov 15, 2020
cc0b3de
Merge pull request #80 from dmatch01/master-add-conditions
dmatch01 Nov 15, 2020
40dfa3d
Merge from master with new condition code.
dmatch01 Nov 15, 2020
6a8bcca
Removed duplicate failure conditions.
dmatch01 Nov 15, 2020
e9a75bf
Removed extraneous files.
dmatch01 Nov 15, 2020
c4324a0
Merge branch 'master-remove-dup-conditions' into quota-management-add…
dmatch01 Nov 15, 2020
fc7313b
Added quota failure message to conditions.
dmatch01 Nov 16, 2020
a2f7e3f
Fix to refresh cache before updating backoff conditions.
dmatch01 Nov 16, 2020
bd5e584
Fixed etcd update to get latest object from cache before update.
dmatch01 Nov 16, 2020
2a4ae7e
Adjusted logging levels in cleanup to debugging level.
dmatch01 Nov 16, 2020
e03d4c1
Added additional time for initial test case to account for new condit…
dmatch01 Nov 16, 2020
3ef8fc7
Add logic to remove initial deletion of AW resources.
dmatch01 Nov 16, 2020
61026b3
Backout changes of added conditions for backoff.
dmatch01 Nov 16, 2020
b4007a3
Revert changes to test for 100 AWs.
dmatch01 Nov 16, 2020
d8b333e
Removed additional query to cache for updates to etcd.
dmatch01 Nov 16, 2020
cd2a1fc
Pad more time before cleanup of test case 100 AWs.
dmatch01 Nov 16, 2020
f8a26bc
Added non-cache status update to conditions.
dmatch01 Nov 16, 2020
66802c0
Added refresh of AW from cache before updating initial backoff condit…
dmatch01 Nov 16, 2020
c9379d0
Cleanup for add conditions branch.
dmatch01 Nov 16, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTROLLER_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.29.3
1.29.4
42 changes: 32 additions & 10 deletions pkg/apis/controller/v1alpha1/appwrapper.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ type AppWrapperStatus struct {
SystemPriority float64 `json:"systempriority,omitempty"`

// State of QueueJob - Init, Queueing, HeadOfLine, Rejoining, ...
QueueJobState QueueJobState `json:"queuejobstate,omitempty"`
QueueJobState AppWrapperConditionType `json:"queuejobstate,omitempty"`

// Microsecond level timestamp when controller first sees QueueJob (by Informer)
ControllerFirstTimestamp metav1.MicroTime `json:"controllerfirsttimestamp,omitempty"`
Expand All @@ -201,6 +201,10 @@ type AppWrapperStatus struct {

// Indicate if message is a duplicate (for Informer to recognize duplicate messages)
Local bool `json:"local,omitempty"`

// Represents the latest available observations of a appwrapper's current condition.
Conditions []AppWrapperCondition `json:"conditions,omitempty"`

}

type AppWrapperState string
Expand All @@ -213,15 +217,33 @@ const (
AppWrapperStateFailed AppWrapperState = "Failed"
)

type QueueJobState string
type AppWrapperConditionType string

const (
QueueJobStateInit QueueJobState = "Init"
QueueJobStateQueueing QueueJobState = "Queueing"
QueueJobStateHeadOfLine QueueJobState = "HeadOfLine"
QueueJobStateRejoining QueueJobState = "Rejoining"
QueueJobStateDispatched QueueJobState = "Dispatched"
QueueJobStateRunning QueueJobState = "Running"
QueueJobStateDeleted QueueJobState = "Deleted"
QueueJobStateFailed QueueJobState = "Failed"
AppWrapperCondInit AppWrapperConditionType = "Init"
AppWrapperCondQueueing AppWrapperConditionType = "Queueing"
AppWrapperCondHeadOfLine AppWrapperConditionType = "HeadOfLine"
AppWrapperCondBackoff AppWrapperConditionType = "Backoff"
AppWrapperCondDispatched AppWrapperConditionType = "Dispatched"
AppWrapperCondRunning AppWrapperConditionType = "Running"
AppWrapperCondPreemptCandidate AppWrapperConditionType = "PreemptCandidate"
AppWrapperCondPreempted AppWrapperConditionType = "Preempted"
AppWrapperCondDeleted AppWrapperConditionType = "Deleted"
AppWrapperCondFailed AppWrapperConditionType = "Failed"
)

// DeploymentCondition describes the state of a deployment at a certain point.
type AppWrapperCondition struct {
// Type of appwrapper condition.
Type AppWrapperConditionType `json:"type"`
// Status of the condition, one of True, False, Unknown.
Status v1.ConditionStatus `json:"status"`
// The last time this condition was updated.
LastUpdateMicroTime metav1.MicroTime `json:"lastUpdateMicroTime,omitempty"`
// Last time the condition transitioned from one status to another.
LastTransitionMicroTime metav1.MicroTime `json:"lastTransitionMicroTime,omitempty"`
// The reason for the condition's last transition.
Reason string `json:"reason,omitempty"`
// A human readable message indicating details about the transition.
Message string `json:"message,omitempty"`
}
25 changes: 25 additions & 0 deletions pkg/apis/controller/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading