fix for running argo

Signed-off-by: Neil South <[email protected]>
Project-MONAI · Sep 6, 2022 · a6ad884 · a6ad884
1 parent 87b6529
commit a6ad884
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -577,3 +577,5 @@ GitExtensions.settings.backup
 *.AssemblyHooks.vb
 /src/WorkflowManager/mc.exe
 *.lutconfig
+/src/TaskManager/TaskManager/Properties/launchSettings.json
+/src/WorkflowManager/WorkflowManager/Properties/launchSettings.json
diff --git a/deploy/helm/MTM.yaml b/deploy/helm/MTM.yaml
@@ -17,7 +17,7 @@ replicaCount: 1
 image:
   repository: registry.gitlab.com/answerdigital/londonai/aide/workflow-manager-images/task-manager
   pullPolicy: IfNotPresent
-  tag: 2022-08-22-02
+  tag: 2022-09-05-01
 
 imagePullSecrets:
  - name: gitlab-image-pull
@@ -29,6 +29,7 @@ enviromentVariables:
   WorkflowManager__storage__settings__executableLocation: "mc"
   WorkflowManager__messaging__publisherSettings__endpoint: "rabbitmq.monai"
   WorkflowManager__messaging__subscriberSettings__endpoint: "rabbitmq.monai"
+  WorkloadManagerDatabase__ConnectionString: "mongodb://root:[email protected]:27017"
 
 enviromentVariablesFromSecrets:
   secrets:
@@ -49,6 +50,16 @@ service:
   type: ClusterIP
   port: 5000
 
+serviceAccount:
+  create: true
+  name: mtm
+  namespace: monai
+  clusterrole:
+    name: clusterrole-taskmanager-argo-secret-master
+    rules:
+      apiGroups: [""]
+      resources: ["secrets"]
+      verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
 
 
 
diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs
@@ -486,6 +486,21 @@ private async Task CopyWorkflowTemplateToWorkflow(WorkflowTemplate workflowTempl
 
             await CopyTemplateSteps(template.Steps, workflowTemplate, name, workflow, cancellationToken).ConfigureAwait(false);
             await CopyTemplateDags(template.Dag, workflowTemplate, name, workflow, cancellationToken).ConfigureAwait(false);
+            CopyImagePullSecrets(workflowTemplate, workflow);
+        }
+
+        private void CopyImagePullSecrets(WorkflowTemplate workflowTemplate, Workflow workflow)
+        {
+            Guard.Against.Null(workflowTemplate.Spec.ImagePullSecrets);
+
+            if (workflowTemplate.Spec.ImagePullSecrets.Any())
+            {
+                workflow.Spec.ImagePullSecrets = new List<LocalObjectReference>();
+                foreach (var secret in workflowTemplate.Spec.ImagePullSecrets)
+                {
+                    workflow.Spec.ImagePullSecrets.Add(secret);
+                }
+            }
         }
 
         /// <summary>

diff --git a/src/TaskManager/TaskManager/appsettings.Local.json b/src/TaskManager/TaskManager/appsettings.Local.json
@@ -1,6 +1,6 @@
 {
   "WorkloadManagerDatabase": {
-    "ConnectionString": "mongodb://root:rootpassword@localhost:27017",
+    "ConnectionString": "mongodb://root:rootpassword@localhost:30017",
     "DatabaseName": "WorkloadManager",
     "WorkflowCollectionName": "Workflows",
     "WorkflowInstanceCollectionName": "WorkflowInstances",

diff --git a/src/WorkflowManager/WorkflowManager/appsettings.Local.json b/src/WorkflowManager/WorkflowManager/appsettings.Local.json
@@ -1,6 +1,6 @@
 {
   "WorkloadManagerDatabase": {
-    "ConnectionString": "mongodb://root:rootpassword@localhost:27017",
+    "ConnectionString": "mongodb://root:rootpassword@localhost:30017",
     "DatabaseName": "WorkloadManager",
     "WorkflowCollectionName": "Workflows",
     "WorkflowInstanceCollectionName": "WorkflowInstances",