From 59ab0ca9d0d6b8aa9fd4cf6fdfdb93eac9f32d20 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Sun, 15 Dec 2019 23:33:55 +0200 Subject: [PATCH] Pass containerd --address flag to kubelet if it exists --- nodeup/pkg/model/kubelet.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go index fff75f6ebb..133aa3f272 100644 --- a/nodeup/pkg/model/kubelet.go +++ b/nodeup/pkg/model/kubelet.go @@ -242,8 +242,12 @@ func (b *KubeletBuilder) buildSystemdEnvironmentFile(kubeletConfig *kops.Kubelet // Add container runtime flags if b.Cluster.Spec.ContainerRuntime == "containerd" { flags += " --container-runtime=remote" - flags += " --container-runtime-endpoint=unix:///run/containerd/containerd.sock" flags += " --runtime-request-timeout=15m" + if b.Cluster.Spec.Containerd.Address == nil { + flags += " --container-runtime-endpoint=unix:///run/containerd/containerd.sock" + } else { + flags += " --container-runtime-endpoint=unix://" + fi.StringValue(b.Cluster.Spec.Containerd.Address) + } } sysconfig := "DAEMON_ARGS=\"" + flags + "\"\n"