Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Metadata, duplicate binds and find fixes #57

Merged
merged 4 commits into from
Jan 31, 2018
Merged

Metadata, duplicate binds and find fixes #57

merged 4 commits into from
Jan 31, 2018

Commits on Jan 30, 2018

  1. Drop duplicate mounts of CNI directories. 

    Previously we had:
```
config:
  binds:
  - /var/lib/cni/conf:/etc/cni/net.d:rshared,rbind
  - /var/lib/cni/bin:/opt/cni/bin:rshared,rbind
  ...
  runtime:
    mounts:
    - type: bind
      source: /var/lib/cni/bin
      destination: /opt/cni/bin
      options: ["rw","bind"]
    - type: bind
      source: /var/lib/cni/conf
      destination: /etc/cni/net.d
      options: ["rw","bind"]
```

Which is redundant. Drop `runtime.mounts` to leave just the `binds`.

Signed-off-by: Ian Campbell <ijc@docker.com>
    Ian Campbell committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    81e8953 View commit details
    Browse the repository at this point in the history

  2. Add findutils to kubelet container. 

    kubelet wants a fully featured `find` now it seems:
```
E0130 14:50:23.475987     654 fsHandler.go:121] failed to collect filesystem stats - rootDiskErr: <nil>, rootInodeErr: cmd [find /var/lib/docker/overlay2/2c4a7692faaaa08afc65430415958e14ae64cd419ad4baa8555cddda3c934814/diff -
xdev -printf .] failed. stderr: find: unrecognized: -printf
BusyBox v1.27.2 (2017-12-12 10:41:50 GMT) multi-call binary.

Usage: find [-HL] [PATH]... [OPTIONS] [ACTIONS]

Search for files and perform actions on them.
```

Unsure when this started.

Signed-off-by: Ian Campbell <ijc@docker.com>
    Ian Campbell committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    48dcfa1 View commit details
    Browse the repository at this point in the history

  3. kubelet: look for metadata in /run/config. 

    In linuxkit#53 the `linuxkit/metadata` package was updated, which moved the metadata
from `/var/config` to `/run/config`, the effects of which are easy to miss. In
my case KUBE_MASTER_UNTAINT=y was having no effect and user pods were therefore
not getting scheduld.

Signed-off-by: Ian Campbell <ijc@docker.com>
    Ian Campbell committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    b9bdf91 View commit details
    Browse the repository at this point in the history

  4. Update hashes 

    Signed-off-by: Ian Campbell <ijc@docker.com>
    Ian Campbell committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    270086d View commit details
    Browse the repository at this point in the history