From 80d7dcc6e9da064a40c148ba6c77a33966422bd8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Tue, 9 Jun 2020 19:20:30 +0200 Subject: [PATCH] Revert kubelet fix as Docker 19.03.9 has fix --- cluster/plan.go | 7 +------ hosts/hosts.go | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cluster/plan.go b/cluster/plan.go index 347ee2c7..0b4a5138 100644 --- a/cluster/plan.go +++ b/cluster/plan.go @@ -525,6 +525,7 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host, prefixPath string, servi "/var/lib/calico:/var/lib/calico:z", "/etc/resolv.conf:/etc/resolv.conf", "/sys:/sys:rprivate", + host.DockerInfo.DockerRootDir + ":" + host.DockerInfo.DockerRootDir + ":rw,rslave,z", fmt.Sprintf("%s:%s:shared,z", path.Join(prefixPath, "/var/lib/kubelet"), path.Join(prefixPath, "/var/lib/kubelet")), "/var/lib/rancher:/var/lib/rancher:shared,z", "/var/run:/var/run:rw,rprivate", @@ -536,12 +537,6 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host, prefixPath string, servi "/usr:/host/usr:ro", "/etc:/host/etc:ro", } - BindDockerRootDir := fmt.Sprintf("%s:%s:rw,rslave,z", host.DockerInfo.DockerRootDir, host.DockerInfo.DockerRootDir) - if hosts.IsEnterpriseLinuxHost(host) && hosts.IsDockerSELinuxEnabled(host) && !hosts.IsEnterpriseLinuxDocker(host) { - // Avoid relabing on Enterprise Linux with Docker SELinux and upstream Docker - BindDockerRootDir = strings.TrimSuffix(BindDockerRootDir, ",z") - } - Binds = append(Binds, BindDockerRootDir) // Special case to simplify using flex volumes if path.Join(prefixPath, "/var/lib/kubelet") != "/var/lib/kubelet" { Binds = append(Binds, "/var/lib/kubelet/volumeplugins:/var/lib/kubelet/volumeplugins:shared,z") diff --git a/hosts/hosts.go b/hosts/hosts.go index 753e0bdd..7f259518 100644 --- a/hosts/hosts.go +++ b/hosts/hosts.go @@ -408,7 +408,7 @@ func IsDockerSELinuxEnabled(host *Host) bool { func IsEnterpriseLinuxHost(host *Host) bool { operatingSystem := strings.ToLower(host.DockerInfo.OperatingSystem) - if strings.Contains(operatingSystem, "centos") || strings.Contains(operatingSystem, "red hat") { + if strings.Contains(operatingSystem, "centos") || strings.Contains(operatingSystem, "enterprise linux") || strings.Contains(operatingSystem, "oracle linux") { logrus.Debugf("Host [%s] with OperatingSystem [%s] is Enterprise Linux", host.Address, operatingSystem) return true }