re-organize some stuff

Author: ashley-o0o

packages/kserve/src/deploy.ts

@@ -66,7 +66,7 @@ export const deployKServeDeployment = async (
   const createTokenAuth =
     (inferenceServiceData.tokenAuth && inferenceServiceData.tokenAuth.length > 0) ?? false;
 
-  if (initialWizardData?.canCreateRoleBindings !== false) {
+  if (wizardData.canCreateRoleBindings) {
     await setUpTokenAuth(
       inferenceServiceData,
       inferenceServiceData.k8sName,

packages/llmd-serving/src/deployments/deploy.ts

@@ -219,7 +219,7 @@ export const deployLLMdDeployment = async (
     (wizardData.tokenAuthentication.data && wizardData.tokenAuthentication.data.length > 0) ??
     false;
 
-  if (initialWizardData?.canCreateRoleBindings !== false) {
+  if (wizardData.canCreateRoleBindings) {
     await setUpTokenAuth(
       wizardData.tokenAuthentication.data,
       wizardData.k8sNameDesc.data.k8sName.value,

packages/model-serving/src/__tests__/mockUtils.ts

@@ -229,8 +229,8 @@ export const mockDeploymentWizardState = (
           setData: jest.fn(),
           isVisible: true,
         },
+        canCreateRoleBindings: true,
       },
-      canCreateRoleBindings: true,
       loaded: {
         modelSourceLoaded: true,
         modelDeploymentLoaded: true,

packages/model-serving/src/components/deploymentWizard/ModelDeploymentWizard.tsx

@@ -8,14 +8,13 @@ import {
   isGeneratedSecretName,
 } from '@odh-dashboard/internal/api/k8s/secrets';
 import { SupportedArea, useIsAreaAvailable } from '@odh-dashboard/internal/concepts/areas';
-import { useAccessReview } from '@odh-dashboard/internal/api/index';
 import { Deployment } from 'extension-points';
 import { deployModel } from './utils';
 import { ExternalDataLoader, type ExternalDataMap } from './ExternalDataLoader';
 import { useModelDeploymentWizard } from './useDeploymentWizard';
 import { useModelDeploymentWizardValidation } from './useDeploymentWizardValidation';
 import { ModelSourceStepContent } from './steps/ModelSourceStep';
-import { AdvancedSettingsStepContent, accessReviewResource } from './steps/AdvancedOptionsStep';
+import { AdvancedSettingsStepContent } from './steps/AdvancedOptionsStep';
 import { ModelDeploymentStepContent } from './steps/ModelDeploymentStep';
 import { ReviewStepContent } from './steps/ReviewStep';
 import { useDeployMethod } from './useDeployMethod';
@@ -60,15 +59,6 @@ const ModelDeploymentWizard: React.FC<ModelDeploymentWizardProps> = ({
 
   const wizardState = useModelDeploymentWizard(existingData, project?.metadata.name, externalData);
   const currentProjectName = wizardState.state.project.projectName ?? undefined;
-
-  // Check if user has permission to create rolebindings (admins can, contributors cannot)
-  const [canCreateRoleBindings] = useAccessReview({
-    ...accessReviewResource,
-    namespace: currentProjectName,
-  });
-
-  // Update wizard state with the current permission value
-  wizardState.canCreateRoleBindings = canCreateRoleBindings;
   const validation = useModelDeploymentWizardValidation(wizardState.state, wizardState.fields);
 
   const { deployMethod, deployMethodLoaded } = useDeployMethod(wizardState.state);
@@ -300,7 +290,7 @@ const ModelDeploymentWizard: React.FC<ModelDeploymentWizardProps> = ({
                   <AdvancedSettingsStepContent
                     wizardState={wizardState}
                         externalData={externalData}
-                    allowCreate={canCreateRoleBindings}
+                    allowCreate={wizardState.state.canCreateRoleBindings}
               />
                 ) : (
                   <Spinner data-testid="spinner" />

packages/model-serving/src/components/deploymentWizard/types.ts

@@ -142,6 +142,7 @@ export type WizardFormData = {
     modelServer: ReturnType<typeof useModelServerSelectField>;
     createConnectionData: ReturnType<typeof useCreateConnectionData>;
     deploymentStrategy: ReturnType<typeof useDeploymentStrategyField>;
+    canCreateRoleBindings: boolean;
   } & Record<string, unknown>;
 };
 

packages/model-serving/src/components/deploymentWizard/useDeploymentWizard.ts

@@ -5,6 +5,8 @@ import {
   extractK8sNameDescriptionFieldData,
   LimitNameResourceType,
 } from '@odh-dashboard/internal/concepts/k8s/K8sNameDescriptionField/utils';
+import { useAccessReview } from '@odh-dashboard/internal/api/index';
+import { accessReviewResource } from './steps/AdvancedOptionsStep';
 import { useModelFormatField } from './fields/ModelFormatField';
 import { useModelTypeField } from './fields/ModelTypeSelectField';
 import { useModelLocationData } from './fields/ModelLocationInputFields';
@@ -23,7 +25,6 @@ import { useDeploymentWizardReducer, type WizardFormAction } from './useDeployme
 import type { ExternalDataMap } from './ExternalDataLoader';
 
 export type UseModelDeploymentWizardState = WizardFormData & {
-  canCreateRoleBindings: boolean;
   loaded: {
     modelSourceLoaded: boolean;
     modelDeploymentLoaded: boolean;
@@ -47,6 +48,12 @@ export const useModelDeploymentWizard = (
   // Step 1: Model Source
   const modelType = useModelTypeField(initialData?.modelTypeField);
   const project = useProjectSection(initialProjectName);
+
+  const [canCreateRoleBindings] = useAccessReview({
+    ...accessReviewResource,
+    namespace: project.projectName ?? undefined,
+  });
+
   const modelLocationData = useModelLocationData(
     project.projectName,
     initialData?.modelLocationData,
@@ -140,6 +147,7 @@ export const useModelDeploymentWizard = (
       modelAvailability,
       modelServer,
       deploymentStrategy,
+      canCreateRoleBindings,
     }),
     [
       project,
@@ -157,6 +165,7 @@ export const useModelDeploymentWizard = (
       modelAvailability,
       modelServer,
       deploymentStrategy,
+      canCreateRoleBindings,
     ],
   );
 
@@ -172,7 +181,6 @@ export const useModelDeploymentWizard = (
     state,
     dispatch,
     fields,
-    canCreateRoleBindings: true, // Default value, will be updated by the component
     loaded: {
       modelSourceLoaded,
       modelDeploymentLoaded,

packages/model-serving/src/components/deploymentWizard/utils.ts

@@ -79,7 +79,7 @@ export const getTokenAuthenticationFromDeployment = (
 };
 
 export const deployModel = async (
-  wizardState: WizardFormData & { canCreateRoleBindings: boolean },
+  wizardState: WizardFormData,
   secretName: string,
   exitWizard: () => void,
   deployMethod?: (
@@ -126,7 +126,7 @@ export const deployModel = async (
             true,
             undefined,
             undefined,
-            { ...initialWizardData, canCreateRoleBindings: wizardState.canCreateRoleBindings },
+            initialWizardData,
             applyFieldData,
           ),
         ]
@@ -160,7 +160,7 @@ export const deployModel = async (
     false,
     actualSecretName,
     overwrite,
-    { ...initialWizardData, canCreateRoleBindings: wizardState.canCreateRoleBindings },
+    initialWizardData,
     applyFieldData,
   );