Merge pull request #12968 from avivtur/depracate-alert-deployment-config

OCPBUGS-18348: Add deprecation alert for DeploymentConfig

Author: openshift-merge-robot

frontend/packages/dev-console/src/components/deployments/DeploymentForm.tsx

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { FormikProps, FormikValues } from 'formik';
 import * as _ from 'lodash';
 import { useTranslation } from 'react-i18next';
+import { DeploymentConfigDeprecationAlert } from '@console/internal/components/deployment-config';
 import { DeploymentConfigModel, DeploymentModel } from '@console/internal/models';
 import { K8sResourceKind } from '@console/internal/module/k8s';
 import {
@@ -51,12 +52,16 @@ const EditDeploymentForm: React.FC<
   const formEditor = <DeploymentFormEditor resourceType={resourceType} resourceObj={resource} />;
 
   const yamlEditor = (
-    <CodeEditorField
-      name="yamlData"
-      model={resourceType === Resources.OpenShift ? DeploymentConfigModel : DeploymentModel}
-      showSamples={isNew}
-      onSave={handleSubmit}
-    />
+    <>
+      <DeploymentConfigDeprecationAlert />
+      <br />
+      <CodeEditorField
+        name="yamlData"
+        model={resourceType === Resources.OpenShift ? DeploymentConfigModel : DeploymentModel}
+        showSamples={isNew}
+        onSave={handleSubmit}
+      />
+    </>
   );
 
   const sanitizeToForm = (yamlDeployment: K8sResourceKind) => {

frontend/packages/dev-console/src/components/deployments/DeploymentFormEditor.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { DeploymentConfigDeprecationAlert } from '@console/internal/components/deployment-config';
 import { K8sResourceKind } from '@console/internal/module/k8s';
 import SwitchToYAMLAlert from '@console/shared/src/components/alerts/SwitchToYAMLAlert';
 import NameSection from '../buildconfig/sections/NameSection';
@@ -20,6 +21,7 @@ const EditDeploymentFormEditor: React.FC<EditDeploymentFormEditorProps> = ({
   const [showYAMLAlert, setShowYAMLAlert] = React.useState<boolean>(true);
   return (
     <>
+      <DeploymentConfigDeprecationAlert />
       {showYAMLAlert && <SwitchToYAMLAlert onClose={() => setShowYAMLAlert(false)} />}
       <NameSection />
       <DeploymentStrategySection resourceType={resourceType} resourceObj={resourceObj} />

frontend/packages/topology/src/components/side-bar/components/SideBarHeading.scss

@@ -1,3 +1,3 @@
-.odc-topology-sidebar-alert {
+.odc-topology-sidebar-alert, .dc-deprecation-sidebar-alert {
   margin: 0 20px var(--pf-global--spacer--md);
 }

frontend/packages/topology/src/components/side-bar/components/SideBarHeading.tsx

@@ -1,5 +1,7 @@
 import * as React from 'react';
 import { GraphElement } from '@patternfly/react-topology';
+import { DeploymentConfigDeprecationAlert } from '@console/internal/components/deployment-config';
+import { DeploymentConfigModel } from '@console/internal/models';
 import TopologyActions from '../../../actions/TopologyActions';
 import { useDetailsResourceLink } from '../providers/useDetailsResourceLink';
 import SideBarAlerts from './SideBarAlerts';
@@ -8,6 +10,7 @@ import './SideBarHeading.scss';
 const SideBarHeading: React.FC<{ element: GraphElement }> = ({ element }) => {
   const resourceLabel = element.getLabel();
   const resourceLink = useDetailsResourceLink(element);
+  const resourceKind = element.getData()?.resource?.kind;
   return (
     <div className="overview__sidebar-pane-head resource-overview__heading">
       <h1 className="co-m-pane__heading">
@@ -16,6 +19,11 @@ const SideBarHeading: React.FC<{ element: GraphElement }> = ({ element }) => {
           <TopologyActions element={element} />
         </div>
       </h1>
+      {resourceKind === DeploymentConfigModel.kind && (
+        <div className="dc-deprecation-sidebar-alert">
+          <DeploymentConfigDeprecationAlert />
+        </div>
+      )}
       <div className="odc-topology-sidebar-alert">
         <SideBarAlerts element={element} />
       </div>

frontend/public/components/deployment-config.tsx

@@ -44,10 +44,14 @@ import {
   navFactory,
   togglePaused,
   RuntimeClass,
+  ExternalLink,
+  getDocumentationURL,
+  documentationURLs,
 } from './utils';
 import { ReplicationControllersPage } from './replication-controller';
 import { WorkloadTableRow, WorkloadTableHeader } from './workload-table';
 import { PodDisruptionBudgetField } from '@console/app/src/components/pdb/PodDisruptionBudgetField';
+import { Alert } from '@patternfly/react-core';
 
 const DeploymentConfigsReference: K8sResourceKindReference = 'DeploymentConfig';
 
@@ -210,6 +214,33 @@ export const DeploymentConfigDetailsList = ({ dc }) => {
   );
 };
 
+export const DeploymentConfigDeprecationAlert: React.FC = () => {
+  const { t } = useTranslation();
+  return (
+    <Alert
+      isInline
+      variant="info"
+      title={t('public~DeploymentConfig is being deprecated with OpenShift 4.14')}
+    >
+      <p>
+        {t(
+          'public~Feature development of DeploymentConfigs will be deprecated in OpenShift Container Platform 4.14.',
+        )}
+      </p>
+      <p>
+        {t(
+          'public~DeploymentConfigs will continue to be supported for security and critical fixes, but you should migrate to Deployments wherever it is possible.',
+        )}
+      </p>
+      <ExternalLink
+        href={getDocumentationURL(documentationURLs.deprecatedDeploymentConfig)}
+        text={t('public~Learn more about Deployments')}
+        additionalClassName="pf-u-mt-md"
+      />
+    </Alert>
+  );
+};
+
 export const DeploymentConfigsDetails: React.FC<{ obj: K8sResourceKind }> = ({ obj: dc }) => {
   const { t } = useTranslation();
   return (
@@ -326,7 +357,10 @@ export const DeploymentConfigsDetailsPage: React.FC<DeploymentConfigsDetailsPage
       kind={DeploymentConfigsReference}
       customActionMenu={customActionMenu}
       pages={pages}
-    />
+    >
+      <DeploymentConfigDeprecationAlert />
+      <br />
+    </DetailsPage>
   );
 };
 DeploymentConfigsDetailsPage.displayName = 'DeploymentConfigsDetailsPage';
@@ -372,6 +406,7 @@ export const DeploymentConfigsPage: React.FC<DeploymentConfigsPageProps> = (prop
       ListComponent={DeploymentConfigsList}
       createProps={createProps}
       canCreate={true}
+      helpText={<DeploymentConfigDeprecationAlert />}
       {...props}
     />
   );

frontend/public/components/utils/documentation.tsx

@@ -80,6 +80,10 @@ export const documentationURLs: documentationURLsType = {
     downstream: 'html/building_applications/projects#working-with-projects',
     upstream: 'applications/projects/working-with-projects.html',
   },
+  deprecatedDeploymentConfig: {
+    downstream: 'html/building_applications/deployments',
+    upstream: 'applications/deployments/what-deployments-are.html',
+  },
 };
 
 export const isUpstream = () => window.SERVER_FLAGS.branding === 'okd';

frontend/public/locales/en/public.json

@@ -467,6 +467,10 @@
   "{{maxSurge}} greater than {{count}} pod_other": "{{maxSurge}} greater than {{count}} pods",
   "Min ready seconds": "Min ready seconds",
   "Triggers": "Triggers",
+  "DeploymentConfig is being deprecated with OpenShift 4.14": "DeploymentConfig is being deprecated with OpenShift 4.14",
+  "Feature development of DeploymentConfigs will be deprecated in OpenShift Container Platform 4.14.": "Feature development of DeploymentConfigs will be deprecated in OpenShift Container Platform 4.14.",
+  "DeploymentConfigs will continue to be supported for security and critical fixes, but you should migrate to Deployments wherever it is possible.": "DeploymentConfigs will continue to be supported for security and critical fixes, but you should migrate to Deployments wherever it is possible.",
+  "Learn more about Deployments": "Learn more about Deployments",
   "DeploymentConfig details": "DeploymentConfig details",
   "ReplicationControllers": "ReplicationControllers",
   "DeploymentConfigs": "DeploymentConfigs",