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

server: make logDir configurable

Browse source 
While logDir isn't currently used (until the conmon implementation
lands) it's probably not a great idea to hardcode our defaults. The main
issue with this setting is that the kubelet can override it at will.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
This commit is contained in:
Aleksa Sarai 2016-10-21 20:58:54 +11:00 • committed by Aleksa Sarai
parent 33f47d6a6b
commit 96c0966ce9
No known key found for this signature in database
GPG key ID: 9E18AA267DDB8DB4
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/sandbox.go
View file

@ -31,7 +31,6 @@ type sandbox struct {
}
const (
podInfraRootfs = "/var/lib/ocid/graph/vfs/pause"
podDefaultNamespace = "default"
)
@ -141,6 +140,8 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
// creates a spec Generator with the default spec.
g := generate.New()
// TODO: Make the `graph/vfs` part of this configurable once the storage
// integration has been merged.
podInfraRootfs := filepath.Join(s.config.Root, "graph/vfs/pause")
// setup defaults for the pod sandbox
g.SetRootPath(filepath.Join(podInfraRootfs, "rootfs"))
@ -156,7 +157,7 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
// set log directory
logDir := req.GetConfig().GetLogDirectory()
if logDir == "" {
logDir = fmt.Sprintf("/var/log/ocid/pods/%s", id)
logDir = filepath.Join(s.config.LogDir, id)
}
// set DNS options