From 39e846442b9ff8389b16b99fbf02f67aedb9ded4 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Mon, 25 Jun 2018 20:40:51 +0200 Subject: [PATCH] Fix container log location for ros --- cluster/plan.go | 4 ++-- services/services.go | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cluster/plan.go b/cluster/plan.go index 2de20f1d..6144bae7 100644 --- a/cluster/plan.go +++ b/cluster/plan.go @@ -362,8 +362,8 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host, prefixPath string) v3.Pr "/run:/run:rprivate", fmt.Sprintf("%s:/etc/ceph", path.Join(prefixPath, "/etc/ceph")), "/dev:/host/dev:rprivate", - fmt.Sprintf("%s:/var/log/containers:z", path.Join(prefixPath, "/var/log/containers")), - fmt.Sprintf("%s:/var/log/pods:z", path.Join(prefixPath, "/var/log/pods")), + "/var/log/containers:/var/log/containers:z", + "/var/log/pods:/var/log/pods:z", "/usr:/host/usr:ro", "/etc:/host/etc:ro", } diff --git a/services/services.go b/services/services.go index e1e2b91e..e079ea76 100644 --- a/services/services.go +++ b/services/services.go @@ -3,7 +3,6 @@ package services import ( "context" "fmt" - "path" "github.com/docker/docker/api/types/container" "github.com/rancher/rke/docker" @@ -119,7 +118,7 @@ func createLogLink(ctx context.Context, host *hosts.Host, containerName, plane, } hostCfg := &container.HostConfig{ Binds: []string{ - fmt.Sprintf("%s:/var/lib", path.Join(host.PrefixPath, "/var/lib")), + "/var/lib:/var/lib", }, Privileged: true, }