Fix issue where /exec/init calls put kubeconfig in first container

api/model/model_types.go

@@ -32,15 +32,14 @@ type MachineIdentifier struct {
 }
 
 type ContainerInfo struct {
-	ContainerName string
-	PodName       string
+	PodName       string `json:"pod"`
+	ContainerName string `json:"container"`
 }
 
 //ResolvedExec holds info client might send to create exec
 type ResolvedExec struct {
-	PodName       string   `json:"pod"`
-	ContainerName string   `json:"container"`
-	Cmd           []string `json:"cmd"`
+	ContainerInfo
+	Cmd []string `json:"cmd"`
 }
 
 // Todo code Refactoring: MachineExec should be simple object for exec creation, without any business logic
@@ -99,7 +98,7 @@ func (*ExecErrorEvent) Type() string {
 }
 
 type InitConfigParams struct {
-	ContainerName    string `json:"container"` //optional, Will be first available if not set
+	ContainerName    string `json:"container"` // optional, Will be first suitable container in pod if not set
 	KubeConfigParams `json:"kubeconfig"`
 }
 

api/rest/common.go

@@ -14,15 +14,13 @@ package rest
 
 import (
 	"github.com/eclipse/che-machine-exec/api/model"
-	"github.com/gin-gonic/gin"
 )
 
-func HandleKubeConfigCreation(c *gin.Context, initConfigParams *model.InitConfigParams, token string) error {
-	if initConfigParams.Username == "" {
-		initConfigParams.Username = "Developer"
+func HandleKubeConfigCreation(kubeConfigParams *model.KubeConfigParams, containerInfo *model.ContainerInfo) error {
+	if kubeConfigParams.Username == "" {
+		kubeConfigParams.Username = "Developer"
 	}
 
-	initConfigParams.BearerToken = token
-	err := execManager.CreateKubeConfig(initConfigParams)
+	err := execManager.CreateKubeConfig(kubeConfigParams, containerInfo)
 	return err
 }

api/rest/execInit.go

@@ -15,9 +15,10 @@ package rest
 import (
 	"encoding/json"
 	"fmt"
+	"net/http"
+
 	"github.com/eclipse/che-machine-exec/auth"
 	"github.com/eclipse/che-machine-exec/common/rest"
-	"net/http"
 
 	"github.com/eclipse/che-machine-exec/api/model"
 	"github.com/eclipse/che-machine-exec/exec"
@@ -46,13 +47,16 @@ func HandleInit(c *gin.Context) {
 		return
 	}
 
+	kubeConfigParams := initConfigParams.KubeConfigParams
+	kubeConfigParams.BearerToken = token
+
 	execRequest := handleContainerResolve(c, token, initConfigParams.ContainerName)
 	if execRequest == nil {
 		rest.WriteResponse(c, http.StatusInternalServerError, "Could not retrieve exec request")
 		return
 	}
 
-	err := HandleKubeConfigCreation(c, &initConfigParams, token)
+	err := HandleKubeConfigCreation(&kubeConfigParams, &execRequest.ContainerInfo)
 	if err != nil {
 		rest.WriteResponse(c, http.StatusInternalServerError, err.Error())
 		return

api/rest/execKubeConfig.go

@@ -13,9 +13,10 @@
 package rest
 
 import (
+	"net/http"
+
 	"github.com/eclipse/che-machine-exec/auth"
 	"github.com/eclipse/che-machine-exec/common/rest"
-	"net/http"
 
 	"github.com/eclipse/che-machine-exec/api/model"
 	"github.com/gin-gonic/gin"
@@ -39,6 +40,9 @@ func HandleKubeConfig(c *gin.Context) {
 		return
 	}
 
+	kubeConfigParams := initConfigParams.KubeConfigParams
+	kubeConfigParams.BearerToken = token
+
 	if initConfigParams.ContainerName == "" {
 		c.Writer.WriteHeader(http.StatusBadRequest)
 		_, err := c.Writer.Write([]byte("Container name is required"))
@@ -48,7 +52,13 @@ func HandleKubeConfig(c *gin.Context) {
 		return
 	}
 
-	err := HandleKubeConfigCreation(c, &initConfigParams, token)
+	execRequest := handleContainerResolve(c, token, initConfigParams.ContainerName)
+	if execRequest == nil {
+		rest.WriteResponse(c, http.StatusInternalServerError, "Could not retrieve exec request")
+		return
+	}
+
+	err := HandleKubeConfigCreation(&kubeConfigParams, &execRequest.ContainerInfo)
 
 	if err != nil {
 		logrus.Errorf("Unable to create kubeconfig. Cause: %s", err.Error())

exec/exec-manager-provider.go

@@ -46,7 +46,7 @@ type ExecManager interface {
 	Resize(id int, cols uint, rows uint) error
 
 	// Create a kubeconfig
-	CreateKubeConfig(kubeConfigParams *model.InitConfigParams) error
+	CreateKubeConfig(kubeConfigParams *model.KubeConfigParams, containerInfo *model.ContainerInfo) error
 }
 
 // CreateExecManager creates and returns new instance ExecManager.

exec/kubernetes_exec_manager.go

@@ -94,8 +94,7 @@ func (manager *KubernetesExecManager) Resolve(container, token string) (*model.R
 		logrus.Printf("%s is successfully resolved in auto discovered container %s/%s", resolvedCmd,
 			containerInfo.PodName, containerInfo.ContainerName)
 		return &model.ResolvedExec{
-			PodName:       containerInfo.PodName,
-			ContainerName: containerInfo.ContainerName,
+			ContainerInfo: *containerInfo,
 			Cmd:           resolvedCmd,
 		}, nil
 	} else {
@@ -128,8 +127,7 @@ func (manager *KubernetesExecManager) findFirstAvailable(k8sAPI *client.K8sAPI,
 		logrus.Printf("%s is successfully resolved in auto discovered container %s/%s", resolvedCmd,
 			containerInfo.PodName, containerInfo.ContainerName)
 		return &model.ResolvedExec{
-			PodName:       containerInfo.PodName,
-			ContainerName: containerInfo.ContainerName,
+			ContainerInfo: *containerInfo,
 			Cmd:           resolvedCmd,
 		}, nil
 	}
@@ -318,42 +316,27 @@ func (*KubernetesExecManager) Resize(id int, cols uint, rows uint) error {
 	return nil
 }
 
-func (manager *KubernetesExecManager) CreateKubeConfig(initConfigParams *model.InitConfigParams) error {
+func (manager *KubernetesExecManager) CreateKubeConfig(kubeConfigParams *model.KubeConfigParams, containerInfo *model.ContainerInfo) error {
 	machineExec := &model.MachineExec{
-		BearerToken: initConfigParams.BearerToken,
+		BearerToken: kubeConfigParams.BearerToken,
 	}
 	k8sAPI, err := manager.k8sAPIProvider.GetK8sAPI(machineExec)
 	if err != nil {
 		logrus.Debugf("Unable to get k8sAPI %s", err.Error())
 		return err
 	}
 
-	containerFilter := filter.NewKubernetesContainerFilter(manager.namespace, k8sAPI.GetClient().CoreV1())
-	containersInfo, err := containerFilter.GetContainerList()
-	if err != nil {
-		return err
-	}
+	currentNamespace := GetNamespace()
+	infoExecCreator := exec_info.NewKubernetesInfoExecCreator(currentNamespace, k8sAPI.GetClient().Core(), k8sAPI.GetConfig())
 
-	if len(containersInfo) == 0 {
-		return errors.New("no containers found to exec")
+	if kubeConfigParams.Namespace == "" {
+		kubeConfigParams.Namespace = currentNamespace
 	}
-
-	for _, containerInfo := range containersInfo {
-		if containerInfo.ContainerName == initConfigParams.ContainerName || initConfigParams.ContainerName == "" {
-			currentNamespace := GetNamespace()
-			infoExecCreator := exec_info.NewKubernetesInfoExecCreator(currentNamespace, k8sAPI.GetClient().Core(), k8sAPI.GetConfig())
-
-			if initConfigParams.Namespace == "" {
-				initConfigParams.Namespace = currentNamespace
-			}
-			err = kubeconfig.CreateKubeConfig(infoExecCreator, &initConfigParams.KubeConfigParams, containerInfo)
-			if err != nil {
-				return err
-			}
-			return nil
-		}
+	err = kubeconfig.CreateKubeConfig(infoExecCreator, kubeConfigParams, containerInfo)
+	if err != nil {
+		return err
 	}
-	return fmt.Errorf("No container with name %s found", initConfigParams.ContainerName)
+	return nil
 }
 
 // getByID return exec by id.