Skip to content

K
k3s
Unverified Commit c2130030 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #71681 from msau42/automated-cherry-pick-of-#70756-#71625-upstream-release-1.13

Automated cherry pick of #70756: Add e2e test for file exec #71625: Volume exec file test: added NodeSelector to pod
parents 4fc99086 34946a25
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 73 deletions
test/e2e/storage/drivers/base.go
View file @ c2130030
......@@ -76,18 +76,26 @@ type DynamicPVTestDriver interface {
GetDynamicProvisionStorageClass(fsType string) *storagev1.StorageClass
}
// Capability represents a feature that a volume plugin supports
type Capability string
const (
CapPersistence Capability = "persistence" // data is persisted across pod restarts
CapBlock Capability = "block" // raw block mode
CapFsGroup Capability = "fsGroup" // volume ownership via fsGroup
CapExec Capability = "exec" // exec a file in the volume
)
// DriverInfo represents a combination of parameters to be used in implementation of TestDriver
type DriverInfo struct {
Name string // Name of the driver
FeatureTag string // FeatureTag for the driver
MaxFileSize int64 // Max file size to be tested for this driver
SupportedFsType sets.String // Map of string for supported fs type
SupportedMountOption sets.String // Map of string for supported mount option
RequiredMountOption sets.String // Map of string for required mount option (Optional)
IsPersistent bool // Flag to represent whether it provides persistency
IsFsGroupSupported bool // Flag to represent whether it supports fsGroup
IsBlockSupported bool // Flag to represent whether it supports Block Volume
MaxFileSize int64 // Max file size to be tested for this driver
SupportedFsType sets.String // Map of string for supported fs type
SupportedMountOption sets.String // Map of string for supported mount option
RequiredMountOption sets.String // Map of string for required mount option (Optional)
Capabilities map[Capability]bool // Map that represents plugin capabilities
// Parameters below will be set inside test loop by using SetCommonDriverParameters.
// Drivers that implement TestDriver is required to set all the above parameters
......
test/e2e/storage/drivers/csi.go
View file @ c2130030
......@@ -67,9 +67,9 @@ func InitHostPathCSIDriver() TestDriver {
SupportedFsType: sets.NewString(
"", // Default fsType
),
IsPersistent: true,
IsFsGroupSupported: false,
IsBlockSupported: false,
Capabilities: map[Capability]bool{
CapPersistence: true,
},
},
}
}
......@@ -153,9 +153,9 @@ func InitHostV0PathCSIDriver() TestDriver {
SupportedFsType: sets.NewString(
"", // Default fsType
),
IsPersistent: true,
IsFsGroupSupported: false,
IsBlockSupported: false,
Capabilities: map[Capability]bool{
CapPersistence: true,
},
},
}
}
......@@ -243,9 +243,11 @@ func InitGcePDCSIDriver() TestDriver {
"ext4",
"xfs",
),
IsPersistent: true,
IsFsGroupSupported: true,
IsBlockSupported: false,
Capabilities: map[Capability]bool{
CapPersistence: true,
CapFsGroup: true,
CapExec: true,
},
},
}
}
......@@ -334,9 +336,11 @@ func InitGcePDExternalCSIDriver() TestDriver {
"ext4",
"xfs",
),
IsPersistent: true,
IsFsGroupSupported: true,
IsBlockSupported: false,
Capabilities: map[Capability]bool{
CapPersistence: true,
CapFsGroup: true,
CapExec: true,
},
},
}
}
......
test/e2e/storage/drivers/in_tree.go
View file @ c2130030
......@@ -90,9 +90,10 @@ func InitNFSDriver() TestDriver {
),
SupportedMountOption: sets.NewString("proto=tcp", "relatime"),
RequiredMountOption: sets.NewString("vers=4.1"),
IsPersistent: true,
IsFsGroupSupported: false,
IsBlockSupported: false,
Capabilities: map[Capability]bool{
CapPersistence: true,
CapExec: true,
},
},
}
}
......@@ -235,9 +236,10 @@ func InitGlusterFSDriver() TestDriver {
SupportedFsType: sets.NewString(
"", // Default fsType
),
IsPersistent: true,
IsFsGroupSupported: false,
IsBlockSupported: false,
Capabilities: map[Capability]bool{
CapPersistence: true,
CapExec: true,
},
},
}
}
......@@ -356,9 +358,12 @@ func InitISCSIDriver() TestDriver {
//"ext3",
"ext4",
),
IsPersistent: true,
IsFsGroupSupported: true,
IsBlockSupported: true,
Capabilities: map[Capability]bool{
CapPersistence: true,
CapFsGroup: true,
CapBlock: true,
CapExec: true,
},
},
}
}
......@@ -465,9 +470,13 @@ func InitRbdDriver() TestDriver {
//"ext3",
"ext4",
),
IsPersistent: true,
IsFsGroupSupported: true,
IsBlockSupported: true},
Capabilities: map[Capability]bool{
CapPersistence: true,
CapFsGroup: true,
CapBlock: true,
CapExec: true,
},
},
}
}
......@@ -585,9 +594,10 @@ func InitCephFSDriver() TestDriver {
SupportedFsType: sets.NewString(
"", // Default fsType
),
IsPersistent: true,
IsFsGroupSupported: false,
IsBlockSupported: false,
Capabilities: map[Capability]bool{
CapPersistence: true,
CapExec: true,
},
},
}
}
......@@ -684,9 +694,9 @@ func InitHostPathDriver() TestDriver {
SupportedFsType: sets.NewString(
"", // Default fsType
),
IsPersistent: true,
IsFsGroupSupported: false,
IsBlockSupported: false,
Capabilities: map[Capability]bool{
CapPersistence: true,
},
},
}
}
......@@ -756,9 +766,9 @@ func InitHostPathSymlinkDriver() TestDriver {
SupportedFsType: sets.NewString(
"", // Default fsType
),
IsPersistent: true,
IsFsGroupSupported: false,
IsBlockSupported: false,
Capabilities: map[Capability]bool{
CapPersistence: true,
},
},
}
}
......@@ -896,9 +906,9 @@ func InitEmptydirDriver() TestDriver {
SupportedFsType: sets.NewString(
"", // Default fsType
),
IsPersistent: false,
IsFsGroupSupported: false,
IsBlockSupported: false,
Capabilities: map[Capability]bool{
CapExec: true,
},
},
}
}
......@@ -963,9 +973,11 @@ func InitCinderDriver() TestDriver {
"", // Default fsType
"ext3",
),
IsPersistent: true,
IsFsGroupSupported: true,
IsBlockSupported: false,
Capabilities: map[Capability]bool{
CapPersistence: true,
CapFsGroup: true,
CapExec: true,
},
},
}
}
......@@ -1121,9 +1133,12 @@ func InitGcePdDriver() TestDriver {
"xfs",
),
SupportedMountOption: sets.NewString("debug", "nouid32"),
IsPersistent: true,
IsFsGroupSupported: true,
IsBlockSupported: true,
Capabilities: map[Capability]bool{
CapPersistence: true,
CapFsGroup: true,
CapBlock: true,
CapExec: true,
},
},
}
}
......@@ -1235,9 +1250,11 @@ func InitVSphereDriver() TestDriver {
"", // Default fsType
"ext4",
),
IsPersistent: true,
IsFsGroupSupported: true,
IsBlockSupported: false,
Capabilities: map[Capability]bool{
CapPersistence: true,
CapFsGroup: true,
CapExec: true,
},
},
}
}
......@@ -1351,9 +1368,12 @@ func InitAzureDriver() TestDriver {
"", // Default fsType
"ext4",
),
IsPersistent: true,
IsFsGroupSupported: true,
IsBlockSupported: true,
Capabilities: map[Capability]bool{
CapPersistence: true,
CapFsGroup: true,
CapBlock: true,
CapExec: true,
},
},
}
}
......@@ -1464,9 +1484,12 @@ func InitAwsDriver() TestDriver {
"ext3",
),
SupportedMountOption: sets.NewString("debug", "nouid32"),
IsPersistent: true,
IsFsGroupSupported: true,
IsBlockSupported: true,
Capabilities: map[Capability]bool{
CapPersistence: true,
CapFsGroup: true,
CapBlock: true,
CapExec: true,
},
},
}
}
......
test/e2e/storage/testsuites/provisioning.go
View file @ c2130030
......@@ -187,7 +187,7 @@ func testProvisioning(input *provisioningTestInput) {
})
It("should create and delete block persistent volumes", func() {
if !input.dInfo.IsBlockSupported {
if !input.dInfo.Capabilities[drivers.CapBlock] {
framework.Skipf("Driver %q does not support BlockVolume - skipping", input.dInfo.Name)
}
block := v1.PersistentVolumeBlock
......
test/e2e/storage/testsuites/volume_io.go
View file @ c2130030
......@@ -90,7 +90,7 @@ func createVolumeIOTestInput(pattern testpatterns.TestPattern, resource genericV
framework.Skipf("Driver %q does not define volumeSource - skipping", dInfo.Name)
}
if dInfo.IsFsGroupSupported {
if dInfo.Capabilities[drivers.CapFsGroup] {
fsGroupVal := int64(1234)
fsGroup = &fsGroupVal
}
......
test/e2e/storage/testsuites/volumemode.go
View file @ c2130030
......@@ -78,13 +78,13 @@ func createVolumeModeTestInput(pattern testpatterns.TestPattern, resource volume
testVolType: pattern.VolType,
nodeName: dInfo.Config.ClientNodeName,
volMode: pattern.VolMode,
isBlockSupported: dInfo.IsBlockSupported,
isBlockSupported: dInfo.Capabilities[drivers.CapBlock],
}
}
func getVolumeModeTestFunc(pattern testpatterns.TestPattern, driver drivers.TestDriver) func(*volumeModeTestInput) {
dInfo := driver.GetDriverInfo()
isBlockSupported := dInfo.IsBlockSupported
isBlockSupported := dInfo.Capabilities[drivers.CapBlock]
volMode := pattern.VolMode
volType := pattern.VolType
......
test/e2e/storage/testsuites/volumes.go
View file @ c2130030
......@@ -23,11 +23,17 @@ package testsuites
import (
"fmt"
"path/filepath"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/storage/drivers"
"k8s.io/kubernetes/test/e2e/storage/testpatterns"
imageutils "k8s.io/kubernetes/test/utils/image"
)
type volumesTestSuite struct {
......@@ -68,12 +74,22 @@ func (t *volumesTestSuite) getTestSuiteInfo() TestSuiteInfo {
}
func (t *volumesTestSuite) skipUnsupportedTest(pattern testpatterns.TestPattern, driver drivers.TestDriver) {
}
func skipPersistenceTest(driver drivers.TestDriver) {
dInfo := driver.GetDriverInfo()
if !dInfo.IsPersistent {
if !dInfo.Capabilities[drivers.CapPersistence] {
framework.Skipf("Driver %q does not provide persistency - skipping", dInfo.Name)
}
}
func skipExecTest(driver drivers.TestDriver) {
dInfo := driver.GetDriverInfo()
if !dInfo.Capabilities[drivers.CapExec] {
framework.Skipf("Driver %q does not support exec - skipping", dInfo.Name)
}
}
func createVolumesTestInput(pattern testpatterns.TestPattern, resource genericVolumeTestResource) volumesTestInput {
var fsGroup *int64
driver := resource.driver
......@@ -85,16 +101,17 @@ func createVolumesTestInput(pattern testpatterns.TestPattern, resource genericVo
framework.Skipf("Driver %q does not define volumeSource - skipping", dInfo.Name)
}
if dInfo.IsFsGroupSupported {
if dInfo.Capabilities[drivers.CapFsGroup] {
fsGroupVal := int64(1234)
fsGroup = &fsGroupVal
}
return volumesTestInput{
f: f,
name: dInfo.Name,
config: dInfo.Config,
fsGroup: fsGroup,
f: f,
name: dInfo.Name,
config: dInfo.Config,
fsGroup: fsGroup,
resource: resource,
tests: []framework.VolumeTest{
{
Volume: *volSource,
......@@ -140,11 +157,12 @@ func (t *volumesTestSuite) execTest(driver drivers.TestDriver, pattern testpatte
}
type volumesTestInput struct {
f *framework.Framework
name string
config framework.VolumeTestConfig
fsGroup *int64
tests []framework.VolumeTest
f *framework.Framework
name string
config framework.VolumeTestConfig
fsGroup *int64
tests []framework.VolumeTest
resource genericVolumeTestResource
}
func testVolumes(input *volumesTestInput) {
......@@ -153,8 +171,68 @@ func testVolumes(input *volumesTestInput) {
cs := f.ClientSet
defer framework.VolumeTestCleanup(f, input.config)
skipPersistenceTest(input.resource.driver)
volumeTest := input.tests
framework.InjectHtml(cs, input.config, volumeTest[0].Volume, volumeTest[0].ExpectedContent)
framework.TestVolumeClient(cs, input.config, input.fsGroup, input.tests)
})
It("should allow exec of files on the volume", func() {
f := input.f
skipExecTest(input.resource.driver)
testScriptInPod(f, input.resource.volType, input.resource.volSource, input.config.NodeSelector)
})
}
func testScriptInPod(
f *framework.Framework,
volumeType string,
source *v1.VolumeSource,
nodeSelector map[string]string) {
const (
volPath = "/vol1"
volName = "vol1"
)
suffix := generateSuffixForPodName(volumeType)
scriptName := fmt.Sprintf("test-%s.sh", suffix)
fullPath := filepath.Join(volPath, scriptName)
cmd := fmt.Sprintf("echo \"ls %s\" > %s; chmod u+x %s; %s", volPath, fullPath, fullPath, fullPath)
pod := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("exec-volume-test-%s", suffix),
Namespace: f.Namespace.Name,
},
Spec: v1.PodSpec{
Containers: []v1.Container{
{
Name: fmt.Sprintf("exec-container-%s", suffix),
Image: imageutils.GetE2EImage(imageutils.Nginx),
Command: []string{"/bin/sh", "-ec", cmd},
VolumeMounts: []v1.VolumeMount{
{
Name: volName,
MountPath: volPath,
},
},
},
},
Volumes: []v1.Volume{
{
Name: volName,
VolumeSource: *source,
},
},
RestartPolicy: v1.RestartPolicyNever,
NodeSelector: nodeSelector,
},
}
By(fmt.Sprintf("Creating pod %s", pod.Name))
f.TestContainerOutput("exec-volume-test", pod, 0, []string{scriptName})
By(fmt.Sprintf("Deleting pod %s", pod.Name))
err := framework.DeletePodWithWait(f, f.ClientSet, pod)
Expect(err).NotTo(HaveOccurred(), "while deleting pod")
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment