github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #68099 from mkimuram/issue/68093 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md.

Fix hostpath subpath reconstruction tests are failing

**What this PR does / why we need it**:
Fix hostpath subpath reconstruction tests are failing

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes: #68093

**Special notes for your reviewer**:
/sig storage

**Release note**:
```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-08-30 18:34:42 -07:00 committed by GitHub
parent 88a0987f93 79230ee56e
commit 07f68ea842
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
test/e2e/storage/drivers/in_tree.go
View File

@ -649,21 +649,21 @@ func (c *cephFSDriver) DeleteVolume(volType testpatterns.TestVolType) {
}
// Hostpath
type hostpathDriver struct {
type hostPathDriver struct {
node v1.Node
driverInfo DriverInfo
}
var _ TestDriver = &hostpathDriver{}
var _ PreprovisionedVolumeTestDriver = &hostpathDriver{}
var _ InlineVolumeTestDriver = &hostpathDriver{}
var _ TestDriver = &hostPathDriver{}
var _ PreprovisionedVolumeTestDriver = &hostPathDriver{}
var _ InlineVolumeTestDriver = &hostPathDriver{}
// InitHostpathDriver returns hostpathDriver that implements TestDriver interface
func InitHostpathDriver() TestDriver {
return &hostpathDriver{
// InitHostpathDriver returns hostPathDriver that implements TestDriver interface
func InitHostPathDriver() TestDriver {
return &hostPathDriver{
driverInfo: DriverInfo{
Name: "hostpath",
Name: "hostPath",
MaxFileSize: testpatterns.FileSizeMedium,
SupportedFsType: sets.NewString(
"", // Default fsType
@ -675,15 +675,15 @@ func InitHostpathDriver() TestDriver {
}
}
func (h *hostpathDriver) GetDriverInfo() *DriverInfo {
func (h *hostPathDriver) GetDriverInfo() *DriverInfo {
return &h.driverInfo
}
func (h *hostpathDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
func (h *hostPathDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
}
func (h *hostpathDriver) GetVolumeSource(readOnly bool, fsType string) *v1.VolumeSource {
// hostpath doesn't support readOnly volume
func (h *hostPathDriver) GetVolumeSource(readOnly bool, fsType string) *v1.VolumeSource {
// hostPath doesn't support readOnly volume
if readOnly {
return nil
}
@ -694,13 +694,13 @@ func (h *hostpathDriver) GetVolumeSource(readOnly bool, fsType string) *v1.Volum
}
}
func (h *hostpathDriver) CreateDriver() {
func (h *hostPathDriver) CreateDriver() {
}
func (h *hostpathDriver) CleanupDriver() {
func (h *hostPathDriver) CleanupDriver() {
}
func (h *hostpathDriver) CreateVolume(volType testpatterns.TestVolType) {
func (h *hostPathDriver) CreateVolume(volType testpatterns.TestVolType) {
f := h.driverInfo.Framework
cs := f.ClientSet
@ -710,11 +710,11 @@ func (h *hostpathDriver) CreateVolume(volType testpatterns.TestVolType) {
h.driverInfo.Config.ClientNodeName = node.Name
}
func (h *hostpathDriver) DeleteVolume(volType testpatterns.TestVolType) {
func (h *hostPathDriver) DeleteVolume(volType testpatterns.TestVolType) {
}
// HostpathSymlink
type hostpathSymlinkDriver struct {
// HostPathSymlink
type hostPathSymlinkDriver struct {
node v1.Node
sourcePath string
targetPath string
@ -723,15 +723,15 @@ type hostpathSymlinkDriver struct {
driverInfo DriverInfo
}
var _ TestDriver = &hostpathSymlinkDriver{}
var _ PreprovisionedVolumeTestDriver = &hostpathSymlinkDriver{}
var _ InlineVolumeTestDriver = &hostpathSymlinkDriver{}
var _ TestDriver = &hostPathSymlinkDriver{}
var _ PreprovisionedVolumeTestDriver = &hostPathSymlinkDriver{}
var _ InlineVolumeTestDriver = &hostPathSymlinkDriver{}
// InitHostpathSymlinkDriver returns hostpathSymlinkDriver that implements TestDriver interface
func InitHostpathSymlinkDriver() TestDriver {
return &hostpathSymlinkDriver{
// InitHostPathSymlinkDriver returns hostPathSymlinkDriver that implements TestDriver interface
func InitHostPathSymlinkDriver() TestDriver {
return &hostPathSymlinkDriver{
driverInfo: DriverInfo{
Name: "hostpathSymlink",
Name: "hostPathSymlink",
MaxFileSize: testpatterns.FileSizeMedium,
SupportedFsType: sets.NewString(
"", // Default fsType
@ -743,15 +743,15 @@ func InitHostpathSymlinkDriver() TestDriver {
}
}
func (h *hostpathSymlinkDriver) GetDriverInfo() *DriverInfo {
func (h *hostPathSymlinkDriver) GetDriverInfo() *DriverInfo {
return &h.driverInfo
}
func (h *hostpathSymlinkDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
func (h *hostPathSymlinkDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
}
func (h *hostpathSymlinkDriver) GetVolumeSource(readOnly bool, fsType string) *v1.VolumeSource {
// hostpath doesn't support readOnly volume
func (h *hostPathSymlinkDriver) GetVolumeSource(readOnly bool, fsType string) *v1.VolumeSource {
// hostPathSymlink doesn't support readOnly volume
if readOnly {
return nil
}
@ -762,13 +762,13 @@ func (h *hostpathSymlinkDriver) GetVolumeSource(readOnly bool, fsType string) *v
}
}
func (h *hostpathSymlinkDriver) CreateDriver() {
func (h *hostPathSymlinkDriver) CreateDriver() {
}
func (h *hostpathSymlinkDriver) CleanupDriver() {
func (h *hostPathSymlinkDriver) CleanupDriver() {
}
func (h *hostpathSymlinkDriver) CreateVolume(volType testpatterns.TestVolType) {
func (h *hostPathSymlinkDriver) CreateVolume(volType testpatterns.TestVolType) {
f := h.driverInfo.Framework
cs := f.ClientSet
@ -784,7 +784,7 @@ func (h *hostpathSymlinkDriver) CreateVolume(volType testpatterns.TestVolType) {
cmd := fmt.Sprintf("mkdir %v -m 777 && ln -s %v %v", h.sourcePath, h.sourcePath, h.targetPath)
privileged := true
// Launch pod to initialize hostpath directory and symlink
// Launch pod to initialize hostPath directory and symlink
h.prepPod = &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("hostpath-symlink-prep-%s", f.Namespace.Name),
@ -822,29 +822,29 @@ func (h *hostpathSymlinkDriver) CreateVolume(volType testpatterns.TestVolType) {
}
// h.prepPod will be reused in cleanupDriver.
pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(h.prepPod)
Expect(err).ToNot(HaveOccurred(), "while creating hostpath init pod")
Expect(err).ToNot(HaveOccurred(), "while creating hostPath init pod")
err = framework.WaitForPodSuccessInNamespace(f.ClientSet, pod.Name, pod.Namespace)
Expect(err).ToNot(HaveOccurred(), "while waiting for hostpath init pod to succeed")
Expect(err).ToNot(HaveOccurred(), "while waiting for hostPath init pod to succeed")
err = framework.DeletePodWithWait(f, f.ClientSet, pod)
Expect(err).ToNot(HaveOccurred(), "while deleting hostpath init pod")
Expect(err).ToNot(HaveOccurred(), "while deleting hostPath init pod")
}
func (h *hostpathSymlinkDriver) DeleteVolume(volType testpatterns.TestVolType) {
func (h *hostPathSymlinkDriver) DeleteVolume(volType testpatterns.TestVolType) {
f := h.driverInfo.Framework
cmd := fmt.Sprintf("rm -rf %v&& rm -rf %v", h.targetPath, h.sourcePath)
h.prepPod.Spec.Containers[0].Command = []string{"/bin/sh", "-ec", cmd}
pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(h.prepPod)
Expect(err).ToNot(HaveOccurred(), "while creating hostpath teardown pod")
Expect(err).ToNot(HaveOccurred(), "while creating hostPath teardown pod")
err = framework.WaitForPodSuccessInNamespace(f.ClientSet, pod.Name, pod.Namespace)
Expect(err).ToNot(HaveOccurred(), "while waiting for hostpath teardown pod to succeed")
Expect(err).ToNot(HaveOccurred(), "while waiting for hostPath teardown pod to succeed")
err = framework.DeletePodWithWait(f, f.ClientSet, pod)
Expect(err).ToNot(HaveOccurred(), "while deleting hostpath teardown pod")
Expect(err).ToNot(HaveOccurred(), "while deleting hostPath teardown pod")
}
// emptydir

4
test/e2e/storage/in_tree_volumes.go
View File

@ -34,8 +34,8 @@ var testDrivers = []func() drivers.TestDriver{
drivers.InitISCSIDriver,
drivers.InitRbdDriver,
drivers.InitCephFSDriver,
drivers.InitHostpathDriver,
drivers.InitHostpathSymlinkDriver,
drivers.InitHostPathDriver,
drivers.InitHostPathSymlinkDriver,
drivers.InitEmptydirDriver,
drivers.InitCinderDriver,
drivers.InitGcePdDriver,