Skip to content

Commit 0865827

Browse files
hotfix: [M3-9771] – Remove references to disk encryption for LKE (#12034)
1 parent 1987e96 commit 0865827

File tree

7 files changed

+12
-62
lines changed

7 files changed

+12
-62
lines changed

packages/manager/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## [2025-04-16] - v1.139.1
8+
9+
### Removed:
10+
11+
- References to disk encryption in relation to LKE ([#12034](https://github.com/linode/manager/pull/12034))
12+
713
## [2025-04-08] - v1.139.0
814

915

packages/manager/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "linode-manager",
33
"author": "Linode",
44
"description": "The Linode Manager website",
5-
"version": "1.139.0",
5+
"version": "1.139.1",
66
"private": true,
77
"type": "module",
88
"bugs": {

packages/manager/src/components/Encryption/constants.tsx

-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ export const DISK_ENCRYPTION_DEFAULT_DISTRIBUTED_INSTANCES =
4141
'Distributed Compute Instances are encrypted. This setting can not be changed.';
4242

4343
// Guidance
44-
export const DISK_ENCRYPTION_NODE_POOL_GUIDANCE_COPY =
45-
'To enable disk encryption, delete the node pool and create a new node pool. New node pools are always encrypted.';
46-
4744
export const UNENCRYPTED_STANDARD_LINODE_GUIDANCE_COPY =
4845
'Rebuild this Linode to enable or disable disk encryption.';
4946

packages/manager/src/features/Kubernetes/ClusterList/constants.ts

-6
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,3 @@ export const ADD_NODE_POOLS_DESCRIPTION =
33

44
export const ADD_NODE_POOLS_ENTERPRISE_DESCRIPTION =
55
'Add groups of Linodes to your cluster. You can have a maximum of 100 Linodes per node pool.';
6-
7-
export const ADD_NODE_POOLS_ENCRYPTION_DESCRIPTION =
8-
'Node Pool data is encrypted at rest.';
9-
10-
export const ADD_NODE_POOLS_NO_ENCRYPTION_DESCRIPTION =
11-
'Node Pool data is not encrypted at rest for LKE Enterprise clusters.';

packages/manager/src/features/Kubernetes/CreateCluster/NodePoolPanel.tsx

+2-29
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
import { useRegionsQuery } from '@linode/queries';
21
import { CircleProgress, ErrorState } from '@linode/ui';
3-
import { doesRegionSupportFeature } from '@linode/utilities';
42
import Grid from '@mui/material/Grid2';
53
import * as React from 'react';
6-
import { useFlags } from 'src/hooks/useFlags';
74

85
import { useIsAcceleratedPlansEnabled } from 'src/features/components/PlansPanel/utils';
96
import { extendType } from 'src/utilities/extendType';
107

118
import {
129
ADD_NODE_POOLS_DESCRIPTION,
13-
ADD_NODE_POOLS_ENCRYPTION_DESCRIPTION,
1410
ADD_NODE_POOLS_ENTERPRISE_DESCRIPTION,
15-
ADD_NODE_POOLS_NO_ENCRYPTION_DESCRIPTION,
1611
} from '../ClusterList/constants';
1712
import { KubernetesPlansPanel } from '../KubernetesPlansPanel/KubernetesPlansPanel';
1813

@@ -73,12 +68,8 @@ const Panel = (props: NodePoolPanelProps) => {
7368
types,
7469
} = props;
7570

76-
const flags = useFlags();
77-
7871
const { isAcceleratedLKEPlansEnabled } = useIsAcceleratedPlansEnabled();
7972

80-
const regions = useRegionsQuery().data ?? [];
81-
8273
const [typeCountMap, setTypeCountMap] = React.useState<Map<string, number>>(
8374
new Map()
8475
);
@@ -99,27 +90,9 @@ const Panel = (props: NodePoolPanelProps) => {
9990
setSelectedType(planId);
10091
};
10192

102-
// "Disk Encryption" indicates general availability and "LA Disk Encryption" indicates limited availability
103-
const regionSupportsDiskEncryption =
104-
doesRegionSupportFeature(
105-
selectedRegionId ?? '',
106-
regions,
107-
'Disk Encryption'
108-
) ||
109-
doesRegionSupportFeature(
110-
selectedRegionId ?? '',
111-
regions,
112-
'LA Disk Encryption'
113-
);
114-
11593
const getPlansPanelCopy = () => {
116-
// TODO - LKE-E: Remove the 'ADD_NODE_POOLS_NO_ENCRYPTION_DESCRIPTION' copy once LDE is enabled on LKE-E.
117-
if (selectedTier === 'enterprise') {
118-
return `${ADD_NODE_POOLS_ENTERPRISE_DESCRIPTION} ${ADD_NODE_POOLS_NO_ENCRYPTION_DESCRIPTION}`;
119-
}
120-
// @TODO LDE: once LDE has been fully rolled out and is in GA in all regions, remove the feature flag condition
121-
return regionSupportsDiskEncryption && flags.linodeDiskEncryption
122-
? `${ADD_NODE_POOLS_DESCRIPTION} ${ADD_NODE_POOLS_ENCRYPTION_DESCRIPTION}`
94+
return selectedTier === 'enterprise'
95+
? ADD_NODE_POOLS_ENTERPRISE_DESCRIPTION
12396
: ADD_NODE_POOLS_DESCRIPTION;
12497
};
12598

packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable.tsx

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import * as React from 'react';
77
import EmptyStateCloud from 'src/assets/icons/empty-state-cloud.svg';
88
import Lock from 'src/assets/icons/lock.svg';
99
import Unlock from 'src/assets/icons/unlock.svg';
10-
import { DISK_ENCRYPTION_NODE_POOL_GUIDANCE_COPY } from 'src/components/Encryption/constants';
1110
import { useIsDiskEncryptionFeatureEnabled } from 'src/components/Encryption/utils';
1211
import OrderBy from 'src/components/OrderBy';
1312
import Paginate from 'src/components/Paginate';
@@ -272,17 +271,8 @@ export const NodeTable = React.memo((props: Props) => {
272271
regionSupportsDiskEncryption={
273272
regionSupportsDiskEncryption
274273
}
275-
/**
276-
* 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
277-
* explaining how LDE can be enabled on LKE-E node pools.
278-
* TODO - LKE-E: Clean up this enterprise cluster checks once LDE is enabled for LKE-E.
279-
*/
280-
tooltipText={
281-
clusterTier === 'enterprise'
282-
? undefined
283-
: DISK_ENCRYPTION_NODE_POOL_GUIDANCE_COPY
284-
}
285274
encryptionStatus={encryptionStatus}
275+
tooltipText={undefined}
286276
/>
287277
</Box>
288278
) : (

packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx

+2-12
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ import { useHistory, useLocation } from 'react-router-dom';
99
import { HashLink } from 'react-router-hash-link';
1010

1111
import { CopyTooltip } from 'src/components/CopyTooltip/CopyTooltip';
12-
import {
13-
DISK_ENCRYPTION_NODE_POOL_GUIDANCE_COPY as UNENCRYPTED_LKE_LINODE_GUIDANCE_COPY,
14-
UNENCRYPTED_STANDARD_LINODE_GUIDANCE_COPY,
15-
} from 'src/components/Encryption/constants';
12+
import { UNENCRYPTED_STANDARD_LINODE_GUIDANCE_COPY } from 'src/components/Encryption/constants';
1613
import { useIsDiskEncryptionFeatureEnabled } from 'src/components/Encryption/utils';
1714
import { Link } from 'src/components/Link';
1815
import { useKubernetesBetaEndpoint } from 'src/features/Kubernetes/kubeUtils';
@@ -258,16 +255,9 @@ export const LinodeEntityDetailBody = React.memo((props: BodyProps) => {
258255
flexDirection="row"
259256
>
260257
<EncryptedStatus
261-
/**
262-
* 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
263-
* explaining how LDE can be enabled on LKE-E node pools.
264-
* TODO - LKE-E: Clean up this enterprise cluster checks once LDE is enabled for LKE-E.
265-
*/
266258
tooltipText={
267-
isLKELinode && cluster?.tier === 'enterprise'
259+
isLKELinode
268260
? undefined
269-
: isLKELinode
270-
? UNENCRYPTED_LKE_LINODE_GUIDANCE_COPY
271261
: UNENCRYPTED_STANDARD_LINODE_GUIDANCE_COPY
272262
}
273263
encryptionStatus={encryptionStatus}

0 commit comments

Comments
 (0)