QA-7710: move hardcode to config

Author: Mikhail Podtserkovskiy

pool/strategy/kubernetes/config.go

@@ -4,9 +4,33 @@ import (
 	"encoding/json"
 	"errors"
 	"github.com/qa-dev/jsonwire-grid/config"
+	"time"
+	"fmt"
 )
 
 type strategyParams struct {
+	Namespace string
+	PodCreationTimeout time.Duration
+}
+
+func (sp *strategyParams) UnmarshalJSON(b []byte) error {
+	tempStruct :=  struct{
+		Namespace string `json:"namespace"`
+		PodCreationTimeout string `json:"pod_creation_timeout"`
+	} {
+		"default",
+		"1m",
+	}
+	if err := json.Unmarshal(b, &tempStruct); err != nil {
+		return err
+	}
+	podCreationTimeout, err := time.ParseDuration(tempStruct.PodCreationTimeout)
+	if err != nil {
+		return fmt.Errorf("invalid value strategy.pod_creation_timeout in config, given: %v", tempStruct.PodCreationTimeout)
+	}
+	sp.Namespace = tempStruct.Namespace
+	sp.PodCreationTimeout = podCreationTimeout
+	return nil
 }
 
 type strategyConfig struct {

pool/strategy/kubernetes/factory.go

@@ -8,6 +8,7 @@ import (
 	"github.com/qa-dev/jsonwire-grid/pool/capabilities"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
+	log "github.com/Sirupsen/logrus"
 )
 
 type StrategyFactory struct {
@@ -31,6 +32,8 @@ func (f *StrategyFactory) Create(
 		}
 	}
 
+	log.Debugf("strategy kubernetes config, %+v", strategyConfig)
+
 	//todo: выпилить этот говноклиент, когда будет работать нормальный
 	kubConfig, err := rest.InClusterConfig()
 	if err != nil {
@@ -44,7 +47,8 @@ func (f *StrategyFactory) Create(
 
 	provider := &kubDnsProvider{
 		clientset:     clientset,
-		namespace:     "default", //todo: брать из конфига !!!
+		namespace:     strategyConfig.Params.Namespace,
+		podCreationTimeout: strategyConfig.Params.PodCreationTimeout,
 		clientFactory: clientFactory,
 	}
 

pool/strategy/kubernetes/provider.go

@@ -22,6 +22,7 @@ type kubernetesProviderInterface interface {
 type kubDnsProvider struct {
 	clientset     *kubernetes.Clientset
 	namespace     string
+	podCreationTimeout     time.Duration
 	clientFactory jsonwire.ClientFactoryInterface
 }
 
@@ -44,13 +45,13 @@ func (p *kubDnsProvider) Create(podName string, nodeParams nodeParams) (nodeAddr
 		return "", errors.New("send command pod/create to k8s, " + err.Error())
 	}
 
-	stopWaitIP := time.After(40 * time.Second)
+	stop := time.After(p.podCreationTimeout)
 	log.Debugf("start waiting pod ip")
 	var createdPodIP string
 LoopWaitIP:
 	for {
 		select {
-		case <-stopWaitIP:
+		case <-stop:
 			return "", fmt.Errorf("wait podIP stopped by timeout, %v", podName)
 		default:
 			time.Sleep(time.Second)
@@ -71,7 +72,6 @@ LoopWaitIP:
 	// todo: пока так ожидаем поднятие ноды, так как не понятно что конкретно означают статусы возвращаемые через апи
 	nodeAddress = net.JoinHostPort(createdPodIP, nodeParams.Port)
 	client := p.clientFactory.Create(nodeAddress)
-	stop := time.After(40 * time.Second)
 	log.Debugln("start waiting selenium")
 LoopWaitSelenium:
 	for {