openshift · tvu20 · Aug 3, 2022
diff --git a/frontend/packages/console-app/locales/en/console-app.json b/frontend/packages/console-app/locales/en/console-app.json
@@ -172,7 +172,7 @@
   "Loaded plugins": "Loaded plugins",
   "{{enabledCount}}/{{totalCount}} enabled": "{{enabledCount}}/{{totalCount}} enabled",
   "View all": "View all",
-  "Single master": "Single master",
+  "Single control plane node": "Single control plane node",
   "Incompatible file type": "Incompatible file type",
   "{{fileName}} cannot be uploaded. Only {{fileExtensions}} files are supported currently. Try another file.": "{{fileName}} cannot be uploaded. Only {{fileExtensions}} files are supported currently. Try another file.",
   "Clone": "Clone",
@@ -343,7 +343,7 @@
   "{{formattedCores}} cores / {{totalCores}} cores": "{{formattedCores}} cores / {{totalCores}} cores",
   "Ready": "Ready",
   "Not Ready": "Not Ready",
-  "Master": "Master",
+  "Control plane": "Control plane",
   "Worker": "Worker",
   "This node's {{conditionDescription}}. Performance may be degraded.": "This node's {{conditionDescription}}. Performance may be degraded.",
   "<0>To use host binaries, run <1>chroot /host</1></0>": "<0>To use host binaries, run <1>chroot /host</1></0>",

diff --git a/frontend/packages/console-app/src/components/dashboards-page/status.ts b/frontend/packages/console-app/src/components/dashboards-page/status.ts
@@ -106,7 +106,7 @@ export const getControlPlaneHealth: PrometheusHealthHandler = (
 
   const singleMasterMsg =
     worstStatus.state === HealthState.OK && isSingleNode(infrastructure)
-      ? t('console-app~Single master')
+      ? t('console-app~Single control plane node')
       : undefined;
 
   return {

diff --git a/frontend/packages/console-app/src/components/nodes/NodesPage.tsx b/frontend/packages/console-app/src/components/nodes/NodesPage.tsx
@@ -511,8 +511,8 @@ const NodesPage = connect<{}, MapDispatchToProps>(
         isMatch: getNodeRoleMatch,
         items: [
           {
-            id: 'master',
-            title: t('console-app~Master'),
+            id: 'control plane',
+            title: t('console-app~Control plane'),
           },
           {
             id: 'worker',

diff --git a/frontend/packages/console-shared/src/selectors/node.ts b/frontend/packages/console-shared/src/selectors/node.ts
@@ -7,7 +7,7 @@ const NODE_ROLE_PREFIX = 'node-role.kubernetes.io/';
 
 export const getNodeRoles = (node: NodeKind): string[] => {
   const labels = _.get(node, 'metadata.labels');
-  return _.reduce(
+  const rolesList = _.reduce(
     labels,
     (acc: string[], v: string, k: string) => {
       if (k.startsWith(NODE_ROLE_PREFIX)) {
@@ -17,10 +17,14 @@ export const getNodeRoles = (node: NodeKind): string[] => {
     },
     [],
   );
+  return rolesList.map((e) => {
+    if (e === 'master') return 'control plane';
+    return e;
+  });
 };
 
 export const getNodeRole = (node: NodeKind): string =>
-  getNodeRoles(node).includes('master') ? 'master' : 'worker';
+  getNodeRoles(node).includes('control plane') ? 'control plane' : 'worker';
 
 export const getNodeRoleMatch = (node: NodeKind, role: string): boolean => {
   const roles = getNodeRoles(node);

diff --git a/...tend/packages/local-storage-operator-plugin/src/components/disks-list/disks-list-page.tsx b/...tend/packages/local-storage-operator-plugin/src/components/disks-list/disks-list-page.tsx
@@ -159,7 +159,7 @@ export const NodesDisksListPage: React.FC<NodesDisksListPageProps> = ({
   const EmptyMsg = () => (
     <EmptyState variant={EmptyStateVariant.large}>
       <p>{t('lso-plugin~Disks Not Found')}</p>
-      {csvName && operatorNs && nodeRole !== 'master' && (
+      {csvName && operatorNs && nodeRole !== 'control plane' && (
         <Button
           isDisabled={lvdRequestInProgress}
           isLoading={lvdRequestInProgress}

diff --git a/frontend/packages/pipelines-plugin/locales/en/pipelines-plugin.json b/frontend/packages/pipelines-plugin/locales/en/pipelines-plugin.json
@@ -278,7 +278,7 @@
   "Pipeline could not be started automatically": "Pipeline could not be started automatically",
   "View all {{pipelineRunsLength}}": "View all {{pipelineRunsLength}}",
   "Name of the cluster.": "Name of the cluster.",
-  "Host URL of the master node.": "Host URL of the master node.",
+  "Host URL of the control plane node.": "Host URL of the control plane node.",
   "Username": "Username",
   "The user with access to the cluster.": "The user with access to the cluster.",
   "Password": "Password",

diff --git a/...es/pipelines-plugin/src/components/pipelines/pipeline-resource/PipelineClusterOptions.tsx b/...es/pipelines-plugin/src/components/pipelines/pipeline-resource/PipelineClusterOptions.tsx
@@ -20,7 +20,7 @@ const PipelineClusterOptions: React.FC<PipelineClusterOptionsProps> = ({ prefixN
         type={TextInputTypes.text}
         name={`${prefixName}.params.url`}
         label={t('pipelines-plugin~URL')}
-        helpText={t('pipelines-plugin~Host URL of the master node.')}
+        helpText={t('pipelines-plugin~Host URL of the control plane node.')}
         required
       />
       <InputField

diff --git a/frontend/public/components/cluster-settings/cluster-settings.tsx b/frontend/public/components/cluster-settings/cluster-settings.tsx
@@ -616,11 +616,12 @@ export const NodesUpdatesGroup: React.FC<NodesUpdatesGroupProps> = ({
     kind: referenceForModel(MachineConfigModel),
     name: machineConfigPool?.spec?.configuration?.name,
   });
+  const mcpName = machineConfigPool?.metadata?.name;
   const machineConfigPoolIsEditable = useAccessReview({
     group: MachineConfigPoolModel.apiGroup,
     resource: MachineConfigPoolModel.plural,
     verb: 'patch',
-    name,
+    name: mcpName,
   });
   const isMaster = isMCPMaster(machineConfigPool);
   const isPaused = isMCPPaused(machineConfigPool);
@@ -644,9 +645,7 @@ export const NodesUpdatesGroup: React.FC<NodesUpdatesGroupProps> = ({
     : machineConfigOperatorLoaded && renderedConfigLoaded && (
         <UpdatesGroup divided={divided}>
           <UpdatesType>
-            <Link
-              to={`/k8s/cluster/nodes?rowFilter-node-role=${machineConfigPool?.metadata?.name}`}
-            >
+            <Link to={`/k8s/cluster/nodes?rowFilter-node-role=${mcpName}`}>
               {`${name} ${NodeModel.labelPlural}`}
             </Link>
             {!isMaster && (

diff --git a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/details-card.tsx b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/details-card.tsx
@@ -242,7 +242,7 @@ export const DetailsCard = withDashboardResources(
                       isLoading={false}
                       valueClassName="co-select-to-copy"
                     >
-                      {t('public~No (single master)')}
+                      {t('public~No (single control plane node)')}
                     </OverviewDetailItem>
                   )}
                   {detailItemsExtensions.map((e) => {

diff --git a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/utilization-card.tsx b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/utilization-card.tsx
@@ -235,19 +235,26 @@ const UtilizationCardNodeFilter: React.FC<UtilizationCardNodeFilterProps> = ({
   });
   const onToggle = (open: boolean): void => setIsOpen(open);
 
+  const selectedNodesUpdated = selectedNodes.map((item) =>
+    item === 'master' ? 'control plane' : item,
+  );
+
   return (
     <Select
       variant={SelectVariant.checkbox}
       aria-label={t('public~Filter by Node type')}
       onToggle={onToggle}
       onSelect={onNodeSelect}
-      selections={selectedNodes}
+      selections={selectedNodesUpdated}
       isOpen={isOpen}
       placeholderText={t('public~Filter by Node type')}
       isPlain
     >
       {sortedMCPs.map((mcp) => (
-        <SelectOption key={mcp.metadata.name} value={mcp.metadata.name} />
+        <SelectOption
+          key={mcp.metadata.name}
+          value={mcp.metadata.name === 'master' ? 'control plane' : mcp.metadata.name}
+        />
       ))}
     </Select>
   );
@@ -273,10 +280,11 @@ export const UtilizationCard = () => {
 
   // TODO: add `useUserSettingsCompatibility` to store selectedNodes
   const onNodeSelect = (event: React.MouseEvent, selection: string) => {
-    if (selectedNodes.includes(selection)) {
-      setSelectedNodes(selectedNodes.filter((item) => item !== selection));
+    const selectionUpdated = selection === 'control plane' ? 'master' : selection;
+    if (selectedNodes.includes(selectionUpdated)) {
+      setSelectedNodes(selectedNodes.filter((item) => item !== selectionUpdated));
     } else {
-      setSelectedNodes([...selectedNodes, selection]);
+      setSelectedNodes([...selectedNodes, selectionUpdated]);
     }
   };
   // if no filter is applied, show all nodes using regex

diff --git a/frontend/public/components/modals/cluster-update-modal.tsx b/frontend/public/components/modals/cluster-update-modal.tsx
@@ -251,7 +251,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. Partial cluster update allows you to pause worker and custom pool Nodes to accommodate your maintenance schedule, but you'll need to resume the non-master node update within 60 days to avoid failure.",
+                "public~Full cluster update allows you to update all your nodes, but takes longer. Partial cluster 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 update within 60 days to avoid failure.",
               )}
             </FieldLevelHelp>
           </label>

diff --git a/frontend/public/locales/en/public.json b/frontend/public/locales/en/public.json
@@ -393,7 +393,7 @@
   "Infrastructure provider": "Infrastructure provider",
   "Update channel": "Update channel",
   "Control plane high availability": "Control plane high availability",
-  "No (single master)": "No (single master)",
+  "No (single control plane node)": "No (single control plane node)",
   "Configure alert receivers": "Configure alert receivers",
   "View all steps in documentation": "View all steps in documentation",
   "Set up your cluster": "Set up your cluster",
@@ -777,7 +777,7 @@
   "These versions are supported, but not recommended. Review the known risks before updating.": "These versions are supported, but not recommended. Review the known risks before updating.",
   "Updating this cluster to {{desiredVersion}} is supported, but not recommended as it might not be optimized for some components in this cluster.": "Updating this cluster to {{desiredVersion}} is supported, but not recommended as it might not be optimized for some components in this cluster.",
   "Update options": "Update options",
-  "Full cluster update allows you to update all your nodes, but takes longer. Partial cluster update allows you to pause worker and custom pool Nodes to accommodate your maintenance schedule, but you'll need to resume the non-master node update within 60 days to avoid failure.": "Full cluster update allows you to update all your nodes, but takes longer. Partial cluster update allows you to pause worker and custom pool Nodes to accommodate your maintenance schedule, but you'll need to resume the non-master node update within 60 days to avoid failure.",
+  "Full cluster update allows you to update all your nodes, but takes longer. Partial cluster 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 update within 60 days to avoid failure.": "Full cluster update allows you to update all your nodes, but takes longer. Partial cluster 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 update within 60 days to avoid failure.",
   "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 \"Partial cluster update\" below.": "Paused {{worker}} or custom pool {{resource}} updates will be resumed. If you want to update only the control plane, select \"Partial cluster update\" below.",

diff --git a/frontend/public/module/k8s/cluster-settings.ts b/frontend/public/module/k8s/cluster-settings.ts
@@ -306,7 +306,7 @@ export enum NodeTypes {
  * of the Node names for display purposes
  */
 export enum NodeTypeNames {
-  Master = 'Master',
+  Master = 'Control plane',
   Worker = 'Worker',
 }