Metadata, duplicate binds and find fixes #57
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 4 commits
January 30, 2018 16:49
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>
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>
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>
Signed-off-by: Ian Campbell <ijc@docker.com>
rn
approved these changes
Jan 31, 2018
This was referenced Feb 7, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Three largely independent fixes:
/run/config(not/var/config) since Bump hashes to LinuxKit v0.2 #53 (changes to*.sh).find -printfand hencefindutilsinstead ofbusybox find(change toDockerfile)bindsagain viaruntime.mounts) into the kubelet container (change tobuild.yml).