Skip to content

Commit fa331a8

Browse files
Auto-merge main into odh-release
2 parents f50ed60 + ca228b5 commit fa331a8

74 files changed

Lines changed: 3804 additions & 886 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Thumbs.db
88
.envrc
99

1010
.env*.local
11+
.mcp.json
1112

1213
node_modules
1314
logs
@@ -31,8 +32,15 @@ jest-coverage
3132
# Build outputs
3233
dist
3334

34-
# Contract test results
35+
# Contract test results
3536
contract-test-results
3637

38+
# Claude
39+
CLAUDE.md
40+
.claude/settings.local.json
41+
42+
# Playwright MCP
43+
.playwright-mcp/
44+
3745
# Temporary files
3846
tmp/

backend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"main": "src/server.ts",
2020
"scripts": {
2121
"clean": "rimraf ../logs/adminActivity.log",
22-
"start": "cross-env NODE_ENV=production node ./dist/server.js",
22+
"start": "NODE_ENV=production node ./dist/server.js",
2323
"start:dev": "npm run clean && cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 NODE_ENV=development nodemon src/server.ts",
2424
"debug": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 NODE_ENV=development nodemon --exec 'node --inspect --require ts-node/register' src/server.ts",
2525
"start:dev:wait": "npx wait-on -i 1000 http://localhost:4000",
@@ -32,7 +32,7 @@
3232
"test:type-check": "turbo run type-check",
3333
"test:jest": "jest",
3434
"type-check": "tsc --noEmit",
35-
"server": "cross-env NODE_ENV=production node ./dist/server.js",
35+
"server": "NODE_ENV=production node ./dist/server.js",
3636
"lint": "eslint .",
3737
"test-unit": "jest --silent",
3838
"test-unit-coverage": "jest --silent --coverage"

backend/src/routes/api/modelRegistries/modelRegistryUtils.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,10 @@ const deleteDatabasePasswordSecret = async (
258258
// The user may have deleted their own secret and we don't want to block deleting the model registry.
259259
return;
260260
}
261+
// If no secret exists (e.g., when using default database with generateDeployment), skip deletion
262+
if (!existingSecret) {
263+
return;
264+
}
261265
const response = await fastify.kube.coreV1Api.deleteNamespacedSecret(
262266
existingSecret.metadata.name,
263267
modelRegistryNamespace,

frontend/src/__mocks__/mockDashboardConfig.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,12 @@ export type MockDashboardConfigType = {
4848
pvcSize?: string;
4949
mlflow?: boolean;
5050
projectRBAC?: boolean;
51-
embedMLflow?: boolean;
5251
disableLLMd?: boolean;
5352
};
5453

5554
export const mockDashboardConfig = ({
5655
mlflow = false,
5756
projectRBAC = false,
58-
embedMLflow = false,
5957
disableInfo = false,
6058
disableSupport = false,
6159
disableClusterManager = false,
@@ -218,7 +216,6 @@ export const mockDashboardConfig = ({
218216
dashboardConfig: {
219217
mlflow,
220218
projectRBAC,
221-
embedMLflow,
222219
enablement: true,
223220
disableInfo,
224221
disableSupport,

frontend/src/concepts/areas/const.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ export const techPreviewFlags = {
1414
export const devTemporaryFeatureFlags = {
1515
disableKueue: true,
1616
disableProjectScoped: true,
17-
embedMLflow: false,
1817
} satisfies Partial<DashboardCommonConfig>;
1918

2019
// Group 1: Core Dashboard Features
@@ -207,9 +206,6 @@ export const SupportedAreasStateMap: SupportedAreasState = {
207206
[SupportedArea.PROJECT_RBAC_SETTINGS]: {
208207
featureFlags: ['projectRBAC'],
209208
},
210-
[SupportedArea.EMBED_MLFLOW]: {
211-
featureFlags: ['embedMLflow'],
212-
},
213209
};
214210

215211
/** Maps each DataScienceStackComponent to its human-readable name **/

frontend/src/concepts/areas/types.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ export enum SupportedArea {
9191

9292
/* Project RBAC Settings */
9393
PROJECT_RBAC_SETTINGS = 'project-rbac-settings',
94-
95-
/* Embed MLflow */
96-
EMBED_MLFLOW = 'embed-mlflow',
9794
}
9895

9996
export type SupportedAreaType = SupportedArea | string;

frontend/src/concepts/modelServing/ModelRow/ServingRuntimeTokenDisplay.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ const ServingRuntimeTokenDisplay: React.FC<ServingRuntimeTokenDisplayProps> = ({
5959
clickTip="Copied"
6060
data-testid="token-secret"
6161
additionalActions={toggleAction}
62-
truncation={isTokenVisible ? { position: 'middle' } : undefined}
62+
truncation={
63+
isTokenVisible ? { position: 'middle', tooltipProps: { hidden: true } } : undefined
64+
}
6365
onCopy={() => {
6466
navigator.clipboard.writeText(visibleToken);
6567
}}

frontend/src/k8sTypes.ts

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,6 @@ export type DashboardCommonConfig = {
13051305
maasApiKeys?: boolean;
13061306
mlflow?: boolean;
13071307
projectRBAC?: boolean;
1308-
embedMLflow?: boolean;
13091308
observabilityDashboard?: boolean;
13101309
disableLLMd?: boolean;
13111310
};
@@ -1545,8 +1544,8 @@ export type ModelRegistryKind = K8sResourceCommon & {
15451544
} & EitherNotBoth<
15461545
{
15471546
mysql?: {
1548-
database: string;
1549-
host: string;
1547+
database?: string;
1548+
host?: string;
15501549
passwordSecret?: {
15511550
key: string;
15521551
name: string;
@@ -1571,17 +1570,31 @@ export type ModelRegistryKind = K8sResourceCommon & {
15711570
},
15721571
{
15731572
postgres?: {
1574-
database: string;
1573+
database?: string;
15751574
host?: string;
15761575
passwordSecret?: {
15771576
key: string;
15781577
name: string;
15791578
};
1580-
port: number;
1579+
port?: number;
15811580
skipDBCreation?: boolean;
1581+
generateDeployment?: boolean;
15821582
sslMode?: string;
15831583
username?: string;
1584-
};
1584+
} & EitherNotBoth<
1585+
{
1586+
sslRootCertificateConfigMap?: {
1587+
name: string;
1588+
key: string;
1589+
} | null;
1590+
},
1591+
{
1592+
sslRootCertificateSecret?: {
1593+
name: string;
1594+
key: string;
1595+
} | null;
1596+
}
1597+
>;
15851598
}
15861599
>;
15871600
status?: {

0 commit comments

Comments
 (0)