Skip to content

[WIP] Move cluster assignment from status to spec #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cwiklik wants to merge 20 commits into
base: release-v1.31.0
Choose a base branch
from
Open

[WIP] Move cluster assignment from status to spec #643

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
87a1201
using 1.32.0 tag
Aug 15, 2023
7715679
Added stanze def. for clusterscheduling.
dmatch01 Aug 16, 2023
bcd4127
Added and fixed example.
dmatch01 Aug 16, 2023
f8c7031
Added api field for targetClusterName
dmatch01 Aug 22, 2023
85ab98b
Merge pull request #2 from cwiklik/mcad-v131-add-cluster-status-field
dmatch01 Aug 22, 2023
0afc21f
added support for setting targetClusterName in status
Aug 24, 2023
0cbb7fb
added support to set target cluster id and delete appwrapper when no …
Aug 24, 2023
9e1821a
fixed assignment for targetClusterName and modified cleanup()
Aug 24, 2023
40b121f
modified helm related resources to support new option externalDispatch
Aug 24, 2023
7d97f3e
fixed wrong assignment of targetClusterName
Aug 25, 2023
fd0d436
more fixes to support setting targetClusterName
Aug 25, 2023
0976f11
Merge pull request #3 from cwiklik/set-targetClusterName-in-spec
cwiklik Aug 26, 2023
e972e07
fixes supporting status
Aug 31, 2023
9f67d0f
add completion status to every item in a pipeline
Sep 6, 2023
0bbda5a
simplified implementation of gvk in completion status for each item i…
Sep 7, 2023
c795e2a
redone gvk. Modified dispatcher so that it handled job completion status
Sep 8, 2023
bc0966d
add new status-check test suite
Sep 17, 2023
f3aea37
moved cluster assignment to spec
Sep 18, 2023
c192f7e
added clusterDecision to appwrappers crd
Sep 19, 2023
4d7ab51
added TODO
Sep 24, 2023
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
Prev Previous commit
Next Next commit
added clusterDecision to appwrappers crd
  • Loading branch information
Jaroslaw Cwiklik committed Sep 19, 2023
commit c192f7ef5620790a335cf40742442f9f7b3d371b
27 changes: 27 additions & 0 deletions config/crd/bases/mcad.ibm.com_appwrappers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,33 @@ spec:
are ANDed.
type: object
type: object
policyResult:
properties:
policySource:
items:
properties:
lastUpdateMicroTime:
description: The latest time this condition was updated.
format: date-time
type: string
message:
description: A human readable message indicating details
about the cluster decision.
type: string
name:
description: ID/Name of the policy decision maker. Most
often this will be MCAD but design can support alternatives
type: string
type: object
type: array
targetCluster:
properties:
name:
type: string
required:
- name
type: object
type: object
type: object
dispatchDuration:
description: Wall clock duration time of appwrapper in seconds
Expand Down
27 changes: 27 additions & 0 deletions deployment/mcad-controller/crds/mcad.ibm.com_appwrappers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,33 @@ spec:
are ANDed.
type: object
type: object
policyResult:
properties:
policySource:
items:
properties:
lastUpdateMicroTime:
description: The latest time this condition was updated.
format: date-time
type: string
message:
description: A human readable message indicating details
about the cluster decision.
type: string
name:
description: ID/Name of the policy decision maker. Most
often this will be MCAD but design can support alternatives
type: string
type: object
type: array
targetCluster:
properties:
name:
type: string
required:
- name
type: object
type: object
type: object
dispatchDuration:
description: Wall clock duration time of appwrapper in seconds
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/queuejob/queuejob_controller_ex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2258,7 +2258,8 @@ func (cc *XController) manageQueueJob(qj *arbv1.AppWrapper, podPhaseChanges bool
return nil
}

if qj.Status.CanRun && !qj.Status.IsDispatched { //&& qj.Status.State != arbv1.AppWrapperStateCompleted {
if qj.Status.CanRun && !qj.Status.IsDispatched {

if klog.V(10).Enabled() {
current_time := time.Now()
klog.V(10).Infof("[worker-manageQJ] XQJ %s has Overhead Before Dispatching: %s", qj.Name, current_time.Sub(qj.CreationTimestamp.Time))
Expand Down Expand Up @@ -2294,15 +2295,14 @@ func (cc *XController) manageQueueJob(qj *arbv1.AppWrapper, podPhaseChanges bool
klog.V(10).Infof("[Dispatcher Controller] XQJ %s has Overhead After Dispatching: %s", qj.Name, current_time.Sub(qj.CreationTimestamp.Time))
klog.V(10).Infof("[TTime] %s, %s: WorkerAfterDispatch", qj.Name, time.Now().Sub(qj.CreationTimestamp.Time))
}

if _, err := cc.arbclients.ArbV1().AppWrappers(qj.Namespace).Update(qj); err != nil {
klog.Errorf("Failed to update status of AppWrapper %v/%v: %v",
qj.Namespace, qj.Name, err)
return err
}
klog.V(10).Infof("[Dispatcher Controller] Update Successfull - AppWrapper %s .", qj.Name)
klog.V(10).Infof("[Dispatcher Controller] Update Successfull - AppWrapper %s .", qj.Name)
}

}
return err
}
Expand Down