rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-16 15:10:12 +00:00
Code Issues Releases Wiki Activity

Add support for enabling cri-dockerd

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2021-06-08 19:05:54 +02:00
parent ff49352399
commit a4bebdb8bb
2 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cluster/plan.go
View File

@@ -57,6 +57,8 @@ const (
MaxEtcdNoStrictTLSVersion = "v3.4.14-rancher99"
EncryptionProviderConfigArgument = "encryption-provider-config"
KubeletCRIDockerdNameEnv = "RKE_KUBELET_CRIDOCKERD"
)
var admissionControlOptionNames = []string{"enable-admission-plugins", "admission-control"}
@@ -436,6 +438,10 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host, serviceOptions v3.Kubern
CommandArgs["tls-cert-file"] = pki.GetCertPath(pki.GetCrtNameForHost(host, pki.KubeletCertName))
CommandArgs["tls-private-key-file"] = pki.GetCertPath(fmt.Sprintf("%s-key", pki.GetCrtNameForHost(host, pki.KubeletCertName)))
}
if c.IsCRIDockerdEnabled() {
CommandArgs["container-runtime"] = "remote"
CommandArgs["container-runtime-endpoint"] = "/var/run/dockershim.sock"
}
if serviceOptions.Kubelet != nil {
for k, v := range serviceOptions.Kubelet {
@@ -508,6 +514,12 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host, serviceOptions v3.Kubern
Env := host.GetExtraEnv(kubelet.BaseService)
if c.IsCRIDockerdEnabled() {
Env = append(Env,
// Enable running cri-dockerd
fmt.Sprintf("%s=%s", KubeletCRIDockerdNameEnv, "true"))
}
if len(c.CloudProvider.Name) > 0 {
Env = append(Env,
fmt.Sprintf("%s=%s", CloudConfigSumEnv, getStringChecksum(c.CloudConfigFile)))
@@ -1096,3 +1108,13 @@ func appendArgs(command []string, args map[string]string) []string {
}
return command
}
func (c *Cluster) IsCRIDockerdEnabled() bool {
if c == nil {
return false
}
if c.EnableCRIDockerd != nil && *c.EnableCRIDockerd {
return true
}
return false
}