From abe6a4e0b1184922b2f1b8c552020dabe650764a Mon Sep 17 00:00:00 2001 From: Lauri Nevala Date: Wed, 7 Oct 2020 15:27:48 +0300 Subject: [PATCH] Fix cluster dashboard opening when cluster is initally offline (#1042) Signed-off-by: Lauri Nevala --- src/main/cluster.ts | 5 ++++- src/renderer/components/cluster-manager/cluster-view.tsx | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/cluster.ts b/src/main/cluster.ts index 3e3ba3f6b5..9c4afd71d0 100644 --- a/src/main/cluster.ts +++ b/src/main/cluster.ts @@ -184,6 +184,9 @@ export class Cluster implements ClusterModel { this.refreshEvents(), this.refreshAllowedResources(), ]); + if (!this.ready) { + this.ready = true + } } this.pushState(); } @@ -234,7 +237,7 @@ export class Cluster implements ClusterModel { const apiUrl = this.kubeProxyUrl + path; return request(apiUrl, { json: true, - timeout: 5000, + timeout: 30000, ...options, headers: { Host: `${this.id}.${new URL(this.kubeProxyUrl).host}`, // required in ClusterManager.getClusterForRequest() diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx index f537352c22..7a7c96a856 100644 --- a/src/renderer/components/cluster-manager/cluster-view.tsx +++ b/src/renderer/components/cluster-manager/cluster-view.tsx @@ -9,7 +9,7 @@ import { hasLoadedView } from "./lens-views"; export class ClusterView extends React.Component { render() { const cluster = getMatchedCluster(); - const showStatus = cluster && (!cluster.available || !hasLoadedView(cluster.id)) + const showStatus = cluster && (!cluster.available || !hasLoadedView(cluster.id) || !cluster.ready) return (
{showStatus && (