Merge pull request #140 from YaoZengzeng/create-pod-grpc

grpc for pod create and fix bug in the commit before

Author: harry zhang

pkg/kubelet/hyper/hyper.go

@@ -812,18 +812,24 @@ func (r *runtime) RunPod(pod *api.Pod, restartCount int, pullSecrets []api.Secre
 	}
 
 	// Create and start hyper pod
-	podSpec, err := r.getPodSpec(podFullName)
+	specData, err := r.getPodSpec(podFullName)
 	if err != nil {
 		glog.Errorf("Hyper: create pod %s failed, error: %v", podFullName, err)
 		return err
 	}
-	result, err := r.hyperClient.CreatePod(podSpec)
+
+	var podSpec grpctypes.UserPod
+	err = json.Unmarshal([]byte(specData), &podSpec)
+	if err != nil {
+		glog.Errorf("Hyper: marshal pod %s from specData error: %v", podFullName, err)
+	}
+
+	podID, err = r.hyperClient.CreatePod(&podSpec)
 	if err != nil {
 		glog.Errorf("Hyper: create pod %s failed, error: %v", podData, err)
 		return err
 	}
 
-	podID = string(result["ID"].(string))
 	err = r.hyperClient.StartPod(podID)
 	if err != nil {
 		glog.Errorf("Hyper: start pod %s (ID:%s) failed, error: %v", pod.Name, podID, err)

pkg/kubelet/hyper/hyperclient.go

@@ -34,7 +34,6 @@ import (
 
 	"github.com/docker/docker/pkg/parsers"
 	"github.com/docker/docker/pkg/term"
-	"github.com/golang/glog"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	grpctypes "k8s.io/kubernetes/pkg/kubelet/hyper/types"
@@ -522,20 +521,16 @@ func (client *HyperClient) PullImage(image string, credential string) error {
 	return nil
 }
 
-func (client *HyperClient) CreatePod(podArgs string) (map[string]interface{}, error) {
-	glog.V(5).Infof("Hyper: starting to create pod %s", podArgs)
-	body, _, err := client.call("POST", "/pod/create", podArgs, nil)
-	if err != nil {
-		return nil, err
+func (client *HyperClient) CreatePod(podSpec *grpctypes.UserPod) (string, error) {
+	request := grpctypes.PodCreateRequest{
+		PodSpec: podSpec,
 	}
-
-	var result map[string]interface{}
-	err = json.Unmarshal(body, &result)
+	response, err := client.client.PodCreate(context.Background(), &request)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
-	return result, nil
+	return response.PodID, nil
 }
 
 func (c *HyperClient) GetExitCode(container, tag string) error {