From aa7645347fe5cf25d2456f9f6a6a67e6cefd71c3 Mon Sep 17 00:00:00 2001 From: "Hung-Han (Henry) Chen" Date: Tue, 2 Nov 2021 16:40:07 +0200 Subject: [PATCH] Inject CA asap Signed-off-by: Hung-Han (Henry) Chen --- src/main/index.ts | 8 ++++---- src/renderer/lens-app.tsx | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/index.ts b/src/main/index.ts index 4b1457395d..4315679fec 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -66,13 +66,15 @@ import { initTray } from "./tray"; import { kubeApiRequest, shellApiRequest } from "./proxy-functions"; import { AppPaths } from "../common/app-paths"; +injectSystemCAs(); + const onCloseCleanup = disposer(); const onQuitCleanup = disposer(); - SentryInit(); app.setName(appName); + logger.info(`📟 Setting ${productName} as protocol client for lens://`); if (app.setAsDefaultProtocolClient("lens")) { @@ -120,9 +122,7 @@ app.on("second-instance", (event, argv) => { WindowManager.getInstance(false)?.ensureMainWindow(); }); -app.on("ready", async () => { - await injectSystemCAs(); - +app.on("ready", async () => { logger.info(`🚀 Starting ${productName} from "${AppPaths.get("exe")}"`); logger.info("🐚 Syncing shell environment"); await shellSync(); diff --git a/src/renderer/lens-app.tsx b/src/renderer/lens-app.tsx index df6867c86b..7d9e41a8b6 100644 --- a/src/renderer/lens-app.tsx +++ b/src/renderer/lens-app.tsx @@ -39,10 +39,11 @@ import { catalogEntityRegistry } from "./api/catalog-entity-registry"; import logger from "../common/logger"; import { unmountComponentAtNode } from "react-dom"; +injectSystemCAs(); + @observer export class LensApp extends React.Component { static async init(rootElem: HTMLElement) { - await injectSystemCAs(); catalogEntityRegistry.init(); ExtensionLoader.getInstance().loadOnClusterManagerRenderer(); LensProtocolRouterRenderer.createInstance().init();