Skip to content

Commit

Permalink
Add k8s logrotate config for CoreOS.
Browse files Browse the repository at this point in the history
Also, remove logrotate crontab because logrotate ships with a systemd
timer, logrotate.timer, to run logrotate daily.
  • Loading branch information
julianvmodesto committed Sep 30, 2017
1 parent ea31478 commit 0f0602d
Showing 1 changed file with 4 additions and 21 deletions.
25 changes: 4 additions & 21 deletions nodeup/pkg/model/logrotate.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,15 @@ type LogrotateBuilder struct {
var _ fi.ModelBuilder = &LogrotateBuilder{}

func (b *LogrotateBuilder) Build(c *fi.ModelBuilderContext) error {
if b.Distribution == distros.DistributionCoreOS {
glog.Infof("Detected CoreOS; won't install logrotate")
return nil
}

if b.Distribution == distros.DistributionContainerOS {
glog.Infof("Detected ContainerOS; won't install logrotate")
return nil
} else if b.Distribution == distros.DistributionCoreOS {
glog.Infof("Detected CoreOS; won't install logrotate")
} else {
c.AddTask(&nodetasks.Package{Name: "logrotate"})
}

c.AddTask(&nodetasks.Package{Name: "logrotate"})

k8sVersion, err := util.ParseKubernetesVersion(b.Cluster.Spec.KubernetesVersion)
if err != nil || k8sVersion == nil {
return fmt.Errorf("unable to parse KubernetesVersion %q", b.Cluster.Spec.KubernetesVersion)
Expand All @@ -65,20 +62,6 @@ func (b *LogrotateBuilder) Build(c *fi.ModelBuilderContext) error {
b.addLogRotate(c, "kube-scheduler", "/var/log/kube-scheduler.log", logRotateOptions{})
b.addLogRotate(c, "kubelet", "/var/log/kubelet.log", logRotateOptions{})

// Add cron job to run hourly
{
script := `#!/bin/sh
logrotate /etc/logrotate.conf`

t := &nodetasks.File{
Path: "/etc/cron.hourly/logrotate",
Contents: fi.NewStringResource(script),
Type: nodetasks.FileType_File,
Mode: s("0755"),
}
c.AddTask(t)
}

return nil
}

Expand Down

0 comments on commit 0f0602d

Please sign in to comment.