diff --git a/pkg/kubelet/dockershim/docker_container.go b/pkg/kubelet/dockershim/docker_container.go index 0e1b4a67e00..aaf59f42070 100644 --- a/pkg/kubelet/dockershim/docker_container.go +++ b/pkg/kubelet/dockershim/docker_container.go @@ -151,7 +151,7 @@ func (ds *dockerService) CreateContainer(podSandboxID string, config *runtimeapi if rOpts != nil { hc.Resources = dockercontainer.Resources{ Memory: rOpts.MemoryLimitInBytes, - MemorySwap: dockertools.DefaultMemorySwap(), + MemorySwap: DefaultMemorySwap(), CPUShares: rOpts.CpuShares, CPUQuota: rOpts.CpuQuota, CPUPeriod: rOpts.CpuPeriod, diff --git a/pkg/kubelet/dockershim/docker_sandbox.go b/pkg/kubelet/dockershim/docker_sandbox.go index 12978492eae..3d56fb20c9f 100644 --- a/pkg/kubelet/dockershim/docker_sandbox.go +++ b/pkg/kubelet/dockershim/docker_sandbox.go @@ -578,7 +578,7 @@ func sharesHostIpc(container *dockertypes.ContainerJSON) bool { func setSandboxResources(hc *dockercontainer.HostConfig) { hc.Resources = dockercontainer.Resources{ - MemorySwap: dockertools.DefaultMemorySwap(), + MemorySwap: DefaultMemorySwap(), CPUShares: defaultSandboxCPUshares, // Use docker's default cpu quota/period. } diff --git a/pkg/kubelet/dockertools/docker_manager_linux.go b/pkg/kubelet/dockershim/helpers_linux.go similarity index 96% rename from pkg/kubelet/dockertools/docker_manager_linux.go rename to pkg/kubelet/dockershim/helpers_linux.go index 5ef8f461971..8b762f545d6 100644 --- a/pkg/kubelet/dockertools/docker_manager_linux.go +++ b/pkg/kubelet/dockershim/helpers_linux.go @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package dockertools +package dockershim func DefaultMemorySwap() int64 { return 0 diff --git a/pkg/kubelet/dockertools/docker_manager_unsupported.go b/pkg/kubelet/dockershim/helpers_unsupported.go similarity index 96% rename from pkg/kubelet/dockertools/docker_manager_unsupported.go rename to pkg/kubelet/dockershim/helpers_unsupported.go index fe3100be9ff..f82bfeacc09 100644 --- a/pkg/kubelet/dockertools/docker_manager_unsupported.go +++ b/pkg/kubelet/dockershim/helpers_unsupported.go @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package dockertools +package dockershim func DefaultMemorySwap() int64 { return -1 diff --git a/pkg/kubelet/dockertools/docker_manager_windows.go b/pkg/kubelet/dockershim/helpers_windows.go similarity index 96% rename from pkg/kubelet/dockertools/docker_manager_windows.go rename to pkg/kubelet/dockershim/helpers_windows.go index 1246734b266..c5c4af13ac5 100644 --- a/pkg/kubelet/dockertools/docker_manager_windows.go +++ b/pkg/kubelet/dockershim/helpers_windows.go @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package dockertools +package dockershim func DefaultMemorySwap() int64 { return 0 diff --git a/pkg/kubelet/dockershim/naming.go b/pkg/kubelet/dockershim/naming.go index 012f28bd43c..f615c806428 100644 --- a/pkg/kubelet/dockershim/naming.go +++ b/pkg/kubelet/dockershim/naming.go @@ -23,7 +23,6 @@ import ( "strings" runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" - "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/kubelet/leaky" ) @@ -51,9 +50,9 @@ const ( // Delimiter used to construct docker container names. nameDelimiter = "_" // DockerImageIDPrefix is the prefix of image id in container status. - DockerImageIDPrefix = dockertools.DockerPrefix + DockerImageIDPrefix = "docker://" // DockerPullableImageIDPrefix is the prefix of pullable image id in container status. - DockerPullableImageIDPrefix = dockertools.DockerPullablePrefix + DockerPullableImageIDPrefix = "docker-pullable://" ) func makeSandboxName(s *runtimeapi.PodSandboxConfig) string { diff --git a/pkg/kubelet/dockertools/docker.go b/pkg/kubelet/dockertools/docker.go index 6abd7195463..af19747dee1 100644 --- a/pkg/kubelet/dockertools/docker.go +++ b/pkg/kubelet/dockertools/docker.go @@ -37,15 +37,21 @@ import ( "k8s.io/kubernetes/pkg/credentialprovider" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/images" - "k8s.io/kubernetes/pkg/kubelet/leaky" ) const ( - PodInfraContainerName = leaky.PodInfraContainerName - DockerPrefix = "docker://" - DockerPullablePrefix = "docker-pullable://" - LogSuffix = "log" - ext4MaxFileNameLen = 255 + LogSuffix = "log" + ext4MaxFileNameLen = 255 + + DockerType = "docker" + + // https://docs.docker.com/engine/reference/api/docker_remote_api/ + // docker version should be at least 1.10.x + minimumDockerAPIVersion = "1.22" + + statusRunningPrefix = "Up" + statusExitedPrefix = "Exited" + statusCreatedPrefix = "Created" ) // DockerInterface is an abstract interface for testability. It abstracts the interface of docker client. diff --git a/pkg/kubelet/dockertools/docker_manager.go b/pkg/kubelet/dockertools/docker_manager.go deleted file mode 100644 index aaf4858456e..00000000000 --- a/pkg/kubelet/dockertools/docker_manager.go +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package dockertools - -const ( - DockerType = "docker" - - // https://docs.docker.com/engine/reference/api/docker_remote_api/ - // docker version should be at least 1.10.x - minimumDockerAPIVersion = "1.22" - - statusRunningPrefix = "Up" - statusExitedPrefix = "Exited" - statusCreatedPrefix = "Created" -) diff --git a/test/e2e_node/image_id_test.go b/test/e2e_node/image_id_test.go index a968db5a8b1..ed473742894 100644 --- a/test/e2e_node/image_id_test.go +++ b/test/e2e_node/image_id_test.go @@ -19,7 +19,6 @@ package e2e_node import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/test/e2e/framework" "github.com/davecgh/go-spew/spew" @@ -62,6 +61,6 @@ var _ = framework.KubeDescribe("ImageID", func() { return } - Expect(status.ContainerStatuses[0].ImageID).To(Equal(dockertools.DockerPullablePrefix + busyBoxImage)) + Expect(status.ContainerStatuses[0].ImageID).To(ContainSubstring(busyBoxImage)) }) })