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

Merge pull request #87825 from kevtaylor/kep/VolumeSubpathExpansionE2ETests

Browse Source 
Change HostPath to EmptyDir for VolumeSubpathEnvExpansion e2e tests
This commit is contained in:
Kubernetes Prow Robot 2020-02-04 20:45:55 -08:00 committed by GitHub
commit 133f77247c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
test/e2e/common/expansion.go
View File

@ -184,7 +184,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
SubPathExpr: "$(POD_NAME)", SubPathExpr: "$(POD_NAME)",
}, },
{ {
Name: "workdir2", Name: "workdir1",
MountPath: "/testcontainer", MountPath: "/testcontainer",
}, },
}, },
@ -195,13 +195,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
{ {
Name: "workdir1", Name: "workdir1",
VolumeSource: v1.VolumeSource{ VolumeSource: v1.VolumeSource{
HostPath: &v1.HostPathVolumeSource{Path: "/tmp"}, EmptyDir: &v1.EmptyDirVolumeSource{},
},
},
{
Name: "workdir2",
VolumeSource: v1.VolumeSource{
HostPath: &v1.HostPathVolumeSource{Path: "/tmp"},
}, },
}, },
}, },
@ -353,7 +347,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
SubPathExpr: "$(ANNOTATION)/$(POD_NAME)", SubPathExpr: "$(ANNOTATION)/$(POD_NAME)",
}, },
{ {
Name: "workdir2", Name: "workdir1",
MountPath: "/volume_mount", MountPath: "/volume_mount",
}, },
}, },
@ -363,13 +357,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
{ {
Name: "workdir1", Name: "workdir1",
VolumeSource: v1.VolumeSource{ VolumeSource: v1.VolumeSource{
HostPath: &v1.HostPathVolumeSource{Path: "/tmp"}, EmptyDir: &v1.EmptyDirVolumeSource{},
},
},
{
Name: "workdir2",
VolumeSource: v1.VolumeSource{
HostPath: &v1.HostPathVolumeSource{Path: "/tmp"},
}, },
}, },
}, },
@ -443,7 +431,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
SubPathExpr: "$(ANNOTATION)/$(POD_NAME)", SubPathExpr: "$(ANNOTATION)/$(POD_NAME)",
}, },
{ {
Name: "workdir2", Name: "workdir1",
MountPath: "/volume_mount", MountPath: "/volume_mount",
}, },
}, },
@ -454,13 +442,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
{ {
Name: "workdir1", Name: "workdir1",
VolumeSource: v1.VolumeSource{ VolumeSource: v1.VolumeSource{
HostPath: &v1.HostPathVolumeSource{Path: "/tmp"}, EmptyDir: &v1.EmptyDirVolumeSource{},
},
},
{
Name: "workdir2",
VolumeSource: v1.VolumeSource{
HostPath: &v1.HostPathVolumeSource{Path: "/tmp"},
}, },
}, },
}, },
@ -536,7 +518,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
MountPath: "/subpath_mount", MountPath: "/subpath_mount",
}, },
{ {
Name: "workdir2", Name: "workdir1",
MountPath: "/volume_mount", MountPath: "/volume_mount",
}, },
}, },
@ -566,7 +548,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
SubPathExpr: "$(POD_NAME)", SubPathExpr: "$(POD_NAME)",
}, },
{ {
Name: "workdir2", Name: "workdir1",
MountPath: "/volume_mount", MountPath: "/volume_mount",
}, },
}, },
@ -577,13 +559,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
{ {
Name: "workdir1", Name: "workdir1",
VolumeSource: v1.VolumeSource{ VolumeSource: v1.VolumeSource{
HostPath: &v1.HostPathVolumeSource{Path: "/tmp"}, EmptyDir: &v1.EmptyDirVolumeSource{},
},
},
{
Name: "workdir2",
VolumeSource: v1.VolumeSource{
HostPath: &v1.HostPathVolumeSource{Path: "/tmp"},
}, },
}, },
}, },