github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19612 from swagiaal/add-fsgroup-to-e2e

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-29 21:55:02 -08:00
commit 5b3318a0c8
1 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
test/e2e/volumes.go
View File

@ -42,6 +42,7 @@ package e2e
import (
"fmt"
"os/exec"
"strconv"
"strings"
"time"
@ -167,16 +168,19 @@ func volumeTestCleanup(client *client.Client, config VolumeTestConfig) {
glog.Warningf("Failed to delete client pod: %v", err)
expectNoError(err, "Failed to delete client pod: %v", err)
}
err = podClient.Delete(config.prefix+"-server", nil)
if err != nil {
glog.Warningf("Failed to delete server pod: %v", err)
expectNoError(err, "Failed to delete server pod: %v", err)
if config.serverImage != "" {
err = podClient.Delete(config.prefix+"-server", nil)
if err != nil {
glog.Warningf("Failed to delete server pod: %v", err)
expectNoError(err, "Failed to delete server pod: %v", err)
}
}
}
// Start a client pod using given VolumeSource (exported by startVolumeServer())
// and check that the pod sees the data from the server pod.
func testVolumeClient(client *client.Client, config VolumeTestConfig, volume api.VolumeSource, expectedContent string) {
func testVolumeClient(client *client.Client, config VolumeTestConfig, volume api.VolumeSource, fsGroup *int64, expectedContent string) {
By(fmt.Sprint("starting ", config.prefix, " client"))
podClient := client.Pods(config.namespace)
@ -211,6 +215,11 @@ func testVolumeClient(client *client.Client, config VolumeTestConfig, volume api
},
},
},
SecurityContext: &api.PodSecurityContext{
SELinuxOptions: &api.SELinuxOptions{
Level: "s0:c0,c1",
},
},
Volumes: []api.Volume{
{
Name: config.prefix + "-volume",
@ -219,6 +228,10 @@ func testVolumeClient(client *client.Client, config VolumeTestConfig, volume api
},
},
}
if fsGroup != nil {
clientPod.Spec.SecurityContext.FSGroup = fsGroup
}
if _, err := podClient.Create(clientPod); err != nil {
Failf("Failed to create %s pod: %v", clientPod.Name, err)
}
@ -250,6 +263,12 @@ func testVolumeClient(client *client.Client, config VolumeTestConfig, volume api
By("checking the page content")
Expect(body).To(ContainSubstring(expectedContent))
if fsGroup != nil {
By("Checking fsGroup")
_, err = lookForStringInPodExec(config.namespace, clientPod.Name, []string{"ls", "-ld", "/usr/share/nginx/html"}, strconv.Itoa(int(*fsGroup)), time.Minute)
Expect(err).NotTo(HaveOccurred(), "waiting for output from pod exec")
}
}
// Insert index.html with given content into given volume. It does so by
@ -285,6 +304,11 @@ func injectHtml(client *client.Client, config VolumeTestConfig, volume api.Volum
},
},
},
SecurityContext: &api.PodSecurityContext{
SELinuxOptions: &api.SELinuxOptions{
Level: "s0:c0,c1",
},
},
RestartPolicy: api.RestartPolicyNever,
Volumes: []api.Volume{
{
@ -373,7 +397,7 @@ var _ = Describe("Volumes [Feature:Volumes]", func() {
},
}
// Must match content of test/images/volumes-tester/nfs/index.html
testVolumeClient(c, config, volume, "Hello from NFS!")
testVolumeClient(c, config, volume, nil, "Hello from NFS!")
})
})
@ -447,7 +471,7 @@ var _ = Describe("Volumes [Feature:Volumes]", func() {
},
}
// Must match content of test/images/volumes-tester/gluster/index.html
testVolumeClient(c, config, volume, "Hello from GlusterFS!")
testVolumeClient(c, config, volume, nil, "Hello from GlusterFS!")
})
})
@ -486,14 +510,15 @@ var _ = Describe("Volumes [Feature:Volumes]", func() {
ISCSI: &api.ISCSIVolumeSource{
TargetPortal: serverIP + ":3260",
// from test/images/volumes-tester/iscsi/initiatorname.iscsi
IQN: "iqn.2003-01.org.linux-iscsi.f21.x8664:sn.4b0aae584f7c",
Lun: 0,
FSType: "ext2",
ReadOnly: true,
IQN: "iqn.2003-01.org.linux-iscsi.f21.x8664:sn.4b0aae584f7c",
Lun: 0,
FSType: "ext2",
},
}
fsGroup := int64(1234)
// Must match content of test/images/volumes-tester/iscsi/block.tar.gz
testVolumeClient(c, config, volume, "Hello from iSCSI")
testVolumeClient(c, config, volume, &fsGroup, "Hello from iSCSI")
})
})
@ -560,12 +585,13 @@ var _ = Describe("Volumes [Feature:Volumes]", func() {
SecretRef: &api.LocalObjectReference{
Name: config.prefix + "-secret",
},
FSType: "ext2",
ReadOnly: true,
FSType: "ext2",
},
}
fsGroup := int64(1234)
// Must match content of test/images/volumes-tester/gluster/index.html
testVolumeClient(c, config, volume, "Hello from RBD")
testVolumeClient(c, config, volume, &fsGroup, "Hello from RBD")
})
})
@ -631,7 +657,7 @@ var _ = Describe("Volumes [Feature:Volumes]", func() {
},
}
// Must match content of contrib/for-tests/volumes-ceph/ceph/index.html
testVolumeClient(c, config, volume, "Hello Ceph!")
testVolumeClient(c, config, volume, nil, "Hello Ceph!")
})
})
@ -704,7 +730,8 @@ var _ = Describe("Volumes [Feature:Volumes]", func() {
content := "Hello from Cinder from namespace " + volumeName
injectHtml(c, config, volume, content)
testVolumeClient(c, config, volume, content)
fsGroup := int64(1234)
testVolumeClient(c, config, volume, &fsGroup, content)
})
})
})