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

Pass containerd --address flag to kubelet if it exists

This commit is contained in:
Ciprian Hacman 2019-12-15 23:33:55 +02:00
parent 6363289103
commit 59ab0ca9d0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nodeup/pkg/model/kubelet.go
View File

@ -242,8 +242,12 @@ func (b *KubeletBuilder) buildSystemdEnvironmentFile(kubeletConfig *kops.Kubelet
// Add container runtime flags // Add container runtime flags
if b.Cluster.Spec.ContainerRuntime == "containerd" { if b.Cluster.Spec.ContainerRuntime == "containerd" {
flags += " --container-runtime=remote" flags += " --container-runtime=remote"
flags += " --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
flags += " --runtime-request-timeout=15m" 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" sysconfig := "DAEMON_ARGS=\"" + flags + "\"\n"