added support for setting targetClusterName in status #3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dmatch01
requested changes
Aug 24, 2023
Comment on lines
1027
to
1028
| //qj.Status.TargetClusterName = | ||
| //qj.Status.TargetClusterName = clusterList[rand.Int()%len(clusterList)].Name |
There was a problem hiding this comment.
Please delete at your convenience.
| cc.agentMap[agentId].CreateJob(qj) | ||
| qj.Status.IsDispatched = true | ||
| } else { | ||
| klog.Errorf("[Dispatcher Controller] AppWrapper %s not found in dispatcher mapping.", qj.Name) |
There was a problem hiding this comment.
Can you pull this out and Error off in both configurations?
| qj.Status.IsDispatched = true | ||
| } else { | ||
| klog.Errorf("[Dispatcher Controller] AppWrapper %s not found in dispatcher mapping.", qj.Name) | ||
| queuejobKey, _ := GetQueueJobKey(qj) | ||
| if agentId, ok := cc.dispatchMap[queuejobKey]; ok { |
There was a problem hiding this comment.
Can this be the first check before checking fo rexternalDispatch=true?
| cc.agentMap[obj].DeleteJob(appwrapper) | ||
|
|
||
| if cc.serverOption.ExternalDispatch { | ||
| if err := cc.arbclients.ArbV1().AppWrappers(appwrapper.Namespace).Delete(appwrapper.Name, &metav1.DeleteOptions{}); err != nil { |
There was a problem hiding this comment.
A delete is already issued when code reaches this point. There is no need to delete the AW again. Probably only need to remove it from the book-keeping memory objects.
dmatch01
reviewed
Aug 24, 2023
dmatch01
reviewed
Aug 24, 2023
| @@ -3,7 +3,7 @@ kind: ClusterServiceVersion | |||
| metadata: | |||
| annotations: | |||
| alm-examples: >- | |||
| [{"apiVersion":"mcad.ibm.com/v1beta1","kind":"MCADHelmConfig","metadata":{"name":"example-mcadhelmconfig"},"spec":{"configMap":{"agentConfigs":null,"dispatcherMode":"false","name":null},"deploymentName":"xqueuejob-controller","image":{"pullPolicy":"Always","repository":"darroyo/mcad-controller","tag":"v1.29.0"},"imagePullSecret":{"name":null,"password":"dummyvalue","registry":"registry.stage1.ng.bluemix.net","username":"iamapikey"},"loglevel":4,"namespace":"kube-system","nodeSelector":{"hostname":null},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"2048Mi"},"requests":{"cpu":"2000m","memory":"2048Mi"}},"serviceAccount":"xqueuejob-controller","volumes":{"hostPath":null}}}] | |||
| [{"apiVersion":"mcad.ibm.com/v1beta1","kind":"MCADHelmConfig","metadata":{"name":"example-mcadhelmconfig"},"spec":{"configMap":{"agentConfigs":null,"dispatcherMode":"false","externalDispatch":"false","name":null},"deploymentName":"xqueuejob-controller","image":{"pullPolicy":"Always","repository":"darroyo/mcad-controller","tag":"v1.29.0"},"imagePullSecret":{"name":null,"password":"dummyvalue","registry":"registry.stage1.ng.bluemix.net","username":"iamapikey"},"loglevel":4,"namespace":"kube-system","nodeSelector":{"hostname":null},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"2048Mi"},"requests":{"cpu":"2000m","memory":"2048Mi"}},"serviceAccount":"xqueuejob-controller","volumes":{"hostPath":null}}}] | |||
There was a problem hiding this comment.
This operator is deprecated but no need to undo.
dmatch01
approved these changes
Aug 26, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.