From 08658279d1a25e514321fad9aa76b05e6a9d55e5 Mon Sep 17 00:00:00 2001 From: Dajahi Wiley <114682940+dwiley-akamai@users.noreply.github.com> Date: Wed, 16 Apr 2025 10:34:48 -0400 Subject: [PATCH] =?UTF-8?q?hotfix:=20[M3-9771]=20=E2=80=93=20Remove=20refe?= =?UTF-8?q?rences=20to=20disk=20encryption=20for=20LKE=20(#12034)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/manager/CHANGELOG.md | 6 ++++ packages/manager/package.json | 2 +- .../src/components/Encryption/constants.tsx | 3 -- .../Kubernetes/ClusterList/constants.ts | 6 ---- .../CreateCluster/NodePoolPanel.tsx | 31 ++----------------- .../NodePoolsDisplay/NodeTable.tsx | 12 +------ .../Linodes/LinodeEntityDetailBody.tsx | 14 ++------- 7 files changed, 12 insertions(+), 62 deletions(-) diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md index 601edf78d3e..65464ddcda5 100644 --- a/packages/manager/CHANGELOG.md +++ b/packages/manager/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [2025-04-16] - v1.139.1 + +### Removed: + +- References to disk encryption in relation to LKE ([#12034](https://github.com/linode/manager/pull/12034)) + ## [2025-04-08] - v1.139.0 diff --git a/packages/manager/package.json b/packages/manager/package.json index a4548a39b9e..0e61a70e548 100644 --- a/packages/manager/package.json +++ b/packages/manager/package.json @@ -2,7 +2,7 @@ "name": "linode-manager", "author": "Linode", "description": "The Linode Manager website", - "version": "1.139.0", + "version": "1.139.1", "private": true, "type": "module", "bugs": { diff --git a/packages/manager/src/components/Encryption/constants.tsx b/packages/manager/src/components/Encryption/constants.tsx index 0cb07201c56..7806d6e8225 100644 --- a/packages/manager/src/components/Encryption/constants.tsx +++ b/packages/manager/src/components/Encryption/constants.tsx @@ -41,9 +41,6 @@ export const DISK_ENCRYPTION_DEFAULT_DISTRIBUTED_INSTANCES = 'Distributed Compute Instances are encrypted. This setting can not be changed.'; // Guidance -export const DISK_ENCRYPTION_NODE_POOL_GUIDANCE_COPY = - 'To enable disk encryption, delete the node pool and create a new node pool. New node pools are always encrypted.'; - export const UNENCRYPTED_STANDARD_LINODE_GUIDANCE_COPY = 'Rebuild this Linode to enable or disable disk encryption.'; diff --git a/packages/manager/src/features/Kubernetes/ClusterList/constants.ts b/packages/manager/src/features/Kubernetes/ClusterList/constants.ts index 23fa758e6be..5cea5d5c40d 100644 --- a/packages/manager/src/features/Kubernetes/ClusterList/constants.ts +++ b/packages/manager/src/features/Kubernetes/ClusterList/constants.ts @@ -3,9 +3,3 @@ export const ADD_NODE_POOLS_DESCRIPTION = export const ADD_NODE_POOLS_ENTERPRISE_DESCRIPTION = 'Add groups of Linodes to your cluster. You can have a maximum of 100 Linodes per node pool.'; - -export const ADD_NODE_POOLS_ENCRYPTION_DESCRIPTION = - 'Node Pool data is encrypted at rest.'; - -export const ADD_NODE_POOLS_NO_ENCRYPTION_DESCRIPTION = - 'Node Pool data is not encrypted at rest for LKE Enterprise clusters.'; diff --git a/packages/manager/src/features/Kubernetes/CreateCluster/NodePoolPanel.tsx b/packages/manager/src/features/Kubernetes/CreateCluster/NodePoolPanel.tsx index 8d96b91b3e9..4ed734e2fb4 100644 --- a/packages/manager/src/features/Kubernetes/CreateCluster/NodePoolPanel.tsx +++ b/packages/manager/src/features/Kubernetes/CreateCluster/NodePoolPanel.tsx @@ -1,18 +1,13 @@ -import { useRegionsQuery } from '@linode/queries'; import { CircleProgress, ErrorState } from '@linode/ui'; -import { doesRegionSupportFeature } from '@linode/utilities'; import Grid from '@mui/material/Grid2'; import * as React from 'react'; -import { useFlags } from 'src/hooks/useFlags'; import { useIsAcceleratedPlansEnabled } from 'src/features/components/PlansPanel/utils'; import { extendType } from 'src/utilities/extendType'; import { ADD_NODE_POOLS_DESCRIPTION, - ADD_NODE_POOLS_ENCRYPTION_DESCRIPTION, ADD_NODE_POOLS_ENTERPRISE_DESCRIPTION, - ADD_NODE_POOLS_NO_ENCRYPTION_DESCRIPTION, } from '../ClusterList/constants'; import { KubernetesPlansPanel } from '../KubernetesPlansPanel/KubernetesPlansPanel'; @@ -73,12 +68,8 @@ const Panel = (props: NodePoolPanelProps) => { types, } = props; - const flags = useFlags(); - const { isAcceleratedLKEPlansEnabled } = useIsAcceleratedPlansEnabled(); - const regions = useRegionsQuery().data ?? []; - const [typeCountMap, setTypeCountMap] = React.useState>( new Map() ); @@ -99,27 +90,9 @@ const Panel = (props: NodePoolPanelProps) => { setSelectedType(planId); }; - // "Disk Encryption" indicates general availability and "LA Disk Encryption" indicates limited availability - const regionSupportsDiskEncryption = - doesRegionSupportFeature( - selectedRegionId ?? '', - regions, - 'Disk Encryption' - ) || - doesRegionSupportFeature( - selectedRegionId ?? '', - regions, - 'LA Disk Encryption' - ); - const getPlansPanelCopy = () => { - // TODO - LKE-E: Remove the 'ADD_NODE_POOLS_NO_ENCRYPTION_DESCRIPTION' copy once LDE is enabled on LKE-E. - if (selectedTier === 'enterprise') { - return `${ADD_NODE_POOLS_ENTERPRISE_DESCRIPTION} ${ADD_NODE_POOLS_NO_ENCRYPTION_DESCRIPTION}`; - } - // @TODO LDE: once LDE has been fully rolled out and is in GA in all regions, remove the feature flag condition - return regionSupportsDiskEncryption && flags.linodeDiskEncryption - ? `${ADD_NODE_POOLS_DESCRIPTION} ${ADD_NODE_POOLS_ENCRYPTION_DESCRIPTION}` + return selectedTier === 'enterprise' + ? ADD_NODE_POOLS_ENTERPRISE_DESCRIPTION : ADD_NODE_POOLS_DESCRIPTION; }; diff --git a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable.tsx b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable.tsx index a591f6844c3..c4865d7b1f8 100644 --- a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable.tsx +++ b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable.tsx @@ -7,7 +7,6 @@ import * as React from 'react'; import EmptyStateCloud from 'src/assets/icons/empty-state-cloud.svg'; import Lock from 'src/assets/icons/lock.svg'; import Unlock from 'src/assets/icons/unlock.svg'; -import { DISK_ENCRYPTION_NODE_POOL_GUIDANCE_COPY } from 'src/components/Encryption/constants'; import { useIsDiskEncryptionFeatureEnabled } from 'src/components/Encryption/utils'; import OrderBy from 'src/components/OrderBy'; import Paginate from 'src/components/Paginate'; @@ -272,17 +271,8 @@ export const NodeTable = React.memo((props: Props) => { regionSupportsDiskEncryption={ regionSupportsDiskEncryption } - /** - * M3-9517: Once LDE starts releasing regions with LDE enabled, LDE will still be disabled for the LKE-E LA launch, so hide this tooltip - * explaining how LDE can be enabled on LKE-E node pools. - * TODO - LKE-E: Clean up this enterprise cluster checks once LDE is enabled for LKE-E. - */ - tooltipText={ - clusterTier === 'enterprise' - ? undefined - : DISK_ENCRYPTION_NODE_POOL_GUIDANCE_COPY - } encryptionStatus={encryptionStatus} + tooltipText={undefined} /> ) : ( diff --git a/packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx b/packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx index 6b3ffc3a294..df09eab23b5 100644 --- a/packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx +++ b/packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx @@ -9,10 +9,7 @@ import { useHistory, useLocation } from 'react-router-dom'; import { HashLink } from 'react-router-hash-link'; import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip'; -import { - DISK_ENCRYPTION_NODE_POOL_GUIDANCE_COPY as UNENCRYPTED_LKE_LINODE_GUIDANCE_COPY, - UNENCRYPTED_STANDARD_LINODE_GUIDANCE_COPY, -} from 'src/components/Encryption/constants'; +import { UNENCRYPTED_STANDARD_LINODE_GUIDANCE_COPY } from 'src/components/Encryption/constants'; import { useIsDiskEncryptionFeatureEnabled } from 'src/components/Encryption/utils'; import { Link } from 'src/components/Link'; import { useKubernetesBetaEndpoint } from 'src/features/Kubernetes/kubeUtils'; @@ -258,16 +255,9 @@ export const LinodeEntityDetailBody = React.memo((props: BodyProps) => { flexDirection="row" >