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

6
server/sandbox.go
View file

@ -54,8 +54,8 @@ func (s *Server) generatePodIDandName(name, namespace string) (string, string, e
return id, name, err
}
// CreatePodSandbox creates a pod-level sandbox.
func (s *Server) CreatePodSandbox(ctx context.Context, req *pb.CreatePodSandboxRequest) (*pb.CreatePodSandboxResponse, error) {
// RunPodSandbox creates and runs a pod-level sandbox.
func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest) (*pb.RunPodSandboxResponse, error) {
// process req.Name
name := req.GetConfig().GetMetadata().GetName()
if name == "" {
@ -228,7 +228,7 @@ func (s *Server) CreatePodSandbox(ctx context.Context, req *pb.CreatePodSandboxR
return nil, err
}
return &pb.CreatePodSandboxResponse{PodSandboxId: &id}, nil
return &pb.RunPodSandboxResponse{PodSandboxId: &id}, nil
}
// StopPodSandbox stops the sandbox. If there are any running containers in the