From bcd05ebf4e8cc5f4ba783d6cd839dac520e74233 Mon Sep 17 00:00:00 2001 From: ACoolName Date: Sun, 6 Apr 2025 23:58:10 +0300 Subject: [PATCH] added config file fallback --- instancemanager/kubernetes/instance_manager.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/instancemanager/kubernetes/instance_manager.go b/instancemanager/kubernetes/instance_manager.go index cded3b7..c4efe3d 100644 --- a/instancemanager/kubernetes/instance_manager.go +++ b/instancemanager/kubernetes/instance_manager.go @@ -3,6 +3,8 @@ package kubernetes import ( "context" "io" + "os" + "path/filepath" "strings" "time" @@ -18,6 +20,7 @@ import ( kubernetesclient "k8s.io/client-go/kubernetes" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" + "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/remotecommand" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -52,6 +55,9 @@ func convertServerManagerImage(image *servermanagerv1.Image) *instancemanager.Im // General // Read Only func (i *InstanceManager) GetImage(ctx context.Context, imageId string) (*instancemanager.Image, error) { + if imageId == "" { + return &instancemanager.Image{}, nil + } image := &servermanagerv1.Image{} err := i.client.Get(ctx, client.ObjectKey{Name: imageId, Namespace: i.Config.Namespace}, image) if err != nil { @@ -338,11 +344,14 @@ func (i *InstanceManager) StopFileBrowser(ctx context.Context, serverId string) func NewInstanceManager(config models.KubernetesInstanceManagerConfig) (*InstanceManager, error) { c, err := rest.InClusterConfig() if err != nil { - return nil, err + kubeconfig := filepath.Join(os.Getenv("HOME"), ".kube", "config") + c, err = clientcmd.BuildConfigFromFlags("", kubeconfig) + if err != nil { + return nil, err + } } scheme := runtime.NewScheme() - clientgoscheme.AddToScheme(scheme) servermanagerv1.AddToScheme(scheme)