Skip to content

Commit 468b3b4

Browse files
kevtaylorkevtaylor
committed
Promote VolumeSubpathExpansion e2e tests to Conformance
1 parent 665c664 commit 468b3b4

File tree

2 files changed

+75
-29
lines changed

2 files changed

+75
-29
lines changed

‎test/conformance/testdata/conformance.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,50 @@
410410
proper values.
411411
release: v1.9
412412
file: test/e2e/common/expansion.go
413+
- testname: VolumeSubpathEnvExpansion, subpath expansion
414+
codename: '[k8s.io] Variable Expansion should allow substituting values in a volume
415+
subpath [sig-storage] [Conformance]'
416+
description: Make sure a container's subpath can be set using an expansion of environment
417+
variables.
418+
release: v1.19
419+
file: test/e2e/common/expansion.go
420+
- testname: VolumeSubpathEnvExpansion, subpath with absolute path
421+
codename: '[k8s.io] Variable Expansion should fail substituting values in a volume
422+
subpath with absolute path [sig-storage][Slow] [Conformance]'
423+
description: Make sure a container's subpath can not be set using an expansion of
424+
environment variables when absolute path is supplied.
425+
release: v1.19
426+
file: test/e2e/common/expansion.go
427+
- testname: VolumeSubpathEnvExpansion, subpath with backticks
428+
codename: '[k8s.io] Variable Expansion should fail substituting values in a volume
429+
subpath with backticks [sig-storage][Slow] [Conformance]'
430+
description: Make sure a container's subpath can not be set using an expansion of
431+
environment variables when backticks are supplied.
432+
release: v1.19
433+
file: test/e2e/common/expansion.go
434+
- testname: VolumeSubpathEnvExpansion, subpath lifecycle
435+
codename: '[k8s.io] Variable Expansion should not change the subpath mount on a
436+
container restart if the environment variable changes [sig-storage][Slow] [Conformance]'
437+
description: "Verify should not change the subpath mount on a container restart
438+
if the environment variable changes 1.\tvalid subpathexpr starts a container running
439+
2.\ttest for valid subpath writes 3.\tcontainer restarts 4.\tdelete cleanly"
440+
release: v1.19
441+
file: test/e2e/common/expansion.go
442+
- testname: VolumeSubpathEnvExpansion, subpath test writes
443+
codename: '[k8s.io] Variable Expansion should succeed in writing subpaths in container
444+
[sig-storage][Slow] [Conformance]'
445+
description: "Verify that a subpath expansion can be used to write files into subpaths.
446+
1.\tvalid subpathexpr starts a container running 2.\ttest for valid subpath writes
447+
3.\tsuccessful expansion of the subpathexpr isn't required for volume cleanup"
448+
release: v1.19
449+
file: test/e2e/common/expansion.go
450+
- testname: VolumeSubpathEnvExpansion, subpath ready from failed state
451+
codename: '[k8s.io] Variable Expansion should verify that a failing subpath expansion
452+
can be modified during the lifecycle of a container [sig-storage][Slow] [Conformance]'
453+
description: Verify that a failing subpath expansion can be modified during the
454+
lifecycle of a container.
455+
release: v1.19
456+
file: test/e2e/common/expansion.go
413457
- testname: Pod events, verify event from Scheduler and Kubelet
414458
codename: '[k8s.io] [sig-node] Events should be sent by kubelets and the scheduler
415459
about pods scheduling and running [Conformance]'

‎test/e2e/common/expansion.go‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
155155
})
156156

157157
/*
158-
Testname: var-expansion-subpath
159-
Description: Make sure a container's subpath can be set using an
160-
expansion of environment variables.
158+
Release : v1.19
159+
Testname: VolumeSubpathEnvExpansion, subpath expansion
160+
Description: Make sure a container's subpath can be set using an expansion of environment variables.
161161
*/
162-
ginkgo.It("should allow substituting values in a volume subpath [sig-storage]", func() {
162+
framework.ConformanceIt("should allow substituting values in a volume subpath [sig-storage]", func() {
163163
podName := "var-expansion-" + string(uuid.NewUUID())
164164
pod := &v1.Pod{
165165
ObjectMeta: metav1.ObjectMeta{
@@ -209,11 +209,11 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
209209
})
210210

211211
/*
212-
Testname: var-expansion-subpath-with-backticks
213-
Description: Make sure a container's subpath can not be set using an
214-
expansion of environment variables when backticks are supplied.
212+
Release : v1.19
213+
Testname: VolumeSubpathEnvExpansion, subpath with backticks
214+
Description: Make sure a container's subpath can not be set using an expansion of environment variables when backticks are supplied.
215215
*/
216-
ginkgo.It("should fail substituting values in a volume subpath with backticks [sig-storage][Slow]", func() {
216+
framework.ConformanceIt("should fail substituting values in a volume subpath with backticks [sig-storage][Slow]", func() {
217217

218218
podName := "var-expansion-" + string(uuid.NewUUID())
219219
pod := &v1.Pod{
@@ -258,11 +258,11 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
258258
})
259259

260260
/*
261-
Testname: var-expansion-subpath-with-absolute-path
262-
Description: Make sure a container's subpath can not be set using an
263-
expansion of environment variables when absolute path is supplied.
261+
Release : v1.19
262+
Testname: VolumeSubpathEnvExpansion, subpath with absolute path
263+
Description: Make sure a container's subpath can not be set using an expansion of environment variables when absolute path is supplied.
264264
*/
265-
ginkgo.It("should fail substituting values in a volume subpath with absolute path [sig-storage][Slow]", func() {
265+
framework.ConformanceIt("should fail substituting values in a volume subpath with absolute path [sig-storage][Slow]", func() {
266266

267267
podName := "var-expansion-" + string(uuid.NewUUID())
268268
pod := &v1.Pod{
@@ -307,10 +307,11 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
307307
})
308308

309309
/*
310-
Testname: var-expansion-subpath-ready-from-failed-state
311-
Description: Verify that a failing subpath expansion can be modified during the lifecycle of a container.
310+
Release : v1.19
311+
Testname: VolumeSubpathEnvExpansion, subpath ready from failed state
312+
Description: Verify that a failing subpath expansion can be modified during the lifecycle of a container.
312313
*/
313-
ginkgo.It("should verify that a failing subpath expansion can be modified during the lifecycle of a container [sig-storage][Slow]", func() {
314+
framework.ConformanceIt("should verify that a failing subpath expansion can be modified during the lifecycle of a container [sig-storage][Slow]", func() {
314315

315316
podName := "var-expansion-" + string(uuid.NewUUID())
316317
containerName := "dapi-container"
@@ -387,14 +388,15 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
387388
})
388389

389390
/*
390-
Testname: var-expansion-subpath-test-writes
391-
Description: Verify that a subpath expansion can be used to write files into subpaths.
392-
1. valid subpathexpr starts a container running
393-
2. test for valid subpath writes
394-
3. successful expansion of the subpathexpr isn't required for volume cleanup
391+
Release : v1.19
392+
Testname: VolumeSubpathEnvExpansion, subpath test writes
393+
Description: Verify that a subpath expansion can be used to write files into subpaths.
394+
1. valid subpathexpr starts a container running
395+
2. test for valid subpath writes
396+
3. successful expansion of the subpathexpr isn't required for volume cleanup
395397
396398
*/
397-
ginkgo.It("should succeed in writing subpaths in container [sig-storage][Slow]", func() {
399+
framework.ConformanceIt("should succeed in writing subpaths in container [sig-storage][Slow]", func() {
398400

399401
podName := "var-expansion-" + string(uuid.NewUUID())
400402
containerName := "dapi-container"
@@ -487,16 +489,16 @@ var _ = framework.KubeDescribe("Variable Expansion", func() {
487489
})
488490

489491
/*
490-
Testname: var-expansion-subpath-lifecycle
491-
Description: Verify should not change the subpath mount on a container restart if the environment variable changes
492-
1. valid subpathexpr starts a container running
493-
2. test for valid subpath writes
494-
3. container restarts
495-
4. delete cleanly
496-
492+
Release : v1.19
493+
Testname: VolumeSubpathEnvExpansion, subpath lifecycle
494+
Description: Verify should not change the subpath mount on a container restart if the environment variable changes
495+
1. valid subpathexpr starts a container running
496+
2. test for valid subpath writes
497+
3. container restarts
498+
4. delete cleanly
497499
*/
498500

499-
ginkgo.It("should not change the subpath mount on a container restart if the environment variable changes [sig-storage][Slow]", func() {
501+
framework.ConformanceIt("should not change the subpath mount on a container restart if the environment variable changes [sig-storage][Slow]", func() {
500502

501503
suffix := string(uuid.NewUUID())
502504
podName := fmt.Sprintf("var-expansion-%s", suffix)

0 commit comments

Comments
 (0)