From 354203015bfe6d65bbf181372fa76b218e12f839 Mon Sep 17 00:00:00 2001
From: eugenejahn <eugenejahnjahn@gmail.com>
Date: Wed, 13 Apr 2022 07:53:30 -0700
Subject: [PATCH 1/2] fix: service account is not properly propagated from the
 execution info

Signed-off-by: eugenejahn <eugenejahnjahn@gmail.com>
---
 .../Executions/ExecutionDetails/ExecutionMetadataExtra.tsx  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/Executions/ExecutionDetails/ExecutionMetadataExtra.tsx b/src/components/Executions/ExecutionDetails/ExecutionMetadataExtra.tsx
index f54c0be6f..da578b0c8 100644
--- a/src/components/Executions/ExecutionDetails/ExecutionMetadataExtra.tsx
+++ b/src/components/Executions/ExecutionDetails/ExecutionMetadataExtra.tsx
@@ -39,6 +39,7 @@ export const ExecutionMetadataExtra: React.FC<{
     maxParallelism,
     rawOutputDataConfig,
     authRole,
+    securityContext,
   } = execution.spec;
 
   const [launchPlanSpec, setLaunchPlanSpec] = React.useState<Partial<LaunchPlanSpec>>({});
@@ -54,7 +55,10 @@ export const ExecutionMetadataExtra: React.FC<{
     },
     {
       label: ExecutionMetadataLabels.serviceAccount,
-      value: authRole?.kubernetesServiceAccount || ExecutionMetadataLabels.securityContextDefault,
+      value:
+        authRole?.kubernetesServiceAccount ||
+        securityContext?.runAs?.k8sServiceAccount ||
+        ExecutionMetadataLabels.securityContextDefault,
     },
     {
       label: ExecutionMetadataLabels.rawOutputPrefix,

From 9d1e7d66833334b24a56718a1c364a8769ed7f38 Mon Sep 17 00:00:00 2001
From: eugenejahn <eugenejahnjahn@gmail.com>
Date: Wed, 13 Apr 2022 09:48:42 -0700
Subject: [PATCH 2/2] fix: service account is not properly propagated from 
 execution info v2

Signed-off-by: eugenejahn <eugenejahnjahn@gmail.com>
---
 .../Executions/ExecutionDetails/ExecutionMetadataExtra.tsx | 7 ++-----
 src/models/Execution/api.ts                                | 4 ----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/components/Executions/ExecutionDetails/ExecutionMetadataExtra.tsx b/src/components/Executions/ExecutionDetails/ExecutionMetadataExtra.tsx
index da578b0c8..8ff819ffd 100644
--- a/src/components/Executions/ExecutionDetails/ExecutionMetadataExtra.tsx
+++ b/src/components/Executions/ExecutionDetails/ExecutionMetadataExtra.tsx
@@ -38,7 +38,6 @@ export const ExecutionMetadataExtra: React.FC<{
     launchPlan: launchPlanId,
     maxParallelism,
     rawOutputDataConfig,
-    authRole,
     securityContext,
   } = execution.spec;
 
@@ -51,14 +50,12 @@ export const ExecutionMetadataExtra: React.FC<{
   const details: DetailItem[] = [
     {
       label: ExecutionMetadataLabels.iam,
-      value: authRole?.assumableIamRole || ExecutionMetadataLabels.securityContextDefault,
+      value: securityContext?.runAs?.iamRole || ExecutionMetadataLabels.securityContextDefault,
     },
     {
       label: ExecutionMetadataLabels.serviceAccount,
       value:
-        authRole?.kubernetesServiceAccount ||
-        securityContext?.runAs?.k8sServiceAccount ||
-        ExecutionMetadataLabels.securityContextDefault,
+        securityContext?.runAs?.k8sServiceAccount || ExecutionMetadataLabels.securityContextDefault,
     },
     {
       label: ExecutionMetadataLabels.rawOutputPrefix,
diff --git a/src/models/Execution/api.ts b/src/models/Execution/api.ts
index 15498f494..d2aeed60e 100644
--- a/src/models/Execution/api.ts
+++ b/src/models/Execution/api.ts
@@ -122,10 +122,6 @@ export const createWorkflowExecution = (
     annotations,
   };
 
-  if (authRole?.assumableIamRole || authRole?.kubernetesServiceAccount) {
-    spec.authRole = authRole;
-  }
-
   if (securityContext?.runAs?.iamRole || securityContext?.runAs?.k8sServiceAccount) {
     spec.securityContext = securityContext;
   }