Merge pull request #15055 from rhamilto/OCPBUGS-56255

[release-4.18] OCPBUGS-56255: remove 60 day alert from cluster update modal

Author: openshift-merge-bot[bot]

frontend/public/components/modals/cluster-update-modal.tsx

@@ -3,21 +3,10 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Alert, Radio, Text, TextContent, TextVariants } from '@patternfly/react-core';
 import { useK8sWatchResource } from '@console/internal/components/utils/k8s-watch-hook';
-import {
-  documentationURLs,
-  ExternalLink,
-  getDocumentationURL,
-} from '@console/internal/components/utils';
 import { DropdownWithSwitch } from '@console/shared/src/components/dropdown';
 
 import { ClusterVersionModel, MachineConfigPoolModel, NodeModel } from '../../models';
-import {
-  FieldLevelHelp,
-  HandlePromiseProps,
-  LinkifyExternal,
-  isManaged,
-  withHandlePromise,
-} from '../utils';
+import { FieldLevelHelp, HandlePromiseProps, LinkifyExternal, withHandlePromise } from '../utils';
 import {
   ClusterVersionKind,
   getConditionUpgradeableFalse,
@@ -189,7 +178,6 @@ const ClusterUpdateModal = withHandlePromise((props: ClusterUpdateModalProps) =>
       label: t('public~Have known issues'),
     });
   }
-  const helpURL = getDocumentationURL(documentationURLs.updateUsingCustomMachineConfigPools);
 
   return (
     <form onSubmit={submit} name="form" className="modal-content" data-test="update-cluster-modal">
@@ -255,7 +243,7 @@ const ClusterUpdateModal = withHandlePromise((props: ClusterUpdateModalProps) =>
             {t('public~Update options')}
             <FieldLevelHelp>
               {t(
-                "public~Full cluster update allows you to update all your Nodes, but takes longer. Control plane only update allows you to pause worker and custom pool Nodes to accommodate your maintenance schedule, but you'll need to resume the non-control plane Node updates within 60 days to avoid failure.",
+                'public~Full cluster update allows you to update all your Nodes, but takes longer. Control plane only update allows you to pause worker and custom pool Nodes to accommodate your maintenance schedule.',
               )}
             </FieldLevelHelp>
           </label>
@@ -307,24 +295,11 @@ const ClusterUpdateModal = withHandlePromise((props: ClusterUpdateModalProps) =>
             className="pf-v5-u-mb-md"
             body={
               upgradeType === upgradeTypes.Partial && (
-                <>
-                  <MachineConfigPoolsSelector
-                    machineConfigPools={pauseableMCPs}
-                    selected={machineConfigPoolsToPause}
-                    onChange={handleMCPSelectionChange}
-                  />
-                  <Alert
-                    variant="warning"
-                    isInline
-                    isPlain
-                    title={t('public~You must resume updates within 60 days to avoid failures.')}
-                    className="pf-v5-u-mb-md"
-                  >
-                    {!isManaged() && (
-                      <ExternalLink href={helpURL}>{t('public~Learn more')}</ExternalLink>
-                    )}
-                  </Alert>
-                </>
+                <MachineConfigPoolsSelector
+                  machineConfigPools={pauseableMCPs}
+                  selected={machineConfigPoolsToPause}
+                  onChange={handleMCPSelectionChange}
+                />
               )
             }
             data-test="update-cluster-modal-partial-update-radio"

frontend/public/components/utils/documentation.tsx

@@ -61,11 +61,6 @@ export const documentationURLs: documentationURLsType = {
       'html/updating_clusters/performing-a-cluster-update#updating-a-cluster-in-a-disconnected-environment',
     upstream: '', // intentionally blank as there is no upstream equivalent
   },
-  updateUsingCustomMachineConfigPools: {
-    downstream:
-      'html/updating_clusters/performing-a-cluster-update#update-using-custom-machine-config-pools',
-    upstream: 'updating/updating_a_cluster/update-using-custom-machine-config-pools.html',
-  },
   usingInsights: {
     downstream:
       'html/support/remote-health-monitoring-with-connected-clusters#using-insights-to-identify-issues-with-your-cluster',

frontend/public/locales/en/public.json

@@ -831,14 +831,12 @@
   "These versions are supported, but include known issues. Review the known issues before updating.": "These versions are supported, but include known issues. Review the known issues before updating.",
   "Updating this cluster to {{desiredVersion}} is supported, but includes known issues.  Review the known issues before updating.": "Updating this cluster to {{desiredVersion}} is supported, but includes known issues.  Review the known issues before updating.",
   "Update options": "Update options",
-  "Full cluster update allows you to update all your Nodes, but takes longer. Control plane only update allows you to pause worker and custom pool Nodes to accommodate your maintenance schedule, but you'll need to resume the non-control plane Node updates within 60 days to avoid failure.": "Full cluster update allows you to update all your Nodes, but takes longer. Control plane only update allows you to pause worker and custom pool Nodes to accommodate your maintenance schedule, but you'll need to resume the non-control plane Node updates within 60 days to avoid failure.",
+  "Full cluster update allows you to update all your Nodes, but takes longer. Control plane only update allows you to pause worker and custom pool Nodes to accommodate your maintenance schedule.": "Full cluster update allows you to update all your Nodes, but takes longer. Control plane only update allows you to pause worker and custom pool Nodes to accommodate your maintenance schedule.",
   "Full cluster update": "Full cluster update",
   "{{master}}, {{worker}}, and custom pool {{resource}} are updated concurrently. This might take longer, so make sure to allocate enough time for maintenance.": "{{master}}, {{worker}}, and custom pool {{resource}} are updated concurrently. This might take longer, so make sure to allocate enough time for maintenance.",
   "Paused {{worker}} or custom pool {{resource}} updates will be resumed. If you want to update only the control plane, select \"Control plane only update\" below.": "Paused {{worker}} or custom pool {{resource}} updates will be resumed. If you want to update only the control plane, select \"Control plane only update\" below.",
   "Control plane only update": "Control plane only update",
   "Pause {{worker}} or custom pool {{resource}} updates to accommodate your maintenance schedule.": "Pause {{worker}} or custom pool {{resource}} updates to accommodate your maintenance schedule.",
-  "You must resume updates within 60 days to avoid failures.": "You must resume updates within 60 days to avoid failures.",
-  "Learn more": "Learn more",
   "Update": "Update",
   "Selected columns will appear in the table.": "Selected columns will appear in the table.",
   "You can select up to {{MAX_VIEW_COLS}} columns": "You can select up to {{MAX_VIEW_COLS}} columns",
@@ -1921,6 +1919,7 @@
   "TCP socket (port)": "TCP socket (port)",
   "Admission Webhook Warning": "Admission Webhook Warning",
   "{{kind}} {{name}} violates policy {{warning}}": "{{kind}} {{name}} violates policy {{warning}}",
+  "Learn more": "Learn more",
   "Are you sure you want to remove <1>{{label}}</1> from navigation?": "Are you sure you want to remove <1>{{label}}</1> from navigation?",
   "Refer to your cluster administrator to know which network provider is used.": "Refer to your cluster administrator to know which network provider is used.",
   "Input error: selectors must start and end by a letter or number, and can only contain -, _, / or . Offending value: {{offendingSelector}}": "Input error: selectors must start and end by a letter or number, and can only contain -, _, / or . Offending value: {{offendingSelector}}",