vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

vendor: bump k8s@5fe2495588425a6613e28a048d8cc7bcb7513c7f

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-09-26 10:07:46 +02:00
parent f115a4ab24
commit ab05a4526b
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
38 changed files with 9752 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cmd/client/sandbox.go
View file

@ -11,14 +11,14 @@ import (
var podSandboxCommand = cli.Command{
Name: "pod",
Subcommands: []cli.Command{
createPodSandboxCommand,
runPodSandboxCommand,
stopPodSandboxCommand,
removePodSandboxCommand,
podSandboxStatusCommand,
},
}
var createPodSandboxCommand = cli.Command{
var runPodSandboxCommand = cli.Command{
Name: "create",
Usage: "create a pod",
Flags: []cli.Flag{
@ -37,8 +37,8 @@ var createPodSandboxCommand = cli.Command{
defer conn.Close()
client := pb.NewRuntimeServiceClient(conn)
// Test RuntimeServiceClient.CreatePodSandbox
err = CreatePodSandbox(client, context.String("config"))
// Test RuntimeServiceClient.RunPodSandbox
err = RunPodSandbox(client, context.String("config"))
if err != nil {
return fmt.Errorf("Creating the pod sandbox failed: %v", err)
}
@ -127,15 +127,15 @@ var podSandboxStatusCommand = cli.Command{
},
}
// CreatePodSandbox sends a CreatePodSandboxRequest to the server, and parses
// the returned CreatePodSandboxResponse.
func CreatePodSandbox(client pb.RuntimeServiceClient, path string) error {
// RunPodSandbox sends a RunPodSandboxRequest to the server, and parses
// the returned RunPodSandboxResponse.
func RunPodSandbox(client pb.RuntimeServiceClient, path string) error {
config, err := loadPodSandboxConfig(path)
if err != nil {
return err
}
r, err := client.CreatePodSandbox(context.Background(), &pb.CreatePodSandboxRequest{Config: config})
r, err := client.RunPodSandbox(context.Background(), &pb.RunPodSandboxRequest{Config: config})
if err != nil {
return err
}