From 8287a75fec25f36ec86fcb0bc738640b1dc79785 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Wed, 22 Mar 2017 00:02:46 -0400 Subject: [PATCH] Move touching kubeapiserver log file to code --- nodeup/pkg/model/kubeapiserver.go | 12 ++++++++++++ .../kube-apiserver/files/var/log/kube-apiserver.log | 0 .../files/var/log/kube-apiserver.log.meta | 3 --- 3 files changed, 12 insertions(+), 3 deletions(-) delete mode 100644 upup/models/nodeup/_kubernetes_master/kube-apiserver/files/var/log/kube-apiserver.log delete mode 100644 upup/models/nodeup/_kubernetes_master/kube-apiserver/files/var/log/kube-apiserver.log.meta diff --git a/nodeup/pkg/model/kubeapiserver.go b/nodeup/pkg/model/kubeapiserver.go index 3b97630c52..3b11c2ef8d 100644 --- a/nodeup/pkg/model/kubeapiserver.go +++ b/nodeup/pkg/model/kubeapiserver.go @@ -61,6 +61,18 @@ func (b *KubeAPIServerBuilder) Build(c *fi.ModelBuilderContext) error { c.AddTask(t) } + // Touch log file, so that docker doesn't create a directory instead + { + t := &nodetasks.File{ + Path: "/var/log/kube-apiserver.log", + Contents: fi.NewStringResource(""), + Type: nodetasks.FileType_File, + Mode: s("0400"), + IfNotExists: true, + } + c.AddTask(t) + } + return nil } diff --git a/upup/models/nodeup/_kubernetes_master/kube-apiserver/files/var/log/kube-apiserver.log b/upup/models/nodeup/_kubernetes_master/kube-apiserver/files/var/log/kube-apiserver.log deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/upup/models/nodeup/_kubernetes_master/kube-apiserver/files/var/log/kube-apiserver.log.meta b/upup/models/nodeup/_kubernetes_master/kube-apiserver/files/var/log/kube-apiserver.log.meta deleted file mode 100644 index 56d0e34103..0000000000 --- a/upup/models/nodeup/_kubernetes_master/kube-apiserver/files/var/log/kube-apiserver.log.meta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "ifNotExists": true -} \ No newline at end of file