KUBECONFIG for steve must point to only a single config file

Signed-off-by: Jan Dubois <[email protected]>
jandubois · Feb 10, 2025 · 6a4ee05 · 6a4ee05
1 parent 163a426
commit 6a4ee05
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 19 deletions.
diff --git a/background.ts b/background.ts
@@ -1243,27 +1243,31 @@ function newK8sManager() {
   const arch = process.arch === 'arm64' ? 'aarch64' : 'x86_64';
   const mgr = K8sFactory(arch, dockerDirManager);
 
-  mgr.on('state-changed', (state: K8s.State) => {
-    mainEvents.emit('k8s-check-state', mgr);
-    window.send('k8s-check-state', state);
-    if ([K8s.State.STARTED, K8s.State.DISABLED].includes(state)) {
-      if (!cfg.kubernetes.version) {
-        writeSettings({ kubernetes: { version: mgr.kubeBackend.version } });
-      }
-      currentImageProcessor?.relayNamespaces();
+  mgr.on('state-changed', async(state: K8s.State) => {
+    try {
+      mainEvents.emit('k8s-check-state', mgr);
+      window.send('k8s-check-state', state);
+      if ([K8s.State.STARTED, K8s.State.DISABLED].includes(state)) {
+        if (!cfg.kubernetes.version) {
+          writeSettings({ kubernetes: { version: mgr.kubeBackend.version } });
+        }
+        currentImageProcessor?.relayNamespaces();
 
-      if (enabledK8s) {
-        Steve.getInstance().start();
+        if (enabledK8s) {
+          await Steve.getInstance().start();
+        }
       }
-    }
 
-    if (state === K8s.State.STOPPING) {
-      Steve.getInstance().stop();
-    }
-    if (pendingRestartContext !== undefined && !backendIsBusy()) {
-      // If we restart immediately the QEMU process in the VM doesn't always respond to a shutdown messages
-      setTimeout(doFullRestart, 2_000, pendingRestartContext);
-      pendingRestartContext = undefined;
+      if (state === K8s.State.STOPPING) {
+        Steve.getInstance().stop();
+      }
+      if (pendingRestartContext !== undefined && !backendIsBusy()) {
+        // If we restart immediately the QEMU process in the VM doesn't always respond to a shutdown messages
+        setTimeout(doFullRestart, 2_000, pendingRestartContext);
+        pendingRestartContext = undefined;
+      }
+    } catch (ex) {
+      console.error(ex);
     }
   });
 

diff --git a/pkg/rancher-desktop/backend/steve.ts b/pkg/rancher-desktop/backend/steve.ts
@@ -2,6 +2,7 @@ import { ChildProcess, spawn } from 'child_process';
 import os from 'os';
 import path from 'path';
 
+import K3sHelper from '@pkg/backend/k3sHelper';
 import Logging from '@pkg/utils/logging';
 import paths from '@pkg/utils/paths';
 
@@ -35,7 +36,7 @@ export class Steve {
   /**
    * @description Starts the Steve API if one is not already running.
    */
-  public start() {
+  public async start() {
     const { pid } = this.process || { };
 
     if (this.isRunning && pid) {
@@ -46,7 +47,13 @@ export class Steve {
 
     const osSpecificName = /^win/i.test(os.platform()) ? 'steve.exe' : 'steve';
     const stevePath = path.join(paths.resources, os.platform(), 'internal', osSpecificName);
+    const env = Object.assign({}, process.env);
 
+    try {
+      env.KUBECONFIG = await K3sHelper.findKubeConfigToUpdate('rancher-desktop');
+    } catch {
+      // do nothing
+    }
     this.process = spawn(
       stevePath,
       [
@@ -57,6 +64,7 @@ export class Steve {
         '--offline',
         'true',
       ],
+      { env },
     );
 
     const { stdout, stderr } = this.process;