github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41092 from yujuhong/cri-docker1_10

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41037, 40118, 40959, 41084, 41092)

CRI node e2e: add tests for docker 1.10
This commit is contained in:
Kubernetes Submit Queue 2017-02-09 16:44:44 -08:00 committed by GitHub
commit f5c07157a8
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/kubelet/dockershim/docker_service.go
View File

@ -70,6 +70,8 @@ const (
// The expiration time of version cache. // The expiration time of version cache.
versionCacheTTL = 60 * time.Second versionCacheTTL = 60 * time.Second
defaultCgroupDriver = "cgroupfs"
// TODO: https://github.com/kubernetes/kubernetes/pull/31169 provides experimental // TODO: https://github.com/kubernetes/kubernetes/pull/31169 provides experimental
// defaulting of host user namespace that may be enabled when the docker daemon // defaulting of host user namespace that may be enabled when the docker daemon
// is using remapped UIDs. // is using remapped UIDs.
@ -179,18 +181,21 @@ func NewDockerService(client dockertools.DockerInterface, seccompProfileRoot str
glog.Infof("Docker cri networking managed by %v", plug.Name()) glog.Infof("Docker cri networking managed by %v", plug.Name())
// NOTE: cgroup driver is only detectable in docker 1.11+ // NOTE: cgroup driver is only detectable in docker 1.11+
var cgroupDriver string cgroupDriver := defaultCgroupDriver
dockerInfo, err := ds.client.Info() dockerInfo, err := ds.client.Info()
if err != nil { if err != nil {
glog.Errorf("failed to execute Info() call to the Docker client: %v", err) glog.Errorf("Failed to execute Info() call to the Docker client: %v", err)
glog.Warningf("Using fallback default of cgroupfs as cgroup driver") glog.Warningf("Falling back to use the default driver: %q", cgroupDriver)
} else if len(dockerInfo.CgroupDriver) == 0 {
glog.Warningf("No cgroup driver is set in Docker")
glog.Warningf("Falling back to use the default driver: %q", cgroupDriver)
} else { } else {
cgroupDriver = dockerInfo.CgroupDriver cgroupDriver = dockerInfo.CgroupDriver
if len(kubeCgroupDriver) != 0 && kubeCgroupDriver != cgroupDriver {
return nil, fmt.Errorf("misconfiguration: kubelet cgroup driver: %q is different from docker cgroup driver: %q", kubeCgroupDriver, cgroupDriver)
}
glog.Infof("Setting cgroupDriver to %s", cgroupDriver)
} }
if len(kubeCgroupDriver) != 0 && kubeCgroupDriver != cgroupDriver {
return nil, fmt.Errorf("misconfiguration: kubelet cgroup driver: %q is different from docker cgroup driver: %q", kubeCgroupDriver, cgroupDriver)
}
glog.Infof("Setting cgroupDriver to %s", cgroupDriver)
ds.cgroupDriver = cgroupDriver ds.cgroupDriver = cgroupDriver
ds.versionCache = cache.NewObjectCache( ds.versionCache = cache.NewObjectCache(
func() (interface{}, error) { func() (interface{}, error) {

9
test/e2e_node/jenkins/cri_validation/image-config.yaml
View File

@ -1,11 +1,14 @@
images: images:
containervm: containervm:
image: e2e-node-containervm-v20161208-image image: e2e-node-containervm-v20161208-image # docker 1.11.2
project: kubernetes-node-e2e-images project: kubernetes-node-e2e-images
gci-family: gci-family:
image_regex: gci-beta-56-9000-80-0 image_regex: gci-beta-56-9000-80-0 # docker 1.11.2
project: google-containers project: google-containers
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
ubuntu-docker12: ubuntu-docker12:
image: e2e-node-ubuntu-trusty-docker12-v2-image image: e2e-node-ubuntu-trusty-docker12-v2-image # docker 1.12.6
project: kubernetes-node-e2e-images
ubuntu-docker10:
image: e2e-node-ubuntu-trusty-docker10-v2-image # docker 1.10.3
project: kubernetes-node-e2e-images project: kubernetes-node-e2e-images