Skip to content

Commit e0dda68

Browse files
authored
Merge pull request #12255 from linode/staging
Release v1.142.1 - staging → master
2 parents 70b4896 + f5e7c9c commit e0dda68

File tree

5 files changed

+21
-3
lines changed

5 files changed

+21
-3
lines changed

packages/manager/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
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-05-20] - v1.142.1
8+
9+
### Fixed:
10+
11+
- Incorrect LKE cluster pricing ([#12253](https://github.com/linode/manager/pull/12253))
12+
713
## [2025-05-20] - v1.142.0
814

915
### Changed:

packages/manager/cypress/e2e/core/kubernetes/lke-create.spec.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ describe('LKE Cluster Creation', () => {
295295
// We're taking a naive approach here by confirming that at least one
296296
// instance of the pool appears in the checkout bar.
297297
cy.findAllByText(`${planName} Plan`).first().should('be.visible');
298+
299+
// Confirm LKE-E line item is NOT shown
300+
cy.findByText('LKE Enterprise').should('not.exist');
298301
});
299302
// Expected information on the LKE cluster summary page.
300303
monthPrice = getTotalClusterPrice({

packages/manager/package.json

Lines changed: 1 addition & 1 deletion
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.142.0",
5+
"version": "1.142.1",
66
"private": true,
77
"type": "module",
88
"bugs": {

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,13 @@ export const CreateCluster = () => {
594594
>
595595
<KubeCheckoutBar
596596
createCluster={createCluster}
597-
enterprisePrice={lkeEnterpriseType?.price.monthly ?? undefined}
597+
enterprisePrice={
598+
isLkeEnterpriseLAFeatureEnabled &&
599+
selectedTier === 'enterprise' &&
600+
lkeEnterpriseType?.price.monthly
601+
? lkeEnterpriseType?.price.monthly
602+
: undefined
603+
}
598604
hasAgreed={hasAgreed}
599605
highAvailability={highAvailability}
600606
highAvailabilityPrice={

packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeClusterSpecs.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ export const KubeClusterSpecs = React.memo((props: Props) => {
8888
const highAvailabilityPrice = cluster.control_plane.high_availability
8989
? getDCSpecificPriceByType({ regionId: region?.id, type: lkeHAType })
9090
: undefined;
91-
const enterprisePrice = lkeEnterpriseType?.price.monthly ?? undefined;
91+
const enterprisePrice =
92+
cluster.tier === 'enterprise' && lkeEnterpriseType?.price.monthly
93+
? lkeEnterpriseType?.price.monthly
94+
: undefined;
9295

9396
const kubeSpecsLeft = [
9497
`Version ${cluster.k8s_version}`,

0 commit comments

Comments
 (0)