Merge pull request #12681 from hakman/ubuntu-chrony

Use chrony for synchronizing time in Ubuntu
kubernetes · Nov 4, 2021 · f49b99f · f49b99f
2 parents b47e023 + 5ec40c0
commit f49b99f
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/nodeup/pkg/model/ntp.go b/nodeup/pkg/model/ntp.go
@@ -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