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.

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

CNV-38577: Fix initial load of serial console #1812

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/utils/resources/vmi/utils/pod.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { IoK8sApiCoreV1Pod } from '@kubevirt-ui/kubevirt-api/kubernetes';
import { V1VirtualMachineInstance } from '@kubevirt-ui/kubevirt-api/kubevirt';
import { K8sResourceCommon } from '@openshift-console/dynamic-plugin-sdk';

Expand All @@ -19,7 +20,7 @@ export const isPodReady = (pod): boolean =>
* @param {K8sResourceCommon[]} pods - The pods to check
* @returns {*}
*/
export const getVMIPod = (vmi: V1VirtualMachineInstance, pods: K8sResourceCommon[]) => {
export const getVMIPod = (vmi: V1VirtualMachineInstance, pods: IoK8sApiCoreV1Pod[]) => {
if (!pods || !vmi) {
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ const GuestSystemLogsAccess: FC<GuestSystemLogsAccessProps> = ({
const [error, setError] = useState<Error>(null);
const [isChecked, setIsChecked] = useState<boolean>();

useEffect(() => setIsChecked(!disableSerialConsoleLog), [disableSerialConsoleLog]);
useEffect(() => {
guestSystemLogsAccessToggle(!!disableSerialConsoleLog);
setIsChecked(!disableSerialConsoleLog);
}, [disableSerialConsoleLog, guestSystemLogsAccessToggle]);

const onChange = async (checked: boolean) => {
try {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';

import { V1Devices } from '@kubevirt-ui/kubevirt-api/kubevirt';
import Loading from '@kubevirt-utils/components/Loading/Loading';
import { getChangedGuestSystemAccessLog } from '@kubevirt-utils/components/PendingChanges/utils/helpers';
import { DISABLED_GUEST_SYSTEM_LOGS_ACCESS } from '@kubevirt-utils/hooks/useFeatures/constants';
import { useFeatures } from '@kubevirt-utils/hooks/useFeatures/useFeatures';
Expand All @@ -15,31 +16,44 @@ import VirtualMachineBasicLogViewer from './VirtualMachineBasicLogViewer/Virtual

const VirtualMachineLogViewer = ({ connect, vm }) => {
const { t } = useKubevirtTranslation();
const { pods, vmi } = useVMIAndPodsForVM(vm?.metadata?.name, vm?.metadata?.namespace);
const { loaded, pods, vmi } = useVMIAndPodsForVM(vm?.metadata?.name, vm?.metadata?.namespace);
const pod = getVMIPod(vmi, pods);
const { featureEnabled: isClusterDisabledGuestSystemLogs } = useFeatures(
DISABLED_GUEST_SYSTEM_LOGS_ACCESS,
);

const isDisabledAtVM =
(getDevices(vm) as V1Devices & { logSerialConsole: boolean })?.logSerialConsole === false &&
!isClusterDisabledGuestSystemLogs;

const isNeededRestart = getChangedGuestSystemAccessLog(vm, vmi);

const { data } = useVirtualMachineLogData({ connect, pod });
const isPodLogContainerExist = Boolean(
pod?.spec?.containers?.find((container) => container?.name === 'guest-console-log'),
);

if (!isRunning(vm)) {
return <Bullseye>{t('Virtual machine is not running')}</Bullseye>;
const { data } = useVirtualMachineLogData({ connect: connect && isPodLogContainerExist, pod });

if (!loaded) {
return (
<Bullseye>
<Loading />
</Bullseye>
);
}

if (isNeededRestart) {
return <Bullseye>{t('Guest system logs not ready. Restart required')}</Bullseye>;
if (!isRunning(vm)) {
return <Bullseye>{t('Virtual machine is not running')}</Bullseye>;
}

if (isClusterDisabledGuestSystemLogs) {
return <Bullseye>{t('Guest system logs are disabled at cluster')}</Bullseye>;
}

if (isNeededRestart || !isPodLogContainerExist) {
return <Bullseye>{t('Guest system logs not ready. Restart required')}</Bullseye>;
}

if (isDisabledAtVM) {
return <Bullseye>{t('Guest system logs are disabled at VirtualMachine')}</Bullseye>;
}
Expand Down
Loading