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

Merge pull request #12681 from hakman/ubuntu-chrony 

Use chrony for synchronizing time in Ubuntu
This commit is contained in:
Kubernetes Prow Robot 2021-11-04 14:48:23 -07:00 committed by GitHub
parent b47e023b1e 5ec40c0c32
commit f49b99fcf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nodeup/pkg/model/ntp.go
View File

@ -58,20 +58,17 @@ func (b *NTPBuilder) Build(c *fi.ModelBuilderContext) error {
ntpHost = ""
}
if b.Distribution.IsDebianFamily() {
// Ubuntu recommends systemd-timesyncd, but on ubuntu on GCE systemd-timesyncd is blocked (in favor of chrony)
if b.Distribution.IsUbuntu() && !b.RunningOnGCE() {
if ntpHost != "" {
c.AddTask(b.buildTimesyncdConf("/etc/systemd/timesyncd.conf", ntpHost))
}
c.AddTask((&nodetasks.Service{Name: "systemd-timesyncd"}).InitDefaults())
} else {
c.AddTask(&nodetasks.Package{Name: "chrony"})
if ntpHost != "" {
c.AddTask(b.buildChronydConf("/etc/chrony/chrony.conf", ntpHost))
}
c.AddTask((&nodetasks.Service{Name: "chrony"}).InitDefaults())
if !b.RunningOnGCE() && b.Distribution.IsUbuntu() && b.Distribution.Version() <= 20.04 {
if ntpHost != "" {
c.AddTask(b.buildTimesyncdConf("/etc/systemd/timesyncd.conf", ntpHost))
}
c.AddTask((&nodetasks.Service{Name: "systemd-timesyncd"}).InitDefaults())
} else if b.Distribution.IsDebianFamily() {
c.AddTask(&nodetasks.Package{Name: "chrony"})
if ntpHost != "" {
c.AddTask(b.buildChronydConf("/etc/chrony/chrony.conf", ntpHost))
}
c.AddTask((&nodetasks.Service{Name: "chrony"}).InitDefaults())
} else if b.Distribution.IsRHELFamily() {
c.AddTask(&nodetasks.Package{Name: "chrony"})
if ntpHost != "" {
@ -87,7 +84,7 @@ func (b *NTPBuilder) Build(c *fi.ModelBuilderContext) error {
}
func (b *NTPBuilder) buildChronydConf(path string, host string) *nodetasks.File {
conf := `# Built by Kops - do NOT edit
conf := `# Built by kOps - do NOT edit
pool ` + host + ` prefer iburst
driftfile /var/lib/chrony/drift