Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/manager/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion packages/manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
3 changes: 0 additions & 3 deletions packages/manager/src/components/Encryption/constants.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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.';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.';
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -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<Map<string, number>>(
new Map()
);
Expand All @@ -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;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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}
/>
</Box>
) : (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -258,16 +255,9 @@ export const LinodeEntityDetailBody = React.memo((props: BodyProps) => {
flexDirection="row"
>
<EncryptedStatus
/**
* 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={
isLKELinode && cluster?.tier === 'enterprise'
isLKELinode
? undefined
: isLKELinode
? UNENCRYPTED_LKE_LINODE_GUIDANCE_COPY
: UNENCRYPTED_STANDARD_LINODE_GUIDANCE_COPY
}
encryptionStatus={encryptionStatus}
Expand Down
Loading