Merge pull request #203 from uc-cdis/chore/improve_gen3workflow

Chore/improve gen3workflow

Author: nss10

.secrets.baseline

@@ -561,26 +561,12 @@
       }
     ],
     "devplanetv2/dev-environments/qa-midrc-helm/values/values.yaml": [
-      {
-        "type": "Secret Keyword",
-        "filename": "devplanetv2/dev-environments/qa-midrc-helm/values/values.yaml",
-        "hashed_secret": "616815fde63fa2944a80b81d2893ba18111f8e41",
-        "is_verified": false,
-        "line_number": 73
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "devplanetv2/dev-environments/qa-midrc-helm/values/values.yaml",
-        "hashed_secret": "bb158b7cc53704e5b23f5a37b6d0b50fd2835ead",
-        "is_verified": false,
-        "line_number": 74
-      },
       {
         "type": "Base64 High Entropy String",
         "filename": "devplanetv2/dev-environments/qa-midrc-helm/values/values.yaml",
         "hashed_secret": "d1a990c990a4bbb817f150f32b12bbb878752be8",
         "is_verified": false,
-        "line_number": 2228
+        "line_number": 2222
       }
     ],
     "devplanetv2/dev-environments/qa-vpodc-helm/values/values.yaml": [

devplanetv2/dev-environments/qa-midrc-helm/values.yaml

@@ -1,7 +1,7 @@
 name: qa-midrc-helm
 
 # What branch of helm -- http://github.com/uc-cdis/gen3-helm
-helmBranch: chore/add_gen3workflow
+helmBranch: chore/improve-gen3-workflow
 
 # What branch of gitops -- http://github.com/uc-cdis/gen3-gitops-dev
-gitopsBranch: chore/add_gen3workflow_qa_midrc
+gitopsBranch: chore/improve_gen3workflow

devplanetv2/dev-environments/qa-midrc-helm/values/values.yaml

@@ -86,18 +86,12 @@ gen3-workflow:
   enabled: true
   image:
     repository: 707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-workflow
-    tag: chore_create_iam_role_for_worker_pods
+    tag: master
   externalSecrets:
-    gen3workflowG3auto: "qa-midrc-test-gen3workflow-g3auto"
-    funnelOidcClient: "qa-midrc-test-funnel-oidc-client"
-  funnel:
-    Kubernetes:
-      Namespace: qa-midrc-helm
-      JobsNamespace: gen3-qa-midrc-helm-workflow-pods
-    Plugins:
-      Params:
-        S3Url: gen3-workflow-service.qa-midrc-helm.svc.cluster.local
-        OidcTokenUrl: https://qa-midrc.planx-pla.net/user
+    gen3workflowG3auto: "qa-midrc-helm-gen3workflow-g3auto"
+    funnelOidcClient: "qa-midrc-helm-funnel-oidc-client"
+  gen3WorkflowConfig:
+    taskImageWhitelist: ['*']
 global:
   crossplane:
     enabled: true