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

Fix kube config flow #562

Merged
merged 2 commits into from
Jun 14, 2022
Merged

Fix kube config flow #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
923b659
fix: add kubeconfig flow
olexii4 Jun 13, 2022
7e35534
fix: Code refactoring
olexii4 Jun 14, 2022
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
2 changes: 1 addition & 1 deletion packages/dashboard-frontend/src/Layout/Header/Tools/UserMenu/__tests__/index.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { createHashHistory } from 'history';
import React from 'react';
import { Provider } from 'react-redux';
import renderer from 'react-test-renderer';
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { fireEvent, render, screen } from '@testing-library/react';
import { Action, Store } from 'redux';
import UserMenu from '..';
import { AppThunk } from '../../../../../store';
Expand Down
104 changes: 51 additions & 53 deletions packages/dashboard-frontend/src/store/Workspaces/devWorkspaces/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,23 @@ export const actionCreators: ActionCreators = {
},

updateDevWorkspaceStatus:
(message: IStatusUpdate): AppThunk<KnownAction, Promise<void>> =>
async (dispatch): Promise<void> => {
(
message: IStatusUpdate & {
namespace?: string;
workspaceId?: string;
},
): AppThunk<KnownAction, Promise<void>> =>
async (dispatch, getState): Promise<void> => {
if (!message.namespace || !message.workspaceId) {
const {
devWorkspaces: { workspaces },
} = getState();
const workspace = workspaces.find(w => w.metadata.uid === message.workspaceUID);
if (workspace) {
message.namespace = workspace?.metadata?.namespace;
message.workspaceId = workspace.status?.devworkspaceId;
}
}
await onStatusUpdateReceived(dispatch, message);
},

Expand Down Expand Up @@ -275,8 +290,6 @@ export const actionCreators: ActionCreators = {
}
await devWorkspaceClient.updateDebugMode(workspace, debugWorkspace);
let updatedWorkspace: devfileApi.DevWorkspace;
await addKubeConfigInjection(workspace);

const workspaceUID = workspace.metadata.uid;
dispatch({
type: 'DELETE_DEVWORKSPACE_LOGS',
Expand Down Expand Up @@ -506,7 +519,6 @@ export const actionCreators: ActionCreators = {
pluginRegistryUrl,
pluginRegistryInternalUrl,
);
await addKubeConfigInjection(workspace);

if (workspace.spec.started) {
const editor = workspace.metadata.annotations
Expand Down Expand Up @@ -586,8 +598,6 @@ export const actionCreators: ActionCreators = {
cheEditor,
optionalFilesContent,
);
await addKubeConfigInjection(workspace);

if (workspace.spec.started) {
const defaultPlugins = getState().dwPlugins.defaultPlugins;
await devWorkspaceClient.onStart(workspace, defaultPlugins, cheEditor as string);
Expand Down Expand Up @@ -715,59 +725,47 @@ export const reducer: Reducer<State> = (state: State | undefined, action: KnownA

async function onStatusUpdateReceived(
dispatch: ThunkDispatch<AppState, unknown, KnownAction>,
statusUpdate: IStatusUpdate,
statusUpdate: IStatusUpdate & {
namespace?: string;
workspaceId?: string;
},
) {
const { status } = statusUpdate;
if (status !== statusUpdate.prevStatus) {
dispatch({
type: 'UPDATE_DEVWORKSPACE_STATUS',
workspaceUID: statusUpdate.workspaceUID,
message: statusUpdate.message,
status,
});
}
const { status, message, prevStatus, workspaceUID, namespace, workspaceId } = statusUpdate;

const callback = onStatusChangeCallbacks.get(statusUpdate.workspaceUID);
if (status !== prevStatus) {
const type = 'UPDATE_DEVWORKSPACE_STATUS';
dispatch({ type, workspaceUID, message, status });

if (callback && status) {
callback(status);
const onChangeCallback = onStatusChangeCallbacks.get(workspaceUID);
if (onChangeCallback) {
onChangeCallback(status);
}
}

if (statusUpdate.message) {
if (statusUpdate.status !== DevWorkspaceStatus.STOPPED) {
const workspacesLogs = new Map<string, string[]>();
let message = statusUpdate.message;
if (
statusUpdate.status === DevWorkspaceStatus.FAILED ||
statusUpdate.status === DevWorkspaceStatus.FAILING
) {
message = `1 error occurred: ${message}`;
}
workspacesLogs.set(statusUpdate.workspaceUID, [message]);
dispatch({
type: 'UPDATE_DEVWORKSPACE_LOGS',
workspacesLogs,
});
if (message && status !== DevWorkspaceStatus.STOPPED) {
let log: string;
if (status === DevWorkspaceStatus.FAILED || status === DevWorkspaceStatus.FAILING) {
log = `1 error occurred: ${message}`;
} else {
log = message;
}

dispatch({
type: 'UPDATE_DEVWORKSPACE_LOGS',
workspacesLogs: new Map([[workspaceUID, [log]]]),
});
}
}

export async function addKubeConfigInjection(workspace: devfileApi.DevWorkspace): Promise<void> {
const toDispose = new DisposableCollection();
const onStatusChangeCallback = async (status: string) => {
if (status === DevWorkspaceStatus.RUNNING) {
const workspaceId = WorkspaceAdapter.getId(workspace);
try {
await injectKubeConfig(workspace.metadata.namespace, workspaceId);
} catch (e) {
console.error(e);
}
toDispose.dispose();
if (
status === DevWorkspaceStatus.RUNNING &&
status !== prevStatus &&
namespace !== undefined &&
workspaceId !== undefined
) {
try {
await injectKubeConfig(namespace, workspaceId);
} catch (e) {
console.error(e);
}
};
const workspaceUID = WorkspaceAdapter.getUID(workspace);
onStatusChangeCallbacks.set(workspaceUID, onStatusChangeCallback);
toDispose.push({
dispose: () => onStatusChangeCallbacks.delete(workspaceUID),
});
}
}