From ce1b56ee37741da663d23af2cd536fa5e73ff005 Mon Sep 17 00:00:00 2001
From: Michael Ruoss <michael@michaelruoss.ch>
Date: Fri, 25 Oct 2024 07:32:50 +0200
Subject: [PATCH] Get initial namespace from k8s context in the k8s runtime
 settings (#2838)

---
 lib/livebook_web/live/session_live/k8s_runtime_component.ex | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/livebook_web/live/session_live/k8s_runtime_component.ex b/lib/livebook_web/live/session_live/k8s_runtime_component.ex
index 3a93351c5..3c279c5de 100644
--- a/lib/livebook_web/live/session_live/k8s_runtime_component.ex
+++ b/lib/livebook_web/live/session_live/k8s_runtime_component.ex
@@ -536,6 +536,7 @@ defmodule LivebookWeb.SessionLive.K8sRuntimeComponent do
 
   def handle_async(:cluster_check, {:ok, results}, socket) do
     [access_review_result, namespaces_result] = results
+    context_namespace = socket.assigns.kubeconfig.current_namespace
 
     access_review_result =
       case access_review_result do
@@ -548,7 +549,7 @@ defmodule LivebookWeb.SessionLive.K8sRuntimeComponent do
       case namespaces_result do
         {:ok, namespaces} ->
           namespace_options = Enum.map(namespaces, & &1.name)
-          {:ok, namespace_options, List.first(namespace_options)}
+          {:ok, namespace_options, context_namespace || List.first(namespace_options)}
 
         {:error, %{status: 403}} ->
           # No access to list namespaces, we will show an input instead