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

Fixes

Browse source 
Signed-off-by: Haiyan Meng <hmeng@redhat.com>
This commit is contained in:
Haiyan Meng 2016-07-22 18:15:41 -04:00 committed by Mrunal Patel
parent 819d76b6fd
commit c0a267bf56
2 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/client/podsandboxconfig.json
View file

@ -37,7 +37,7 @@
"requests": 200000000000
}
},
"lables": {
"labels": {
"group": "test"
},
"annotations": {

24
server/runtime.go
View file

@ -2,7 +2,6 @@ package server
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
@ -46,24 +45,17 @@ func (s *Server) CreatePodSandbox(ctx context.Context, req *pb.CreatePodSandboxR
// process req.Name
name := req.GetConfig().GetName()
var podSandboxDir string
if name == "" {
podSandboxDir, err := ioutil.TempDir(s.sandboxDir, "")
if err != nil {
return nil, err
}
name = filepath.Base(podSandboxDir)
} else {
podSandboxDir = filepath.Join(s.sandboxDir, name)
if _, err := os.Stat(podSandboxDir); err == nil {
return nil, fmt.Errorf("pod sandbox (%s) already exists", podSandboxDir)
}
return nil, fmt.Errorf("PodSandboxConfig.Name should not be empty")
}
if err := os.MkdirAll(podSandboxDir, 0755); err != nil {
return nil, err
}
podSandboxDir := filepath.Join(s.sandboxDir, name)
if _, err := os.Stat(podSandboxDir); err == nil {
return nil, fmt.Errorf("pod sandbox (%s) already exists", podSandboxDir)
}
if err := os.MkdirAll(podSandboxDir, 0755); err != nil {
return nil, err
}
// creates a spec Generator with the default spec.