Merge pull request #12587 from justinsb/chrony_on_ubuntu_gce

GCE: use chrony on Ubuntu + GCE
kubernetes · Oct 23, 2021 · 03044b7 · 03044b7
2 parents 6cf33f7 + f54cf00
commit 03044b7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/nodeup/pkg/model/context.go b/nodeup/pkg/model/context.go
@@ -668,3 +668,8 @@ func (c *NodeupModelContext) InstallNvidiaRuntime() bool {
 		fi.BoolValue(c.NodeupConfig.NvidiaGPU.Enabled) &&
 		c.GPUVendor == architectures.GPUVendorNvidia
 }
+
+// RunningOnGCE returns true if we are running on GCE
+func (c *NodeupModelContext) RunningOnGCE() bool {
+	return kops.CloudProviderID(c.Cluster.Spec.CloudProvider) == kops.CloudProviderGCE
+}
diff --git a/nodeup/pkg/model/ntp.go b/nodeup/pkg/model/ntp.go
@@ -59,7 +59,8 @@ func (b *NTPBuilder) Build(c *fi.ModelBuilderContext) error {
 	}
 
 	if b.Distribution.IsDebianFamily() {
-		if b.Distribution.IsUbuntu() {
+		// 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))
 			}