Skip to content

K
k3s
Commit 9d4eee63 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #24589 from derekwaynecarr/fix_shm

Automatic merge from submit-queue docker daemon complains SHM size must be greater than 0 Fixes https://github.com/kubernetes/kubernetes/issues/24588 I am hitting this on Fedora 23 w/ docker 1.9.1 using systemd cgroup-driver. ``` $ docker version Client: Version: 1.9.1 API version: 1.21 Package version: docker-1.9.1-9.gitee06d03.fc23.x86_64 Go version: go1.5.3 Git commit: ee06d03/1.9.1 Built: OS/Arch: linux/amd64 Server: Version: 1.9.1 API version: 1.21 Package version: docker-1.9.1-9.gitee06d03.fc23.x86_64 Go version: go1.5.3 Git commit: ee06d03/1.9.1 Built: OS/Arch: linux/amd64 ``` Not sure why I am on the only one hitting it right now, but putting this out here for comment. /cc @kubernetes/sig-node @kubernetes/rh-cluster-infra @smarterclayton
parents de3ce4f4 cbf1cb81
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
pkg/kubelet/dockertools/kube_docker_client.go
View file @ 9d4eee63
...@@ -55,6 +55,9 @@ type kubeDockerClient struct { ...@@ -55,6 +55,9 @@ type kubeDockerClient struct {
// Make sure that kubeDockerClient implemented the DockerInterface. // Make sure that kubeDockerClient implemented the DockerInterface.
var _ DockerInterface = &kubeDockerClient{} var _ DockerInterface = &kubeDockerClient{}
// the default ShmSize to use (in bytes) if not specified.
const defaultShmSize = int64(1024 * 1024 * 64)
// newKubeDockerClient creates an kubeDockerClient from an existing docker client. // newKubeDockerClient creates an kubeDockerClient from an existing docker client.
func newKubeDockerClient(dockerClient *dockerapi.Client) DockerInterface { func newKubeDockerClient(dockerClient *dockerapi.Client) DockerInterface {
return &kubeDockerClient{ return &kubeDockerClient{
...@@ -126,6 +129,11 @@ func (d *kubeDockerClient) InspectContainer(id string) (*dockertypes.ContainerJS ...@@ -126,6 +129,11 @@ func (d *kubeDockerClient) InspectContainer(id string) (*dockertypes.ContainerJS
} }
func (d *kubeDockerClient) CreateContainer(opts dockertypes.ContainerCreateConfig) (*dockertypes.ContainerCreateResponse, error) { func (d *kubeDockerClient) CreateContainer(opts dockertypes.ContainerCreateConfig) (*dockertypes.ContainerCreateResponse, error) {
// we provide an explicit default shm size as to not depend on docker daemon.
// TODO: evaluate exposing this as a knob in the API
if opts.HostConfig != nil && opts.HostConfig.ShmSize <= 0 {
opts.HostConfig.ShmSize = defaultShmSize
}
createResp, err := d.client.ContainerCreate(getDefaultContext(), opts.Config, opts.HostConfig, opts.NetworkingConfig, opts.Name) createResp, err := d.client.ContainerCreate(getDefaultContext(), opts.Config, opts.HostConfig, opts.NetworkingConfig, opts.Name)
if err != nil { if err != nil {
return nil, err return nil, err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment