github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27143 from adityakali/localssd

Browse Source 
Automatic merge from submit-queue

support for mounting local-ssds on GCI

This change adds support for mounting local ssds on GCI.
It updates the previous container-vm behavior as well to
match that for GCI nodes by mounting the local-ssds under
the same path (/mnt/disks/ssdN).

@vulpecula @roberthbailey @andyzheng0831 @kubernetes/goog-image
This commit is contained in:
k8s-merge-robot
2016-06-10 04:05:21 -07:00
committed by GitHub
parent c71fd7b1ae 4447c54682
commit 8c88cbe74c
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/gke_local_ssd.go
View File

@@ -54,7 +54,7 @@ func createNodePoolWithLocalSsds(nodePoolName string) {
}
func doTestWriteAndReadToLocalSsd(f *framework.Framework) {
var pod = testPodWithSsd("echo 'hello world' > /mnt/ssd0/data && sleep 1 && cat /mnt/ssd0/data")
var pod = testPodWithSsd("echo 'hello world' > /mnt/disks/ssd0/data && sleep 1 && cat /mnt/disks/ssd0/data")
var msg string
var out = []string{"hello world"}
@@ -64,7 +64,7 @@ func doTestWriteAndReadToLocalSsd(f *framework.Framework) {
func testPodWithSsd(command string) *api.Pod {
containerName := "test-container"
volumeName := "test-ssd-volume"
path := "/mnt/ssd0"
path := "/mnt/disks/ssd0"
podName := "pod-" + string(util.NewUUID())
image := "ubuntu:14.04"
return &api.Pod{