Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow private/public route selection in KServe, when authorino is not enabled #3583

Merged
merged 1 commit into from
Dec 19, 2024
Merged

Allow private/public route selection in KServe, when authorino is not enabled #3583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions frontend/src/__tests__/cypress/cypress/pages/modelServing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,14 @@ class ServingRuntimeModal extends Modal {
super(`${edit ? 'Edit' : 'Add'} model server`);
}

findAuthorinoNotEnabledAlert() {
return this.find().findByTestId('no-authorino-installed-alert');
}

findTokenAuthAlert() {
return this.find().findByTestId('token-authentication-prerequisite-alert');
}

findSubmitButton() {
return this.findFooter().findByTestId('modal-submit-button');
}
Expand Down
22 changes: 22 additions & 0 deletions frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/servingRuntimeList.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,28 @@ describe('Serving Runtime List', () => {
kserveModal.findAuthenticationCheckbox().should('not.exist');
});

it('show warning alert on modal, when authorino operator is not installed/enabled', () => {
initIntercepts({
disableModelMeshConfig: false,
disableKServeConfig: false,
disableKServeAuthConfig: false,
servingRuntimes: [],
projectEnableModelMesh: false,
});

projectDetails.visitSection('test-project', 'model-server');

modelServingSection.findDeployModelButton().click();

kserveModal.shouldBeOpen();
kserveModal.findAuthorinoNotEnabledAlert().should('exist');
kserveModal.findModelRouteCheckbox().should('not.be.checked');
kserveModal.findModelRouteCheckbox().check();
kserveModal.findTokenAuthAlert().should('exist');
kserveModal.findModelRouteCheckbox().uncheck();
kserveModal.findTokenAuthAlert().should('not.exist');
});

it('Kserve auth should be hidden when no required capabilities', () => {
initIntercepts({
disableModelMeshConfig: false,
Expand Down
35 changes: 27 additions & 8 deletions ...src/pages/modelServing/screens/projects/ServingRuntimeModal/AuthServingRuntimeSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ type AuthServingRuntimeSectionProps<D extends CreatingModelServingObjectCommon>
setData: UpdateObjectAtPropAndValue<D>;
allowCreate: boolean;
publicRoute?: boolean;
showModelRoute?: boolean;
};

const AuthServingRuntimeSection = <D extends CreatingModelServingObjectCommon>({
data,
setData,
allowCreate,
publicRoute,
showModelRoute = true,
}: AuthServingRuntimeSectionProps<D>): React.ReactNode => {
const createNewToken = React.useCallback(() => {
const name = 'default-name';
Expand Down Expand Up @@ -85,14 +87,16 @@ const AuthServingRuntimeSection = <D extends CreatingModelServingObjectCommon>({
</FormGroup>
</StackItem>
)}
<StackItem>
<ServingRuntimeTokenSection
data={data}
setData={setData}
allowCreate={allowCreate}
createNewToken={createNewToken}
/>
</StackItem>
{showModelRoute && (
<StackItem>
<ServingRuntimeTokenSection
data={data}
setData={setData}
allowCreate={allowCreate}
createNewToken={createNewToken}
/>
</StackItem>
)}
{((publicRoute && data.externalRoute && !data.tokenAuth) ||
(!publicRoute && !data.tokenAuth)) && (
<StackItem>
Expand All @@ -105,6 +109,21 @@ const AuthServingRuntimeSection = <D extends CreatingModelServingObjectCommon>({
/>
</StackItem>
)}
{publicRoute && data.externalRoute && !showModelRoute && (
<Alert
isInline
variant="warning"
title="Token authentication prerequisite not installed"
data-testid="token-authentication-prerequisite-alert"
>
<p>
Making models available through external routes without requiring token authentication
can lead to unauthorized access of your model. To enable token authentication, you must
first request that your cluster administrator install the Authorino operator on your
cluster.
</p>
</Alert>
)}
</Stack>
);
};
Expand Down
15 changes: 7 additions & 8 deletions frontend/src/pages/modelServing/screens/projects/kServeModal/ManageKServeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,14 +418,13 @@ const ManageKServeModal: React.FC<ManageKServeModalProps> = ({
setSelectedAcceleratorProfile={setSelectedAcceleratorProfile}
infoContent="Select a server size that will accommodate your largest model. See the product documentation for more information."
/>
{isAuthorinoEnabled && (
<AuthServingRuntimeSection
data={createDataInferenceService}
setData={setCreateDataInferenceService}
allowCreate={allowCreate}
publicRoute
/>
)}
<AuthServingRuntimeSection
data={createDataInferenceService}
setData={setCreateDataInferenceService}
allowCreate={allowCreate}
publicRoute
showModelRoute={isAuthorinoEnabled}
/>
</>
)}
</FormSection>
Expand Down
Loading