Merge branch 'master' into develop

linode · Nov 5, 2024 · 7adb6cf · 7adb6cf
2 parents f8d33b5 + 5c9feb0
commit 7adb6cf
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 27 deletions.
diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md
@@ -4,6 +4,13 @@ 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/).
 
+## [2024-11-05] - v1.131.2
+
+
+### Fixed:
+
+- APL summary panel not being loaded consistently ([#11207](https://github.com/linode/manager/pull/11207))
+
 ## [2024-10-29] - v1.131.1
 
 

diff --git a/packages/manager/package.json b/packages/manager/package.json
@@ -2,7 +2,7 @@
   "name": "linode-manager",
   "author": "Linode",
   "description": "The Linode Manager website",
-  "version": "1.131.1",
+  "version": "1.131.2",
   "private": true,
   "type": "module",
   "bugs": {

diff --git a/packages/manager/src/features/Kubernetes/CreateCluster/CreateCluster.tsx b/packages/manager/src/features/Kubernetes/CreateCluster/CreateCluster.tsx
@@ -86,7 +86,7 @@ export const CreateCluster = () => {
   const regionsData = data ?? [];
   const history = useHistory();
   const { data: account } = useAccount();
-  const showAPL = useAPLAvailability();
+  const { showAPL } = useAPLAvailability();
   const { showHighAvailability } = getKubeHighAvailability(account);
   const { showControlPlaneACL } = getKubeControlPlaneACL(account);
   const [ipV4Addr, setIPv4Addr] = React.useState<ExtendedIP[]>([

diff --git a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/APLSummaryPanel.tsx b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/APLSummaryPanel.tsx
@@ -37,23 +37,21 @@ const checkConsoleURL = async (
   setStatus: React.Dispatch<React.SetStateAction<StatusState>>
 ) => {
   const consoleURL = `https://console.lke${cluster.id}.akamai-apl.net`;
-
+  const healthCheckURL = `https://auth.lke${cluster.id}.akamai-apl.net/ready`;
   const pollURL = async () => {
     try {
-      const response = await axios.get(consoleURL);
+      const response = await axios.get(healthCheckURL);
 
-      if (response.status === 200) {
+      if (response.status === 302 || response.status === 200) {
         clearInterval(interval); // Stop the polling
         setStatus({ resolved: true, url: consoleURL });
       }
     } catch (error) {
-      if (error.response && error.response.status === 404) {
-        setStatus({
-          message:
-            'Installation still in progress; please check back in a minute.',
-          resolved: false,
-        });
-      }
+      setStatus({
+        message:
+          'Installation still in progress; please check back in a minute.',
+        resolved: false,
+      });
     }
   };
 

diff --git a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubernetesClusterDetail.tsx b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/KubernetesClusterDetail.tsx
@@ -28,7 +28,7 @@ export const KubernetesClusterDetail = () => {
   const { clusterID } = useParams<{ clusterID: string }>();
   const id = Number(clusterID);
   const location = useLocation();
-  const showAPL = useAPLAvailability();
+  const { showAPL } = useAPLAvailability();
 
   const { data: cluster, error, isLoading } = useKubernetesClusterQuery(id);
   const { data: regionsData } = useRegionsQuery();

diff --git a/packages/manager/src/features/Kubernetes/kubeUtils.test.ts b/packages/manager/src/features/Kubernetes/kubeUtils.test.ts
@@ -88,7 +88,7 @@ describe('helper functions', () => {
         wrapper: (ui) => wrapWithTheme(ui, { flags: { apl: true } }),
       });
       await waitFor(() => {
-        expect(result.current).toBe(true);
+        expect(result.current.showAPL).toBe(true);
       });
     });
   });

diff --git a/packages/manager/src/features/Kubernetes/kubeUtils.ts b/packages/manager/src/features/Kubernetes/kubeUtils.ts
@@ -119,15 +119,14 @@ export const useAPLAvailability = () => {
   const flags = useFlags();
 
   // Only fetch the account beta if the APL flag is enabled
-  const { data: beta } = useAccountBetaQuery('apl', Boolean(flags.apl));
-
-  if (!beta) {
-    return false;
-  }
+  const { data: beta, isLoading } = useAccountBetaQuery(
+    'apl',
+    Boolean(flags.apl)
+  );
 
-  const betaStatus = getBetaStatus(beta);
+  const showAPL = beta !== undefined && getBetaStatus(beta) === 'active';
 
-  return betaStatus === 'active';
+  return { isLoading: flags.apl && isLoading, showAPL };
 };
 
 export const getKubeControlPlaneACL = (

diff --git a/packages/manager/src/queries/account/betas.ts b/packages/manager/src/queries/account/betas.ts
@@ -47,6 +47,7 @@ export const useCreateAccountBetaMutation = () => {
 export const useAccountBetaQuery = (id: string, enabled: boolean = false) => {
   return useQuery<AccountBeta, APIError[]>({
     enabled,
+    retry: false,
     ...accountQueries.betas._ctx.beta(id),
   });
 };
diff --git a/packages/manager/src/queries/kubernetes.ts b/packages/manager/src/queries/kubernetes.ts
@@ -62,6 +62,12 @@ export const kubernetesQueries = createQueryKeys('kubernetes', {
         queryFn: () => getKubernetesClusterControlPlaneACL(id),
         queryKey: [id],
       },
+      cluster: (useBetaEndpoint: boolean = false) => ({
+        queryFn: useBetaEndpoint
+          ? () => getKubernetesClusterBeta(id)
+          : () => getKubernetesCluster(id),
+        queryKey: [useBetaEndpoint],
+      }),
       dashboard: {
         queryFn: () => getKubernetesClusterDashboard(id),
         queryKey: null,
@@ -109,12 +115,11 @@ export const kubernetesQueries = createQueryKeys('kubernetes', {
 });
 
 export const useKubernetesClusterQuery = (id: number) => {
-  const showAPL = useAPLAvailability();
+  const { isLoading: isAPLAvailabilityLoading, showAPL } = useAPLAvailability();
+
   return useQuery<KubernetesCluster, APIError[]>({
-    ...kubernetesQueries.cluster(id),
-    queryFn: showAPL
-      ? () => getKubernetesClusterBeta(id) // necessary to call BETA_API_ROOT in a seperate function based on feature flag
-      : () => getKubernetesCluster(id),
+    ...kubernetesQueries.cluster(id)._ctx.cluster(showAPL),
+    enabled: !isAPLAvailabilityLoading,
   });
 };
 
@@ -142,7 +147,15 @@ export const useKubernetesClusterMutation = (id: number) => {
         queryClient.invalidateQueries({
           queryKey: kubernetesQueries.cluster(id)._ctx.acl.queryKey,
         });
-        queryClient.setQueryData(kubernetesQueries.cluster(id).queryKey, data);
+        // queryClient.setQueryData<KubernetesCluster>(
+        //   kubernetesQueries.cluster(id).queryKey,
+        //   data
+        // );
+        // Temporary cache update logic for APL
+        queryClient.setQueriesData<KubernetesCluster>(
+          { queryKey: kubernetesQueries.cluster(id)._ctx.cluster._def },
+          (oldData) => ({ ...oldData, ...data })
+        );
       },
     }
   );