upcoming: [M3-9042] - Update LKE cluster details kube specs for LKE-E…

… monthly pricing (#11475) * Update price on cluster details page to include enterprise * Update test coverage to confirm LKE-E creation details * Added changeset: Update LKE cluster details kube specs for LKE-E monthly pricing
linode · Jan 6, 2025 · 3e74aca · 3e74aca
1 parent 32bb497
commit 3e74aca
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 8 deletions.
diff --git a/packages/manager/.changeset/pr-11475-upcoming-features-1735939864502.md b/packages/manager/.changeset/pr-11475-upcoming-features-1735939864502.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Update LKE cluster details kube specs for LKE-E monthly pricing ([#11475](https://github.com/linode/manager/pull/11475))
diff --git a/packages/manager/cypress/e2e/core/kubernetes/lke-create.spec.ts b/packages/manager/cypress/e2e/core/kubernetes/lke-create.spec.ts
@@ -11,6 +11,7 @@ import {
   regionFactory,
   nodePoolFactory,
   kubeLinodeFactory,
+  lkeHighAvailabilityTypeFactory,
 } from 'src/factories';
 import {
   mockCreateCluster,
@@ -126,7 +127,10 @@ const mockedLKEHAClusterPrices: PriceType[] = [
     transfer: 0,
   },
 ];
-const mockedLKEEnterprisePrices = [lkeEnterpriseTypeFactory.build()];
+const mockedLKEEnterprisePrices = [
+  lkeHighAvailabilityTypeFactory.build(),
+  lkeEnterpriseTypeFactory.build(),
+];
 const clusterPlans: LkePlanDescription[] = [
   {
     nodeCount: dedicatedNodeCount,
@@ -1068,16 +1072,18 @@ describe('LKE Cluster Creation with LKE-E', () => {
      * - Confirms an LKE-E supported region can be selected
      * - Confirms an LKE-E supported k8 version can be selected
      * - Confirms the checkout bar displays the correct LKE-E info
-     * - Confirms an enterprise cluster can be created
+     * - Confirms an enterprise cluster can be created with the correct chip, version, and price
      */
     it('creates an LKE-E cluster with the account capability', () => {
       const clusterLabel = randomLabel();
       const mockedEnterpriseCluster = kubernetesClusterFactory.build({
         label: clusterLabel,
-        region: clusterRegion.id,
+        region: 'us-iad',
         tier: 'enterprise',
         k8s_version: latestEnterpriseTierKubernetesVersion.id,
       });
+      const mockedEnterpriseClusterPools = [nanodeMemoryPool, dedicatedCpuPool];
+      const mockedLKEClusterTypes = [dedicatedType, nanodeType];
 
       mockGetAccount(
         accountFactory.build({
@@ -1090,6 +1096,7 @@ describe('LKE Cluster Creation with LKE-E', () => {
       mockGetKubernetesVersions([latestKubernetesVersion]).as(
         'getKubernetesVersions'
       );
+      mockGetLinodeTypes(mockedLKEClusterTypes).as('getLinodeTypes');
       mockGetLKEClusterTypes(mockedLKEEnterprisePrices).as(
         'getLKEEnterpriseClusterTypes'
       );
@@ -1108,6 +1115,12 @@ describe('LKE Cluster Creation with LKE-E', () => {
       mockGetCluster(mockedEnterpriseCluster).as('getCluster');
       mockCreateCluster(mockedEnterpriseCluster).as('createCluster');
       mockGetClusters([mockedEnterpriseCluster]).as('getClusters');
+      mockGetClusterPools(
+        mockedEnterpriseCluster.id,
+        mockedEnterpriseClusterPools
+      ).as('getClusterPools');
+      mockGetDashboardUrl(mockedEnterpriseCluster.id).as('getDashboardUrl');
+      mockGetApiEndpoints(mockedEnterpriseCluster.id).as('getApiEndpoints');
 
       cy.visitWithLogin('/kubernetes/clusters');
       cy.wait(['@getAccount']);
@@ -1222,8 +1235,8 @@ describe('LKE Cluster Creation with LKE-E', () => {
           cy.findByText(`Dedicated 4 GB Plan`).should('be.visible');
           cy.findByText('$144.00').should('be.visible');
           cy.findByText(`Linode 2 GB Plan`).should('be.visible');
-          cy.findByText('$36.00').should('be.visible');
-          cy.findByText('$480.00').should('be.visible');
+          cy.findByText('$15.00').should('be.visible');
+          cy.findByText('$459.00').should('be.visible');
 
           ui.button
             .findByTitle('Create Cluster')
@@ -1233,16 +1246,28 @@ describe('LKE Cluster Creation with LKE-E', () => {
         });
 
       // Wait for LKE cluster to be created and confirm that we are redirected
-      // to the cluster summary page, where the cluster has an LKE-E version.
-      cy.wait(['@getCluster', '@createCluster']);
+      // to the cluster summary page.
+      cy.wait([
+        '@getCluster',
+        '@getClusterPools',
+        '@createCluster',
+        '@getLKEEnterpriseClusterTypes',
+        '@getLinodeTypes',
+        '@getDashboardUrl',
+        '@getApiEndpoints',
+      ]);
+
       cy.url().should(
         'endWith',
         `/kubernetes/clusters/${mockedEnterpriseCluster.id}/summary`
       );
 
+      // Confirm the LKE-E cluster has the correct enterprise chip, version, and pricing.
+      cy.findByText('ENTERPRISE').should('be.visible');
       cy.findByText(
         `Version ${latestEnterpriseTierKubernetesVersion.id}`
       ).should('be.visible');
+      cy.findByText('$459.00/month').should('be.visible');
     });
 
     it('disables the Cluster Type selection without the LKE-E account capability', () => {

diff --git a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeClusterSpecs.tsx b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubeClusterSpecs.tsx
@@ -68,7 +68,7 @@ export const KubeClusterSpecs = React.memo((props: Props) => {
     data: kubernetesHighAvailabilityTypesData,
     isError: isErrorKubernetesTypes,
     isLoading: isLoadingKubernetesTypes,
-  } = useKubernetesTypesQuery();
+  } = useKubernetesTypesQuery(cluster.tier === 'enterprise');
 
   const matchesColGapBreakpointDown = useMediaQuery(
     theme.breakpoints.down(theme.breakpoints.values.lg)
@@ -78,12 +78,17 @@ export const KubeClusterSpecs = React.memo((props: Props) => {
     (type) => type.id === 'lke-ha'
   );
 
+  const lkeEnterpriseType = kubernetesHighAvailabilityTypesData?.find(
+    (type) => type.id === 'lke-e'
+  );
+
   const region = regions?.find((r) => r.id === cluster.region);
   const displayRegion = region?.label ?? cluster.region;
 
   const highAvailabilityPrice = cluster.control_plane.high_availability
     ? getDCSpecificPriceByType({ regionId: region?.id, type: lkeHAType })
     : undefined;
+  const enterprisePrice = lkeEnterpriseType?.price.monthly ?? undefined;
 
   const kubeSpecsLeft = [
     `Version ${cluster.k8s_version}`,
@@ -107,6 +112,7 @@ export const KubeClusterSpecs = React.memo((props: Props) => {
       </>
     ) : (
       `$${getTotalClusterPrice({
+        enterprisePrice: enterprisePrice,
         highAvailabilityPrice: highAvailabilityPrice
           ? Number(highAvailabilityPrice)
           : undefined,