Quellcode durchsuchen

Set kube namespace properly

Signed-off-by: Guillaume Tardif <[email protected]>
Guillaume Tardif vor 5 Jahren
Ursprung
Commit
677bfc9ce5
1 geänderte Dateien mit 11 neuen und 3 gelöschten Zeilen
  1. 11 3
      kube/client/client.go

+ 11 - 3
kube/client/client.go

@@ -32,7 +32,8 @@ import (
 
 
 // KubeClient API to access kube objects
 // KubeClient API to access kube objects
 type KubeClient struct {
 type KubeClient struct {
-	client *kubernetes.Clientset
+	client    *kubernetes.Clientset
+	namespace string
 }
 }
 
 
 // NewKubeClient new kubernetes client
 // NewKubeClient new kubernetes client
@@ -46,8 +47,15 @@ func NewKubeClient(config genericclioptions.RESTClientGetter) (*KubeClient, erro
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
+
+	namespace, _, err := config.ToRawKubeConfigLoader().Namespace()
+	if err != nil {
+		return nil, err
+	}
+
 	return &KubeClient{
 	return &KubeClient{
-		client: clientset,
+		client:    clientset,
+		namespace: namespace,
 	}, nil
 	}, nil
 }
 }
 
 
@@ -58,7 +66,7 @@ func (kc KubeClient) GetContainers(ctx context.Context, projectName string, all
 		fieldSelector = "status.phase=Running"
 		fieldSelector = "status.phase=Running"
 	}
 	}
 
 
-	pods, err := kc.client.CoreV1().Pods("").List(ctx, metav1.ListOptions{
+	pods, err := kc.client.CoreV1().Pods(kc.namespace).List(ctx, metav1.ListOptions{
 		LabelSelector: fmt.Sprintf("%s=%s", compose.ProjectTag, projectName),
 		LabelSelector: fmt.Sprintf("%s=%s", compose.ProjectTag, projectName),
 		FieldSelector: fieldSelector,
 		FieldSelector: fieldSelector,
 	})
 	})