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

[release-4.9] Bug 2030408: Disable replacement procedure from ODF UI #11483

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 2 additions & 8 deletions frontend/packages/ceph-storage-plugin/console-extensions.json
Expand Up @@ -5,11 +5,8 @@
"alert": "CephOSDDiskUnavailable",
"text": "%ceph-storage-plugin~Troubleshoot%",
"action": {
"$codeRef": "alert.getAlertActionPath"
"$codeRef": "alert.getDiskAlertActionPath"
}
},
"flags": {
"required": ["LSO_DEVICE_DISCOVERY", "OCS_ATTACHED_DEVICES"]
}
},
{
Expand All @@ -18,11 +15,8 @@
"alert": "CephOSDDiskNotResponding",
"text": "%ceph-storage-plugin~Troubleshoot%",
"action": {
"$codeRef": "alert.getAlertActionPath"
"$codeRef": "alert.getDiskAlertActionPath"
}
},
"flags": {
"required": ["LSO_DEVICE_DISCOVERY", "OCS_ATTACHED_DEVICES"]
}
},
{
Expand Down
Expand Up @@ -684,7 +684,6 @@
"Selected nodes are based on the StorageClass <1>{{scName}}</1> and with a recommended requirement of 14 CPU and 34 GiB RAM per node.": "Selected nodes are based on the StorageClass <1>{{scName}}</1> and with a recommended requirement of 14 CPU and 34 GiB RAM per node.",
"Selected nodes are based on the StorageClass <1>{{scName}}</1> and fulfill the stretch cluster requirements with a recommended requirement of 14 CPU and 34 GiB RAM per node.": "Selected nodes are based on the StorageClass <1>{{scName}}</1> and fulfill the stretch cluster requirements with a recommended requirement of 14 CPU and 34 GiB RAM per node.",
"Storage": "Storage",
"Disks": "Disks",
"Backing Store": "Backing Store",
"Bucket Class": "Bucket Class",
"Namespace Store": "Namespace Store",
Expand Down
Expand Up @@ -13,7 +13,6 @@ import {
AlertActionCloseButton,
} from '@patternfly/react-core';
import { history } from '@console/internal/components/utils';
import { OCS_ATTACHED_DEVICES_FLAG } from '@console/local-storage-operator-plugin/src/features';
import { setFlag } from '@console/internal/actions/features';
import { WizardCommonProps, WizardState } from './reducer';
import {
Expand Down Expand Up @@ -112,6 +111,7 @@ export const setActionFlags = (
) => {
switch (type) {
case BackingStorageType.EXISTING:
case BackingStorageType.LOCAL_DEVICES:
flagDispatcher(setFlag(OCS_CONVERGED_FLAG, true));
flagDispatcher(setFlag(OCS_INDEPENDENT_FLAG, false));
flagDispatcher(setFlag(OCS_FLAG, true));
Expand All @@ -121,12 +121,6 @@ export const setActionFlags = (
flagDispatcher(setFlag(OCS_CONVERGED_FLAG, !isRhcs));
flagDispatcher(setFlag(OCS_FLAG, true));
break;
case BackingStorageType.LOCAL_DEVICES:
flagDispatcher(setFlag(OCS_ATTACHED_DEVICES_FLAG, true));
flagDispatcher(setFlag(OCS_CONVERGED_FLAG, true));
flagDispatcher(setFlag(OCS_INDEPENDENT_FLAG, false));
flagDispatcher(setFlag(OCS_FLAG, true));
break;
default:
}
flagDispatcher(setFlag(MCG_STANDALONE, isMCG));
Expand Down
Expand Up @@ -19,7 +19,6 @@ import {
import { history } from '@console/internal/components/utils/router';
import { setFlag } from '@console/internal/actions/features';
import { k8sCreate, K8sResourceKind, referenceForModel } from '@console/internal/module/k8s';
import { OCS_ATTACHED_DEVICES_FLAG } from '@console/local-storage-operator-plugin/src/features';
import { ClusterServiceVersionModel } from '@console/operator-lifecycle-manager';
import { resourcePathFromModel } from '@console/internal/components/utils';
import { getName } from '@console/shared';
Expand Down Expand Up @@ -93,7 +92,6 @@ const createCluster = async (
promises.push(...taintNodes(nodes));
}
await Promise.all(promises).then(() => k8sCreate(OCSServiceModel, storageCluster));
flagDispatcher(setFlag(OCS_ATTACHED_DEVICES_FLAG, true));
flagDispatcher(setFlag(OCS_CONVERGED_FLAG, true));
flagDispatcher(setFlag(OCS_INDEPENDENT_FLAG, false));
flagDispatcher(setFlag(OCS_FLAG, true));
Expand Down
21 changes: 0 additions & 21 deletions frontend/packages/ceph-storage-plugin/src/plugin.ts
Expand Up @@ -17,9 +17,6 @@ import {
} from '@console/plugin-sdk';
import { ClusterServiceVersionModel } from '@console/operator-lifecycle-manager/src/models';
import { referenceForModel } from '@console/internal/module/k8s';
import { NodeModel } from '@console/internal/models';
import { LSO_DEVICE_DISCOVERY } from '@console/local-storage-operator-plugin/src/plugin';
import { OCS_ATTACHED_DEVICES_FLAG } from '@console/local-storage-operator-plugin/src/features';
import * as models from './models';
import * as mockModels from './mock-models';
import { getCephHealthState } from './components/dashboards/persistent-internal/status-card/utils';
Expand Down Expand Up @@ -269,24 +266,6 @@ const plugin: Plugin<ConsumedExtensions> = [
required: [CEPH_FLAG],
},
},
{
type: 'HorizontalNavTab',
properties: {
model: NodeModel,
page: {
href: 'disks',
// t('ceph-storage-plugin~Disks')
name: '%ceph-storage-plugin~Disks%',
},
loader: () =>
import(
'./components/disk-inventory/ocs-disks-list' /* webpackChunkName: "ocs-nodes-disks-list" */
).then((m) => m.OCSNodesDiskListPage),
},
flags: {
required: [OCS_ATTACHED_DEVICES_FLAG, LSO_DEVICE_DISCOVERY],
},
},
// Noobaa Related Plugins
{
type: 'Page/Route',
Expand Down
@@ -1,13 +1,9 @@
import { Alert } from '@console/internal/components/monitoring/types';
import { history } from '@console/internal/components/utils';
import { k8sGet } from '@console/internal/module/k8s';
import { CEPH_STORAGE_NAMESPACE } from '../constants';
import { OCSServiceModel } from '../models';

export const getAlertActionPath = (alertData: Alert) =>
history.push(
`/k8s/cluster/nodes/${alertData.labels.host}/disks?node-disk-name=${alertData.labels.device}`,
);
export const getDiskAlertActionPath = () =>
window.open('https://access.redhat.com/solutions/5194851');

export const launchClusterExpansionModal = async () => {
try {
Expand Down
33 changes: 0 additions & 33 deletions frontend/packages/local-storage-operator-plugin/src/features.ts

This file was deleted.

8 changes: 0 additions & 8 deletions frontend/packages/local-storage-operator-plugin/src/plugin.ts
Expand Up @@ -10,7 +10,6 @@ import {
RoutePage,
HorizontalNavTab,
} from '@console/plugin-sdk';
import { detectOCSAttachedDeviceMode, OCS_ATTACHED_DEVICES_FLAG } from './features';
import * as models from './models';

type ConsumedExtensions =
Expand Down Expand Up @@ -44,12 +43,6 @@ const plugin: Plugin<ConsumedExtensions> = [
flag: LSO_DEVICE_DISCOVERY,
},
},
{
type: 'FeatureFlag/Custom',
properties: {
detect: detectOCSAttachedDeviceMode,
},
},
{
type: 'Page/Route',
properties: {
Expand Down Expand Up @@ -82,7 +75,6 @@ const plugin: Plugin<ConsumedExtensions> = [
},
flags: {
required: [LSO_DEVICE_DISCOVERY],
disallowed: [OCS_ATTACHED_DEVICES_FLAG],
},
},
{
Expand Down

This file was deleted.