upcoming: [M3-8881, M3-8885] - Add and update beta endpoints and queries for LKE-E (#11302)

* Update types for LKE-E

* Update apiv4 endpoints for LKE-E

* Update queries to use LKE-E beta endpoints

* Add changesets

* Address feedback: fix missing tier param in path

* Add 'Beta' to endpoint name for consistency

* Address feedback: use string for beta query key instead of boolean

Author: mjac0bs

packages/api-v4/.changeset/pr-11302-upcoming-features-1732208207646.md

@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Upcoming Features
+---
+
+Add new types and v4beta endpoints for LKE-E ([#11302](https://github.com/linode/manager/pull/11302))

packages/api-v4/src/kubernetes/kubernetes.ts

@@ -16,6 +16,7 @@ import type {
   KubernetesDashboardResponse,
   KubernetesVersion,
   KubernetesControlPlaneACLPayload,
+  KubernetesTieredVersion,
 } from './types';
 
 /**
@@ -31,6 +32,19 @@ export const getKubernetesClusters = (params?: Params, filters?: Filter) =>
     setURL(`${API_ROOT}/lke/clusters`)
   );
 
+/**
+ * getKubernetesClustersBeta
+ *
+ * Gets a list of a user's Kubernetes clusters from beta API
+ */
+export const getKubernetesClustersBeta = (params?: Params, filters?: Filter) =>
+  Request<Page<KubernetesCluster>>(
+    setMethod('GET'),
+    setParams(params),
+    setXFilter(filters),
+    setURL(`${BETA_API_ROOT}/lke/clusters`)
+  );
+
 /**
  * getKubernetesCluster
  *
@@ -69,11 +83,12 @@ export const createKubernetesCluster = (data: CreateKubeClusterPayload) => {
 /**
  * createKubernetesClustersBeta
  *
- * Create a new cluster with the BETA api whenever feature flag for APL is enabled
- * and APL is set to enabled in the UI
+ * Create a new cluster with the beta API:
+ * 1. When the feature flag for APL is enabled and APL is set to enabled in the UI
+ * 2. When the LKE-E feature is enabled
  *
  * duplicated function of createKubernetesCluster
- * necessary to call BETA_API_ROOT in a seperate function based on feature flag
+ * necessary to call BETA_API_ROOT in a separate function based on feature flag
  */
 export const createKubernetesClusterBeta = (data: CreateKubeClusterPayload) => {
   return Request<KubernetesCluster>(
@@ -154,6 +169,24 @@ export const getKubernetesVersions = (params?: Params, filters?: Filter) =>
     setURL(`${API_ROOT}/lke/versions`)
   );
 
+/** getKubernetesTieredVersionsBeta
+ *
+ * Returns a paginated list of available Kubernetes tiered versions from the beta API.
+ *
+ */
+
+export const getKubernetesTieredVersionsBeta = (
+  tier: string,
+  params?: Params,
+  filters?: Filter
+) =>
+  Request<Page<KubernetesTieredVersion>>(
+    setMethod('GET'),
+    setXFilter(filters),
+    setParams(params),
+    setURL(`${BETA_API_ROOT}/lke/versions/${encodeURIComponent(tier)}`)
+  );
+
 /** getKubernetesVersion
  *
  * Returns a single Kubernetes version by ID.
@@ -166,6 +199,25 @@ export const getKubernetesVersion = (versionID: string) =>
     setURL(`${API_ROOT}/lke/versions/${encodeURIComponent(versionID)}`)
   );
 
+/** getKubernetesTieredVersionBeta
+ *
+ * Returns a single tiered Kubernetes version by ID from the beta API.
+ *
+ */
+
+export const getKubernetesTieredVersionBeta = (
+  tier: string,
+  versionID: string
+) =>
+  Request<KubernetesTieredVersion>(
+    setMethod('GET'),
+    setURL(
+      `${BETA_API_ROOT}/lke/versions/${encodeURIComponent(
+        tier
+      )}/${encodeURIComponent(versionID)}`
+    )
+  );
+
 /** getKubernetesClusterEndpoint
  *
  * Returns the endpoint URL for a single Kubernetes cluster by ID.

packages/api-v4/src/kubernetes/types.ts

@@ -1,5 +1,7 @@
 import type { EncryptionStatus } from '../linodes';
 
+export type KubernetesTier = 'standard' | 'enterprise';
+
 export interface KubernetesCluster {
   created: string;
   updated: string;
@@ -11,6 +13,10 @@ export interface KubernetesCluster {
   tags: string[];
   control_plane: ControlPlaneOptions;
   apl_enabled?: boolean; // this is not the ideal solution, but a necessary compromise to prevent a lot of duplicated code.
+  /** Marked as 'optional' in this existing interface to prevent duplicated code for beta functionality, in line with the apl_enabled approach.
+   * @todo LKE-E - Make this field required once LKE-E is in GA. tier defaults to 'standard' in the API.
+   */
+  tier?: KubernetesTier;
 }
 
 export interface KubeNodePoolResponse {
@@ -52,6 +58,11 @@ export interface KubernetesVersion {
   id: string;
 }
 
+export interface KubernetesTieredVersion {
+  id: string;
+  tier: KubernetesTier;
+}
+
 export interface KubernetesEndpointResponse {
   endpoint: string;
 }
@@ -85,4 +96,5 @@ export interface CreateKubeClusterPayload {
   k8s_version?: string; // Will be caught by Yup if undefined
   control_plane?: ControlPlaneOptions;
   apl_enabled?: boolean; // this is not the ideal solution, but a necessary compromise to prevent a lot of duplicated code.
+  tier?: KubernetesTier; // For LKE-E: Will be assigned 'standard' by the API if not provided
 }

packages/manager/.changeset/pr-11302-upcoming-features-1732208275706.md

@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Add and update kubernetes queries for LKE-E beta endpoints ([#11302](https://github.com/linode/manager/pull/11302))

packages/manager/src/queries/kubernetes.ts

@@ -11,6 +11,8 @@ import {
   getKubernetesClusterDashboard,
   getKubernetesClusterEndpoints,
   getKubernetesClusters,
+  getKubernetesClustersBeta,
+  getKubernetesTieredVersionsBeta,
   getKubernetesTypes,
   getKubernetesVersions,
   getNodePools,
@@ -30,7 +32,10 @@ import {
   useQueryClient,
 } from '@tanstack/react-query';
 
-import { useAPLAvailability } from 'src/features/Kubernetes/kubeUtils';
+import {
+  useAPLAvailability,
+  useIsLkeEnterpriseEnabled,
+} from 'src/features/Kubernetes/kubeUtils';
 import { getAll } from 'src/utilities/getAll';
 
 import { queryPresets } from './base';
@@ -44,6 +49,7 @@ import type {
   KubernetesControlPlaneACLPayload,
   KubernetesDashboardResponse,
   KubernetesEndpointResponse,
+  KubernetesTieredVersion,
   KubernetesVersion,
   UpdateNodePoolData,
 } from '@linode/api-v4';
@@ -66,7 +72,7 @@ export const kubernetesQueries = createQueryKeys('kubernetes', {
         queryFn: useBetaEndpoint
           ? () => getKubernetesClusterBeta(id)
           : () => getKubernetesCluster(id),
-        queryKey: [useBetaEndpoint],
+        queryKey: [useBetaEndpoint ? 'v4beta' : 'v4'],
       }),
       dashboard: {
         queryFn: () => getKubernetesClusterDashboard(id),
@@ -93,17 +99,31 @@ export const kubernetesQueries = createQueryKeys('kubernetes', {
   }),
   lists: {
     contextQueries: {
-      all: {
-        queryFn: () => getAllKubernetesClusters(),
-        queryKey: null,
-      },
-      paginated: (params: Params, filter: Filter) => ({
-        queryFn: () => getKubernetesClusters(params, filter),
-        queryKey: [params, filter],
+      all: (useBetaEndpoint: boolean = false) => ({
+        queryFn: () =>
+          useBetaEndpoint
+            ? getAllKubernetesClustersBeta()
+            : getAllKubernetesClusters(),
+        queryKey: [useBetaEndpoint ? 'v4beta' : 'v4'],
+      }),
+      paginated: (
+        params: Params,
+        filter: Filter,
+        useBetaEndpoint: boolean = false
+      ) => ({
+        queryFn: () =>
+          useBetaEndpoint
+            ? getKubernetesClustersBeta()
+            : getKubernetesClusters(params, filter),
+        queryKey: [params, filter, useBetaEndpoint ? 'v4beta' : 'v4'],
       }),
     },
     queryKey: null,
   },
+  tieredVersions: (tier: string) => ({
+    queryFn: () => getAllKubernetesTieredVersionsBeta(tier),
+    queryKey: [tier],
+  }),
   types: {
     queryFn: () => getAllKubernetesTypes(),
     queryKey: null,
@@ -116,9 +136,11 @@ export const kubernetesQueries = createQueryKeys('kubernetes', {
 
 export const useKubernetesClusterQuery = (id: number) => {
   const { isLoading: isAPLAvailabilityLoading, showAPL } = useAPLAvailability();
+  const { isLkeEnterpriseLAEnabled } = useIsLkeEnterpriseEnabled();
+  const useBetaEndpoint = showAPL || isLkeEnterpriseLAEnabled;
 
   return useQuery<KubernetesCluster, APIError[]>({
-    ...kubernetesQueries.cluster(id)._ctx.cluster(showAPL),
+    ...kubernetesQueries.cluster(id)._ctx.cluster(useBetaEndpoint),
     enabled: !isAPLAvailabilityLoading,
   });
 };
@@ -128,8 +150,11 @@ export const useKubernetesClustersQuery = (
   filter: Filter,
   enabled = true
 ) => {
+  const { isLkeEnterpriseLAEnabled } = useIsLkeEnterpriseEnabled();
+  const useBetaEndpoint = isLkeEnterpriseLAEnabled;
+
   return useQuery<ResourcePage<KubernetesCluster>, APIError[]>({
-    ...kubernetesQueries.lists._ctx.paginated(params, filter),
+    ...kubernetesQueries.lists._ctx.paginated(params, filter, useBetaEndpoint),
     enabled,
     placeholderData: keepPreviousData,
   });
@@ -228,7 +253,7 @@ export const useCreateKubernetesClusterMutation = () => {
 
 /**
  * duplicated function of useCreateKubernetesClusterMutation
- * necessary to call BETA_API_ROOT in a seperate function based on feature flag
+ * necessary to call BETA_API_ROOT in a separate function based on feature flag
  */
 
 export const useCreateKubernetesClusterBetaMutation = () => {
@@ -354,13 +379,23 @@ export const useKubernetesVersionQuery = () =>
     ...queryPresets.oneTimeFetch,
   });
 
+export const useKubernetesTieredVersionQuery = (tier: string) => {
+  useQuery<KubernetesTieredVersion[], APIError[]>({
+    ...kubernetesQueries.tieredVersions(tier),
+    ...queryPresets.oneTimeFetch,
+  });
+};
+
 /**
  * Avoiding fetching all Kubernetes Clusters if possible.
- * Before you use this, consider implementing infinite scroll insted.
+ * Before you use this, consider implementing infinite scroll instead.
  */
 export const useAllKubernetesClustersQuery = (enabled = false) => {
+  const { isLkeEnterpriseLAEnabled } = useIsLkeEnterpriseEnabled();
+  const useBetaEndpoint = isLkeEnterpriseLAEnabled;
+
   return useQuery<KubernetesCluster[], APIError[]>({
-    ...kubernetesQueries.lists._ctx.all,
+    ...kubernetesQueries.lists._ctx.all(useBetaEndpoint),
     enabled,
   });
 };
@@ -403,11 +438,21 @@ const getAllKubernetesClusters = () =>
     getKubernetesClusters(params, filters)
   )().then((data) => data.data);
 
+const getAllKubernetesClustersBeta = () =>
+  getAll<KubernetesCluster>((params, filters) =>
+    getKubernetesClustersBeta(params, filters)
+  )().then((data) => data.data);
+
 const getAllKubernetesVersions = () =>
   getAll<KubernetesVersion>((params, filters) =>
     getKubernetesVersions(params, filters)
   )().then((data) => data.data);
 
+const getAllKubernetesTieredVersionsBeta = (tier: string) =>
+  getAll<KubernetesTieredVersion>((params, filters) =>
+    getKubernetesTieredVersionsBeta(tier, params, filters)
+  )().then((data) => data.data);
+
 const getAllAPIEndpointsForCluster = (clusterId: number) =>
   getAll<KubernetesEndpointResponse>((params, filters) =>
     getKubernetesClusterEndpoints(clusterId, params, filters)