Merge pull request #7264 from invincibleJai/cherrypick-for-pr-7110-fo…

…r-4.6 [release-4.6.z] Bug 1899382: removes techpreview badge from eventing
openshift · Dec 10, 2020 · eef8886 · eef8886
2 parents 4d3ed53 + ea95007
commit eef8886
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/frontend/packages/knative-plugin/src/components/add/EventSourcePage.tsx b/frontend/packages/knative-plugin/src/components/add/EventSourcePage.tsx
@@ -1,14 +1,13 @@
 import * as React from 'react';
 import { Helmet } from 'react-helmet';
 import { RouteComponentProps } from 'react-router';
-import { PageBody, getBadgeFromType } from '@console/shared';
+import { PageBody } from '@console/shared';
 import { PageHeading } from '@console/internal/components/utils';
 import NamespacedPage, {
   NamespacedPageVariants,
 } from '@console/dev-console/src/components/NamespacedPage';
 import { QUERY_PROPERTIES } from '@console/dev-console/src/const';
 import ConnectedEventSource from './EventSource';
-import { KnativeEventingModel } from '../../models';
 import EventSourceAlert from './EventSourceAlert';
 import { useEventSourceList } from '../../utils/create-eventsources-utils';
 
@@ -23,7 +22,7 @@ const EventSourcePage: React.FC<EventSourcePageProps> = ({ match, location }) =>
       <Helmet>
         <title>Event Sources</title>
       </Helmet>
-      <PageHeading badge={getBadgeFromType(KnativeEventingModel.badge)} title="Event Sources">
+      <PageHeading title="Event Sources">
         Create an event source to register interest in a class of events from a particular system
       </PageHeading>
       <PageBody flexLayout>

diff --git a/frontend/packages/knative-plugin/src/components/add/EventingChannelPage.tsx b/frontend/packages/knative-plugin/src/components/add/EventingChannelPage.tsx
@@ -1,13 +1,12 @@
 import * as React from 'react';
 import { Helmet } from 'react-helmet';
 import { RouteComponentProps } from 'react-router';
-import { PageBody, getBadgeFromType } from '@console/shared';
+import { PageBody } from '@console/shared';
 import { PageHeading } from '@console/internal/components/utils';
 import NamespacedPage, {
   NamespacedPageVariants,
 } from '@console/dev-console/src/components/NamespacedPage';
 import { QUERY_PROPERTIES } from '@console/dev-console/src/const';
-import { KnativeEventingModel } from '../../models';
 import { useChannelList } from '../../utils/create-channel-utils';
 import AddChannel from './channels/AddChannel';
 
@@ -22,7 +21,7 @@ const EventingChannelPage: React.FC<EventingChannelPageProps> = ({ match, locati
       <Helmet>
         <title>Channel</title>
       </Helmet>
-      <PageHeading badge={getBadgeFromType(KnativeEventingModel.badge)} title="Channel">
+      <PageHeading title="Channel">
         Create a Knative Channel to create an event forwarding and persistence layer with in-memory
         and reliable implementations
       </PageHeading>

diff --git a/frontend/packages/knative-plugin/src/models.ts b/frontend/packages/knative-plugin/src/models.ts
@@ -1,7 +1,6 @@
 import { chart_color_cyan_400 as knativeServingColor } from '@patternfly/react-tokens/dist/js/chart_color_cyan_400';
 import { chart_color_red_300 as knativeEventingColor } from '@patternfly/react-tokens/dist/js/chart_color_red_300';
 import { K8sKind } from '@console/internal/module/k8s';
-import { BadgeType } from '@console/shared/src/components/badges/badge-factory';
 import {
   KNATIVE_EVENT_SOURCE_APIGROUP,
   KNATIVE_EVENT_SOURCE_APIGROUP_DEP,
@@ -52,7 +51,6 @@ export const KnativeEventingModel: K8sKind = {
   abbr: 'KE',
   namespaced: true,
   crd: true,
-  badge: BadgeType.TECH,
   color: knativeEventingColor.value,
 };