kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2670 from ottoyiu/fix_auditlog_rotation 

Fix log rotation of apiserver audit logs
This commit is contained in:
Chris Love 2017-06-06 09:41:57 -07:00 committed by GitHub
parent 0b7ed89cb9 c22b3cc035
commit 286daa739d
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nodeup/pkg/model/kubeapiserver.go
View File

@ -73,21 +73,6 @@ func (b *KubeAPIServerBuilder) Build(c *fi.ModelBuilderContext) error {
c.AddTask(t)
}
auditLogPath := b.Cluster.Spec.KubeAPIServer.AuditLogPath
if auditLogPath != nil {
// Touch log file, so that docker doesn't create a directory instead
{
t := &nodetasks.File{
Path: *auditLogPath,
Contents: fi.NewStringResource(""),
Type: nodetasks.FileType_File,
Mode: s("0400"),
IfNotExists: true,
}
c.AddTask(t)
}
}
return nil
}
@ -200,7 +185,11 @@ func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) {
auditLogPath := b.Cluster.Spec.KubeAPIServer.AuditLogPath
if auditLogPath != nil {
addHostPathMapping(pod, container, "auditlogfile", *auditLogPath).ReadOnly = false
// Mount the directory of the path instead, as kube-apiserver rotates the log by renaming the file.
// Renaming is not possible when the file is mounted as the host path, and will return a
// 'Device or resource busy' error
auditLogPathDir := filepath.Dir(*auditLogPath)
addHostPathMapping(pod, container, "auditlogpathdir", auditLogPathDir).ReadOnly = false
}
pod.Spec.Containers = append(pod.Spec.Containers, *container)