-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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.
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
Containerization support for the kubelet #3112
Containerization support for the kubelet #3112
Conversation
961cc76
to
ac0e5ce
Compare
@pmorie the mount issue we were talking about:
|
This is on docker 1.6 in case we're getting burned by the /var/run secrets overmount issue. |
Still happens in 1.6.2 so no. |
I think the issue is the mount args. On Thu, Jun 11, 2015 at 5:55 PM, Clayton Coleman [email protected]
|
Testing --, it's supposed to work
|
ac0e5ce
to
ac1be06
Compare
Works. New command
@pmorie review please and then merge at your convenience, I'll make a separate update to README.md |
[test] |
@@ -54,7 +54,7 @@ var _ = Interface(&NsenterMounter{}) | |||
const ( | |||
hostRootFsPath = "/rootfs" | |||
hostProcMountsPath = "/rootfs/proc/mounts" | |||
nsenterPath = "/nsenter" | |||
nsenterPath = "nsenter" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
leading slash was wrong?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Didn't search paths - should have let exec.Command search
On Jun 11, 2015, at 10:53 PM, Jordan Liggitt [email protected] wrote:
In Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount/nsenter_mount.go:
@@ -54,7 +54,7 @@ var _ = Interface(&NsenterMounter{})
const (
hostRootFsPath = "/rootfs"
hostProcMountsPath = "/rootfs/proc/mounts"
- nsenterPath = "/nsenter"
- nsenterPath = "nsenter"
leading slash was wrong?—
Reply to this email directly or view it on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@liggitt The test image I used in upstream started out as a scratch image with just the kubelet and nsenter and I never fixed it.
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/3150/) |
@@ -133,7 +135,7 @@ func (*NsenterMounter) IsMountPoint(file string) (bool, error) { | |||
return false, err | |||
} | |||
|
|||
args := []string{"--mount=/rootfs/proc/1/ns/mnt", "/usr/bin/findmnt", "-o", "target", "--noheadings", "--target", file} | |||
args := []string{"--mount=/rootfs/proc/1/ns/mnt", "--", "/usr/bin/findmnt", "-o", "target", "--noheadings", "--target", file} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to upstream this change -- I want to test it w/ my formula for the image I use to test this in upstream.
LGTM but rebase needed |
Looks to me like jenkins flaked but I need to take a closer look after sleep. |
ac1be06
to
384793b
Compare
[merge] |
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/3150/) (Image: devenv-fedora_1796) |
Add OPENSHIFT_CONTAINERIZED=true to trigger this mode, fixes docker config file.
384793b
to
e99b8e3
Compare
[test] |
Evaluated for origin up to e99b8e3 |
Merged by openshift-bot
Use OPENSHIFT_CONTAINERIZED=true in a docker image to toggle
containerized mode.
Fixes #3072