Skip to content

Commit

Permalink
delete orphaned code
Browse files Browse the repository at this point in the history
delete references to cluster service broker in yaml-template

delete alert-manager and associated code

delete chargeback.tsx and associated code

delete cluster-service-class.tsx, instantiate-template.tsx,  and associated code

delete prometheus.jsx and associated code

delete service-instance.tsx and associated code

Bring back instantiate-template.tsx

Revert "delete files for Service Brokers"

This reverts commit 9f40bd78cb0fdaac10e8d6aadc188818c6633d23.

bring back instantiate-template

delete files for Service Brokers

delete Service Brokers in yaml-templates

Revert "delete Service Brokers in yaml-templates"

This reverts commit 36bcbb7b31b6947aa4a5f84ce62cebb0286c89e9.

remove broker management file

delete references to cluster service broker model in resource pages and lazy routes for provisioned services

find last remaining links and references to cluster service brokers, provisioned services, and broker mgt

delete unused models

delete custom styling and lazyroutes for alert manager

delete alert manager tests and such

delete more code relater to cluster service classes

delete custom service instance styles

update translations
  • Loading branch information
maudem authored and Maude Mensah Simpson committed Sep 29, 2021
1 parent 1340776 commit 1ce8ccc
Show file tree
Hide file tree
Showing 39 changed files with 5 additions and 4,562 deletions.
1,093 changes: 0 additions & 1,093 deletions frontend/__mocks__/catalogItemsMocks.ts

Large diffs are not rendered by default.

10 changes: 2 additions & 8 deletions frontend/__tests__/module/k8s/k8s-models.spec.ts
Expand Up @@ -24,12 +24,7 @@ import {
testForUnservedVersionsCRD,
} from '../../../__mocks__/crds';
import { testNamespace, testOwnedResourceInstance } from '../../../__mocks__/k8sResourcesMocks';
import {
PodModel,
DeploymentModel,
ClusterResourceQuotaModel,
PrometheusModel,
} from '../../../public/models';
import { PodModel, DeploymentModel, ClusterResourceQuotaModel } from '../../../public/models';

describe('referenceFor', () => {
it('returns a reference for objects without an API group', () => {
Expand Down Expand Up @@ -93,9 +88,8 @@ describe('modelsToMap', () => {
});

it('returns a map with keys based on referenceForModel for models with crd:true', () => {
expect(modelsToMap([ClusterResourceQuotaModel, PrometheusModel]).toObject()).toEqual({
expect(modelsToMap([ClusterResourceQuotaModel]).toObject()).toEqual({
[referenceForModel(ClusterResourceQuotaModel)]: ClusterResourceQuotaModel,
[referenceForModel(PrometheusModel)]: PrometheusModel,
});
});
});
Expand Down
2 changes: 0 additions & 2 deletions frontend/__tests__/reducers/features.spec.tsx
Expand Up @@ -55,8 +55,6 @@ describe('featureReducer', () => {
expect(newState).toEqual(
initialState.merge({
[FLAGS.PROMETHEUS]: false,
[FLAGS.CHARGEBACK]: false,
[FLAGS.SERVICE_CATALOG]: false,
[FLAGS.CLUSTER_API]: false,
[FLAGS.MACHINE_CONFIG]: false,
[FLAGS.MACHINE_AUTOSCALER]: false,
Expand Down
11 changes: 0 additions & 11 deletions frontend/integration-tests/protractor.conf.ts
Expand Up @@ -63,7 +63,6 @@ const testSuites = {
'tests/environment.scenario.ts',
'tests/deploy-image.scenario.ts',
'tests/monitoring.scenario.ts',
'tests/alertmanager.scenario.ts',
'tests/crd-extensions.scenario.ts',
'tests/oauth.scenario.ts',
'tests/dashboards/cluster-dashboard.scenario.ts',
Expand All @@ -85,7 +84,6 @@ const testSuites = {
'tests/secrets.scenario.ts',
'tests/deploy-image.scenario.ts',
'tests/monitoring.scenario.ts',
'tests/alertmanager.scenario.ts',
'tests/crd-extensions.scenario.ts',
'tests/oauth.scenario.ts',
'tests/dashboards/cluster-dashboard.scenario.ts',
Expand All @@ -94,7 +92,6 @@ const testSuites = {
'tests/cluster-settings.scenario.ts',
]),
clusterSettings: suite(['tests/cluster-settings.scenario.ts']),
alertmanager: suite(['tests/alertmanager.scenario.ts']),
login: ['tests/login.scenario.ts'],
dashboards: suite([
'tests/dashboards/cluster-dashboard.scenario.ts',
Expand Down Expand Up @@ -192,14 +189,6 @@ export const config = {
testSuites,
reducePluginTestSuites(resolvePluginPackages(), __dirname, suite),
),
params: {
// Set to 'true' to enable OpenShift resources in the crud scenario.
// Use a string rather than boolean so it can be specified on the command line:
// $ yarn test-protractor --params.openshift true
openshift: 'false',
// Set to 'true' to enable Service Catalog resources in the crud scenario.
servicecatalog: 'false',
},
};

export const checkLogs = async () => {
Expand Down
519 changes: 0 additions & 519 deletions frontend/integration-tests/tests/alertmanager.scenario.ts

This file was deleted.

234 changes: 0 additions & 234 deletions frontend/integration-tests/tests/monitoring.scenario.ts

This file was deleted.

7 changes: 1 addition & 6 deletions frontend/integration-tests/views/catalog.view.ts
@@ -1,4 +1,4 @@
import { $, $$, browser, by, ExpectedConditions as until } from 'protractor';
import { $, $$, browser, ExpectedConditions as until } from 'protractor';

export const categoryTabs = $$('.vertical-tabs-pf-tab > a');
export const categoryTabsPresent = () => browser.wait(until.presenceOf($('.vertical-tabs-pf-tab')));
Expand All @@ -10,8 +10,3 @@ export const pageHeadingNumberOfItems = () =>
.then((text) => parseInt(text.substring(0, text.indexOf(' items')), 10));
export const catalogDetailsLoaded = () =>
browser.wait(until.presenceOf($('.modal-content')), 10000).then(() => browser.sleep(1000));
export const createServiceInstanceButton = $('.co-catalog-page__overlay-action');
export const createServiceInstanceForm = $('.co-create-service-instance');
export const createServiceBindingButton = $('.co-hint-block').element(
by.buttonText('Create Service Binding'),
);
2 changes: 0 additions & 2 deletions frontend/packages/console-shared/src/constants/common.ts
Expand Up @@ -57,7 +57,6 @@ export const OPERATOR_HUB_LABEL = 'openshift-marketplace';
export enum FLAGS {
AUTH_ENABLED = 'AUTH_ENABLED',
PROMETHEUS = 'PROMETHEUS',
CHARGEBACK = 'CHARGEBACK',
OPENSHIFT = 'OPENSHIFT',
CAN_GET_NS = 'CAN_GET_NS',
CAN_LIST_NS = 'CAN_LIST_NS',
Expand All @@ -73,7 +72,6 @@ export enum FLAGS {
CAN_LIST_VSC = 'CAN_LIST_VSC',
CLUSTER_AUTOSCALER = 'CLUSTER_AUTOSCALER',
SHOW_OPENSHIFT_START_GUIDE = 'SHOW_OPENSHIFT_START_GUIDE',
SERVICE_CATALOG = 'SERVICE_CATALOG',
CLUSTER_API = 'CLUSTER_API',
CLUSTER_VERSION = 'CLUSTER_VERSION',
MACHINE_CONFIG = 'MACHINE_CONFIG',
Expand Down
Expand Up @@ -91,17 +91,6 @@ describe('Visiting other routes', () => {
path: '/k8s/cluster/machineconfiguration.openshift.io~v1~MachineConfigPool',
waitFor: () => listPage.rows.shouldBeLoaded(),
},
{
path: '/k8s/all-namespaces/monitoring.coreos.com~v1~Alertmanager',
waitFor: () => listPage.rows.shouldBeLoaded(),
},
{
path: '/k8s/ns/openshift-monitoring/monitoring.coreos.com~v1~Alertmanager/main',
waitFor: () => {
detailsPage.isLoaded();
cy.byTestID('label-list').should('be.visible');
},
},
{
path: '/settings/cluster',
waitFor: () => cy.byLegacyTestID('cluster-version').should('exist'),
Expand Down

0 comments on commit 1ce8ccc

Please sign in to comment.