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

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jared Allard 2018-11-24 15:57:56 -08:00
parent beb78dd7e3 4eeba152cd
commit 3048307cee
No known key found for this signature in database
GPG Key ID: 0CA9135F5BB08943
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,8 @@ func (b *LogrotateBuilder) addLogrotateService(c *fi.ModelBuilderContext) error
}
type logRotateOptions struct {
MaxSize string
MaxSize string
DateFormat string
}
func (b *LogrotateBuilder) addLogRotate(c *fi.ModelBuilderContext, name, path string, options logRotateOptions) {
@ -121,6 +122,12 @@ func (b *LogrotateBuilder) addLogRotate(c *fi.ModelBuilderContext, name, path st
options.MaxSize = "100M"
}
// CoreOS sets "dateext" options, and maxsize-based rotation will fail if
// the file has been previously rotated on the same calendar date.
if b.Distribution == distros.DistributionCoreOS {
options.DateFormat = "-%Y%m%d-%s"
}
lines := []string{
path + "{",
" rotate 5",
@ -129,12 +136,20 @@ func (b *LogrotateBuilder) addLogRotate(c *fi.ModelBuilderContext, name, path st
" notifempty",
" delaycompress",
" maxsize " + options.MaxSize,
}
if options.DateFormat != "" {
lines = append(lines, " dateformat "+options.DateFormat)
}
lines = append(
lines,
" daily",
" create 0644 root root",
"}",
}
)
contents := strings.Join(lines, "\n")
contents := strings.Join(lines, "\n") + "\n"
c.AddTask(&nodetasks.File{
Path: "/etc/logrotate.d/" + name,