hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix cluster dashboard opening when cluster is initally offline (#1042)

Browse Source 
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
This commit is contained in:
Lauri Nevala 2020-10-07 15:27:48 +03:00 committed by GitHub
parent 44ce51613b
commit abe6a4e0b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/cluster.ts
View File

@ -184,6 +184,9 @@ export class Cluster implements ClusterModel {
this.refreshEvents(), this.refreshEvents(),
this.refreshAllowedResources(), this.refreshAllowedResources(),
]); ]);
if (!this.ready) {
this.ready = true
}
} }
this.pushState(); this.pushState();
} }
@ -234,7 +237,7 @@ export class Cluster implements ClusterModel {
const apiUrl = this.kubeProxyUrl + path; const apiUrl = this.kubeProxyUrl + path;
return request(apiUrl, { return request(apiUrl, {
json: true, json: true,
timeout: 5000, timeout: 30000,
...options, ...options,
headers: { headers: {
Host: `${this.id}.${new URL(this.kubeProxyUrl).host}`, // required in ClusterManager.getClusterForRequest() Host: `${this.id}.${new URL(this.kubeProxyUrl).host}`, // required in ClusterManager.getClusterForRequest()

2
src/renderer/components/cluster-manager/cluster-view.tsx
View File

@ -9,7 +9,7 @@ import { hasLoadedView } from "./lens-views";
export class ClusterView extends React.Component { export class ClusterView extends React.Component {
render() { render() {
const cluster = getMatchedCluster(); const cluster = getMatchedCluster();
const showStatus = cluster && (!cluster.available || !hasLoadedView(cluster.id)) const showStatus = cluster && (!cluster.available || !hasLoadedView(cluster.id) || !cluster.ready)
return ( return (
<div className="ClusterView"> <div className="ClusterView">
{showStatus && ( {showStatus && (