Changes in command help content for service acnts

cdapio · Nov 8, 2023 · f2391e0 · f2391e0
1 parent f72ff68
commit f2391e0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/app/cdap/components/NamespaceAdmin/ServiceAccounts/EditConfirmDialog.tsx b/app/cdap/components/NamespaceAdmin/ServiceAccounts/EditConfirmDialog.tsx
@@ -31,6 +31,7 @@ interface IEditConfirmDialogProps {
   isShow: boolean;
   closeFn: () => void;
   namespaceIdentity: string;
+  k8snamespace?: string;
 }
 
 const StyledTextField = styled(TextField)`
@@ -65,15 +66,19 @@ const getGcloudCommand = ({
   tenantProjectId = '${TENANT_PROJECT_ID}',
   identity = '${IDENTITY}',
   gsaEmail = '${GSA_EMAIL}',
+  gsaProjectId = '${GSA_PROJECT_ID}',
+  k8snamespace = 'default',
 }): string =>
-  `gcloud iam service-accounts add-iam-policy-binding --role roles/iam.workloadIdentityUser --member "serviceAccount:${tenantProjectId}.svc.id.goog[default/${identity}]" ${gsaEmail}`;
+  `gcloud iam service-accounts add-iam-policy-binding --role roles/iam.workloadIdentityUser --member "serviceAccount:${tenantProjectId}.svc.id.goog[${k8snamespace}/${identity}]" ${gsaEmail} --project ${gsaProjectId}`;
 
 export const EditConfirmDialog = ({
   selectedServiceAcccount,
   isShow,
   closeFn,
   namespaceIdentity,
+  k8snamespace,
 }: IEditConfirmDialogProps) => {
+  const namespacedCreationHookEnabled = window.CDAP_CONFIG.cdap.namespaceCreationHookEnabled;
   const [serviceAccountInputValue, setServiceAccountInputValue] = useState<string>(
     selectedServiceAcccount
   );
@@ -88,6 +93,7 @@ export const EditConfirmDialog = ({
   const gcloudCommandParams = {
     identity: namespaceIdentity || undefined,
     gsaEmail: serviceAccountInputValue || undefined,
+    k8snamespace: namespacedCreationHookEnabled ? k8snamespace : 'default',
   };
 
   const copyableExtendedMessage =

diff --git a/app/cdap/components/NamespaceAdmin/ServiceAccounts/index.tsx b/app/cdap/components/NamespaceAdmin/ServiceAccounts/index.tsx
@@ -36,7 +36,7 @@ const SubTitleBox = styled(Box)`
   margin-bottom: 15px;
 `;
 
-const ServiceAccountsView = ({ serviceAccounts, namespaceIdentity }) => {
+const ServiceAccountsView = ({ serviceAccounts, namespaceIdentity, k8snamespace }) => {
   const [showPopover, setShowPopover] = useState(false);
   const [selectedServiceAcccount, setSelectedServiceAcccount] = useState<string>('');
   const [isSaveDialogOpen, setSaveDialogOpen] = useState(false);
@@ -125,6 +125,7 @@ const ServiceAccountsView = ({ serviceAccounts, namespaceIdentity }) => {
           isShow={isSaveDialogOpen}
           closeFn={closeSaveDialog}
           namespaceIdentity={namespaceIdentity}
+          k8snamespace={k8snamespace}
         ></EditConfirmDialog>
       )}
     </div>
@@ -135,6 +136,7 @@ const mapStateToProps = (state) => {
   return {
     serviceAccounts: state.serviceAccounts,
     namespaceIdentity: state.identity,
+    k8snamespace: state.k8snamespace,
   };
 };
 

diff --git a/app/cdap/components/NamespaceAdmin/store/ActionCreator.ts b/app/cdap/components/NamespaceAdmin/store/ActionCreator.ts
@@ -48,6 +48,7 @@ export function getNamespaceDetail(namespace) {
         exploreAsPrincipal: res.config['explore.as.principal'],
         schedulerQueueName: res.config['scheduler.queue.name'],
         identity: res.identity,
+        k8snamespace: res.config['k8s.namespace'],
       },
     });
   });

diff --git a/app/cdap/components/NamespaceAdmin/store/index.ts b/app/cdap/components/NamespaceAdmin/store/index.ts
@@ -94,6 +94,7 @@ interface INamespaceAdmin {
   sourceControlManagementConfig: ISourceControlManagementConfig;
   serviceAccounts: IServiceAccount[];
   identity: string;
+  k8snamespace: string;
 }
 
 type INamespaceAdminState = Partial<INamespaceAdmin>;
@@ -113,6 +114,7 @@ const defaultInitialState: Partial<INamespaceAdminState> = {
   sourceControlManagementConfig: null,
   serviceAccounts: [],
   identity: null,
+  k8snamespace: null,
 };
 
 const namespaceAdmin: Reducer<INamespaceAdminState> = (state = defaultInitialState, action) => {