Merge branch 'hotfix/2.0.14_1'

EOEPCA · Apr 26, 2023 · 7c71822 · 7c71822
2 parents 7f6c988 + ee9a6d3
commit 7c71822
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/charts/ades/files/main.cfg.tpl b/charts/ades/files/main.cfg.tpl
@@ -75,7 +75,7 @@ resourceManagerWorkspacePrefix= {{ .Values.workflowExecutor.resourceManagerWorks
 [eoepca]
 owsparser=/opt/t2libs/libeoepcaows.so
 buildPath=/opt/t2template/
-usernameJwtJsonPath="pct_claims.user_name"
+usernameJwtJsonPath={{ .Values.workflowExecutor.usernameJwtJsonPath }}
 WorkflowExecutorHost=http://localhost:8000
 WorkflowExecutorConfig=/opt/t2config/workflowwxecutorconfig.json
 libWorkflowExecutor=/opt/t2service/libworkflow_executor.so

diff --git a/charts/ades/values.yaml b/charts/ades/values.yaml
@@ -353,6 +353,8 @@ workflowExecutor:
   errorMessages:
     "Job has reached the specified backoff limit": "Unexpected application error occurred. ( namespace: $namespace , exit codes:  $steps_exit_codes )"
 
+  usernameJwtJsonPath: "pct_claims.user_name"
+
 wps:
   pepBaseUrl: "https://pep.eoepca.terradue.com"
   pepClientStatePath: "/opt/zooservices_user/pepclient"