-
Notifications
You must be signed in to change notification settings - Fork 38.6k
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
Automated cherry pick of #41944 #43403
Merged
k8s-github-robot
merged 1 commit into
kubernetes:release-1.5
from
jingxu97:automated-cherry-pick-of-#41944-upstream-release-1.5
Mar 31, 2017
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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
Binary file not shown.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| Copyright 2017 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 main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "os/exec" | ||
| "path/filepath" | ||
| "strings" | ||
| ) | ||
|
|
||
| const ( | ||
| // Location of the mount file to use | ||
| chrootCmd = "chroot" | ||
| mountCmd = "mount" | ||
| rootfs = "rootfs" | ||
| nfsRPCBindErrMsg = "mount.nfs: rpc.statd is not running but is required for remote locking.\nmount.nfs: Either use '-o nolock' to keep locks local, or start statd.\nmount.nfs: an incorrect mount option was specified\n" | ||
| rpcBindCmd = "/sbin/rpcbind" | ||
| defaultRootfs = "/home/kubernetes/containerized_mounter/rootfs" | ||
| ) | ||
|
|
||
| func main() { | ||
|
|
||
| if len(os.Args) < 2 { | ||
| fmt.Fprintf(os.Stderr, "Command failed: must provide a command to run.\n") | ||
| return | ||
| } | ||
| path, _ := filepath.Split(os.Args[0]) | ||
| rootfsPath := filepath.Join(path, rootfs) | ||
| if _, err := os.Stat(rootfsPath); os.IsNotExist(err) { | ||
| rootfsPath = defaultRootfs | ||
| } | ||
| command := os.Args[1] | ||
| switch command { | ||
| case mountCmd: | ||
| mountErr := mountInChroot(rootfsPath, os.Args[2:]) | ||
| if mountErr != nil { | ||
| fmt.Fprintf(os.Stderr, "Mount failed: %v", mountErr) | ||
| os.Exit(1) | ||
| } | ||
| default: | ||
| fmt.Fprintf(os.Stderr, "Unknown command, must be %s", mountCmd) | ||
| os.Exit(1) | ||
|
|
||
| } | ||
| } | ||
|
|
||
| // MountInChroot is to run mount within chroot with the passing root directory | ||
| func mountInChroot(rootfsPath string, args []string) error { | ||
| if _, err := os.Stat(rootfsPath); os.IsNotExist(err) { | ||
| return fmt.Errorf("Path <%s> does not exist.\n", rootfsPath) | ||
| } | ||
| args = append([]string{rootfsPath, mountCmd}, args...) | ||
| output, err := exec.Command(chrootCmd, args...).CombinedOutput() | ||
| if err == nil { | ||
| return err | ||
| } | ||
|
|
||
| if !strings.EqualFold(string(output), nfsRPCBindErrMsg) { | ||
| // Mount failed but not because of RPC bind error | ||
| return fmt.Errorf("Mount failed: %v\nMounting command: %s\nMounting arguments: %v\nOutput: %s\n", err, chrootCmd, args, string(output)) | ||
| } | ||
|
|
||
| // Mount failed because it is NFS V3 and we need to run rpcBind | ||
| output, err = exec.Command(chrootCmd, rootfsPath, rpcBindCmd, "-w").CombinedOutput() | ||
| if err != nil { | ||
| return fmt.Errorf("Mount issued for NFS V3 but unable to run rpcbind:\n Output: %s\n Error: %v", string(output), err) | ||
| } | ||
|
|
||
| // Rpcbind is running, try mounting again | ||
| output, err = exec.Command(chrootCmd, args...).CombinedOutput() | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("Mount failed for NFS V3 even after running rpcBind %s, %v", string(output), err) | ||
| } | ||
|
|
||
| return nil | ||
| } |
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
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
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
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
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
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
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
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
Oops, something went wrong.
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.
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.
Have we tested this with u+x to see if that would work too? I saw this was noted in #41944 as well, so it may have been decided offline that a+x is ok, but it would be nice to not have to be so broad with the permissions.
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.
u+x should work, but maybe we could use a different PR to change it on both 1.5 and 1.6?
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.
A different PR is fine.