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

Frontend server: add feature flag for kubeflow deployment #2631

Merged
merged 4 commits into from
Nov 26, 2019
Merged

Frontend server: add feature flag for kubeflow deployment #2631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a460d86
Frontend server: add feature flag for multi user
Bobgy Nov 20, 2019
50be1df
Change to load index html on start up
Bobgy Nov 20, 2019
50a70de
Adjust env variable to deployment
Bobgy Nov 25, 2019
6e267fb
Update server.ts
Bobgy Nov 26, 2019
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
4 changes: 4 additions & 0 deletions frontend/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
<link rel="manifest" href="%PUBLIC_URL%/static/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/static/favicon.ico">
<title>Kubeflow Pipelines</title>
<script>
window.KFP_FLAGS={};
window.KFP_FLAGS.DEPLOYMENT=null;
</script>
</head>
<body>
<noscript>
Expand Down
55 changes: 51 additions & 4 deletions frontend/server/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,16 @@ const {
ARGO_ARCHIVE_PREFIX = 'logs',
} = process.env;

enum Deployments {
NOT_SPECIFIED = 'NOT_SPECIFIED',
KUBEFLOW = 'KUBEFLOW',
}

const DEPLOYMENT = process.env.DEPLOYMENT === 'KUBEFLOW' ?
Deployments.KUBEFLOW :
Deployments.NOT_SPECIFIED;
console.log(`Deployment = ${DEPLOYMENT}`);

/** construct minio endpoint from host and namespace (optional) */
const MINIO_ENDPOINT = MINIO_NAMESPACE && MINIO_NAMESPACE.length > 0 ? `${MINIO_HOST}.${MINIO_NAMESPACE}` : MINIO_HOST;

Expand Down Expand Up @@ -399,13 +409,50 @@ app.all(BASEPATH + '/' + v1beta1Prefix + '/*', proxy({
target: apiServerAddress,
}));

const DEFAULT_FLAG = 'window.KFP_FLAGS.DEPLOYMENT=null';
function modifyFeatureFlags(indexHtml: string): string {
if (DEPLOYMENT === Deployments.KUBEFLOW) {
return indexHtml.replace(DEFAULT_FLAG, 'window.KFP_FLAGS.DEPLOYMENT="KUBEFLOW"');
} else {
return indexHtml;
}
}

// Read index html on start up.
let indexHtml = null;
fs.readFile(path.resolve(staticDir, 'index.html'), (err, data) => {
if (err) {
console.error('Failed to load index.html.');
process.exit(1);
} else {
indexHtml = data.toString();
// sanity checking
if (!indexHtml.includes(DEFAULT_FLAG)) {
throw new Error(`Error: cannot find DEFAULT_FLAG in index html. Its content: ${indexHtml}`);
}
}
});

function handleIndexHtml(req, res) {
if (indexHtml) {
res.contentType('text/html');
res.send(modifyFeatureFlags(indexHtml));
} else {
res.send(404);
}
}

// These pathes can be matched by static handler. Putting them before it to
// override behavior for index html.
app.get('/', handleIndexHtml);
app.use(BASEPATH + '/', handleIndexHtml);
app.get('/index.html', handleIndexHtml);
app.use(BASEPATH + '/index.html', handleIndexHtml);

app.use(BASEPATH, StaticHandler(staticDir));
app.use(StaticHandler(staticDir));

app.get('*', (req, res) => {
// TODO: look into caching this file to speed up multiple requests.
res.sendFile(path.resolve(staticDir, 'index.html'));
});
app.get('*', handleIndexHtml);

app.listen(port, () => {
console.log('Server listening at http://localhost:' + port);
Expand Down