Skip to content

Commit 4f3c12d

Browse files
authored
Merge pull request #1227 from yaacov/cleanup-settings-must-gather
🐾 Remove unused settings must gather cleanup
2 parents f0a4d31 + 0e54c16 commit 4f3c12d

File tree

4 files changed

+0
-87
lines changed

4 files changed

+0
-87
lines changed

packages/forklift-console-plugin/locales/en/plugin__forklift-console-plugin.json

-5
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@
142142
"Edit Maximum concurrent VM migrations": "Edit Maximum concurrent VM migrations",
143143
"Edit migration plan target namespace": "Edit migration plan target namespace",
144144
"Edit migration plan transfer network": "Edit migration plan transfer network",
145-
"Edit Must gather cleanup after (hours)": "Edit Must gather cleanup after (hours)",
146145
"Edit NetworkMap": "Edit NetworkMap",
147146
"Edit Plan": "Edit Plan",
148147
"Edit plan name": "Edit plan name",
@@ -250,7 +249,6 @@
250249
"MTU": "MTU",
251250
"Multiple NICs mapped to Pod Networking ": "Multiple NICs mapped to Pod Networking ",
252251
"Multiple NICs on the same network": "Multiple NICs on the same network",
253-
"Must gather cleanup after (hours)": "Must gather cleanup after (hours)",
254252
"Name": "Name",
255253
"Name is primarily intended for creation idempotence and configuration definition. Cannot be updated.": "Name is primarily intended for creation idempotence and configuration definition. Cannot be updated.",
256254
"Name is required and must be a unique within a namespace and valid Kubernetes name.": "Name is required and must be a unique within a namespace and valid Kubernetes name.",
@@ -347,7 +345,6 @@
347345
"Please enter the interval in seconds for snapshot pooling, if empty default value will be used.": "Please enter the interval in seconds for snapshot pooling, if empty default value will be used.",
348346
"Please enter the limit for CPU usage by the controller in milliCPU, if empty default value will be used.": "Please enter the limit for CPU usage by the controller in milliCPU, if empty default value will be used.",
349347
"Please enter the limit for memory usage by the controller in Mi, if empty default value will be used.": "Please enter the limit for memory usage by the controller in Mi, if empty default value will be used.",
350-
"Please enter the maximum age in hours for must gather cleanup, if empty default value will be used.": "Please enter the maximum age in hours for must gather cleanup, if empty default value will be used.",
351348
"Please enter the maximum number of concurrent VM migrations, if empty default value will be used.": "Please enter the maximum number of concurrent VM migrations, if empty default value will be used.",
352349
"Pod": "Pod",
353350
"Pod network": "Pod network",
@@ -429,7 +426,6 @@
429426
"source": "source",
430427
"Source Only": "Source Only",
431428
"Source provider": "Source provider",
432-
"Specifies the duration for retaining 'must gather' reports before they are automatically deleted. The default value is -1, which implies automatic cleanup is disabled.": "Specifies the duration for retaining 'must gather' reports before they are automatically deleted. The default value is -1, which implies automatic cleanup is disabled.",
433429
"Specify a list of passphrases for the Linux Unified Key Setup (LUKS)-encrypted devices for the VMs that you want to migrate.": "Specify a list of passphrases for the Linux Unified Key Setup (LUKS)-encrypted devices for the VMs that you want to migrate.",
434430
"Specify the type of source provider. Allowed values are ova, ovirt, vsphere,\n openshift, and openstack. This label is needed to verify the credentials are correct when the remote system is accessible and, for RHV, to retrieve the Manager CA certificate when\n a third-party certificate is specified.": "Specify the type of source provider. Allowed values are ova, ovirt, vsphere,\n openshift, and openstack. This label is needed to verify the credentials are correct when the remote system is accessible and, for RHV, to retrieve the Manager CA certificate when\n a third-party certificate is specified.",
435431
"Staging": "Staging",
@@ -468,7 +464,6 @@
468464
"The limit for CPU usage by the controller, specified in milliCPU. Default value is 500m.": "The limit for CPU usage by the controller, specified in milliCPU. Default value is 500m.",
469465
"The limit for memory usage by the controller, specified in Megabytes (Mi). Default value is 800Mi.": "The limit for memory usage by the controller, specified in Megabytes (Mi). Default value is 800Mi.",
470466
"The Manager CA certificate unless it was replaced by a third-party certificate, in which case, enter the Manager Apache CA certificate.": "The Manager CA certificate unless it was replaced by a third-party certificate, in which case, enter the Manager Apache CA certificate.",
471-
"The maximum age in hours for must gather cleanup. Default value is -1, which implies never.": "The maximum age in hours for must gather cleanup. Default value is -1, which implies never.",
472467
"The password for the ESXi host admin": "The password for the ESXi host admin",
473468
"The plan is not ready - ": "The plan is not ready - ",
474469
"The provider is not ready - ": "The provider is not ready - ",

packages/forklift-console-plugin/src/modules/Overview/modal/EditCleanupMaxAgeModal.tsx

-51
This file was deleted.

packages/forklift-console-plugin/src/modules/Overview/modal/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// @index(['./*', /style/g], f => `export * from '${f.path}';`)
2-
export * from './EditCleanupMaxAgeModal';
32
export * from './EditControllerCPULimitModal';
43
export * from './EditControllerMemoryLimitModal';
54
export * from './EditMaxVMInFlightModal';

packages/forklift-console-plugin/src/modules/Overview/views/overview/tabs/Details/cards/SettingsCard.tsx

-30
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { FC } from 'react';
22
import {
3-
EditCleanupMaxAgeModal,
43
EditControllerCPULimitModal,
54
EditControllerMemoryLimitModal,
65
EditMaxVMInFlightModal,
@@ -24,11 +23,6 @@ const SettingsCard_: FC<SettingsCardProps> = ({ obj }) => {
2423
const { t } = useForkliftTranslation();
2524
const { showModal } = useModal();
2625

27-
const mustGatherAPICleanupMaxAge =
28-
obj?.spec?.['must_gather_api_cleanup_max_age'] === -1
29-
? 'Disabled'
30-
: obj?.spec?.['must_gather_api_cleanup_max_age'];
31-
3226
return (
3327
<Card>
3428
<CardTitle className="forklift-title">{t('Settings')}</CardTitle>
@@ -60,30 +54,6 @@ const SettingsCard_: FC<SettingsCardProps> = ({ obj }) => {
6054
onEdit={() => showModal(<EditMaxVMInFlightModal resource={obj} />)}
6155
/>
6256

63-
<DetailsItem
64-
title={'Must gather cleanup after (hours)'}
65-
showHelpIconNextToTitle={true}
66-
content={
67-
mustGatherAPICleanupMaxAge && mustGatherAPICleanupMaxAge !== '-1' ? (
68-
mustGatherAPICleanupMaxAge
69-
) : (
70-
<span className="text-muted">{'Disabled'}</span>
71-
)
72-
}
73-
moreInfoLink={
74-
'https://access.redhat.com/documentation/en-us/migration_toolkit_for_virtualization/2.6/html-single/installing_and_using_the_migration_toolkit_for_virtualization/index#advanced-migration-options'
75-
}
76-
helpContent={
77-
<Text>
78-
{t(
79-
"Specifies the duration for retaining 'must gather' reports before they are automatically deleted. The default value is -1, which implies automatic cleanup is disabled.",
80-
)}
81-
</Text>
82-
}
83-
crumbs={['spec', 'must_gather_api_cleanup_max_age']}
84-
onEdit={() => showModal(<EditCleanupMaxAgeModal resource={obj} />)}
85-
/>
86-
8757
<DetailsItem
8858
title={'Controller main container CPU limit'}
8959
showHelpIconNextToTitle={true}

0 commit comments

Comments
 (0)