github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cm: Remove legacy docker references

Browse Source 
Dockershim and built-in Docker support are gone. Cleans up dead code
references to them.
This commit is contained in:
Danielle Lancashire
2022-02-02 18:59:25 +01:00
parent 5340ae0bae
commit c198062da4
2 changed files with 1 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubelet/cm/helpers_linux.go
View File

@@ -25,7 +25,7 @@ import (
libcontainercgroups "github.com/opencontainers/runc/libcontainer/cgroups"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/kubernetes/pkg/api/v1/resource"
@@ -340,12 +340,5 @@ func GetKubeletContainer(kubeletCgroups string) (string, error) {
// GetRuntimeContainer returns the cgroup used by the container runtime
func GetRuntimeContainer(containerRuntime, runtimeCgroups string) (string, error) {
if containerRuntime == "docker" {
cont, err := getContainerNameForProcess(dockerProcessName, dockerPidFile)
if err != nil {
return "", fmt.Errorf("failed to get container name for docker process: %v", err)
}
return cont, nil
}
return runtimeCgroups, nil
}