Skip to content

Commit ceb6748

Browse files
committed
link 2 pod conformance tests with behaviors
1 parent 78f2c8f commit ceb6748

File tree

4 files changed

+29
-13
lines changed

4 files changed

+29
-13
lines changed
Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,49 @@
11
suite: pod/spec
22
description: Base suite for pods
33
behaviors:
4-
- id: pod/basic-create
4+
- id: pod/spec/basic-create
55
description: When a Pod resource is created with a single container and sufficient resources, a Pod MUST be created on a node with the specified container image.
6-
- id: pod/basic-delete
6+
- id: pod/spec/basic-delete
77
description: When a Pod resource is delete, the Pod containers must receive a TERM signal and the Pod MUST be deleted.
8-
- id: pod/hostname
8+
- id: pod/spec/hostname
99
description: When the hostname field is set, a container running in the Pod MUST report the hostname as the specified value.
10-
- id: pod/subdomain
10+
- id: pod/spec/subdomain
1111
description: If specified, the fully qualified Pod hostname will be "<hostname>.<subdomain>.<pod
1212
namespace>.svc.<cluster domain>". If not specified, the pod will not have a
1313
domainname at all.
14-
- id: pod/terminationGracePeriodSeconds/in-spec
14+
- id: pod/spec/terminationGracePeriodSeconds/in-spec
1515
description: When the terminationGracePeriodSeconds is specified in the spec,
1616
processes running in the Pod MUST NOT receive a hard termination signal for at
1717
least that number of seconds after a delete request.
18-
- id: pod/terminationGracePeriodSeconds/in-delete
18+
- id: pod/spec/terminationGracePeriodSeconds/in-delete
1919
description: When the terminationGracePeriodSeconds is specified in a delete request,
2020
processes running in the Pod MUST NOT receive a hard termination signal for at
2121
least that number of seconds after the delete request.
22-
- id: pod/activeDeadlineSeconds
22+
- id: pod/spec/activeDeadlineSeconds
2323
description: Optional duration in seconds the pod may be active on the node relative
2424
to StartTime before the system will actively try to mark it failed and kill
2525
associated containers. Value must be a positive integer.
26-
- id: pod/hostNetwork/true
26+
- id: pod/spec/hostNetwork/true
2727
description: When hostNetwork is set to true, the Pod MUST use the host's network
2828
namespace.
29-
- id: pod/hostNetwork/false
29+
- id: pod/spec/hostNetwork/false
3030
description: When hostNetwork is set to false, the Pod MUST NOT use the host's network
3131
namespace.
32-
- id: pod/hostPID/true
32+
- id: pod/spec/hostPID/true
3333
description: When hostPID is set to true, the Pod MUST use the host's process
3434
namespace.
35-
- id: pod/hostPID/false
35+
- id: pod/spec/hostPID/false
3636
description: When hostPID is set to false, the Pod MUST NOT use the host's process
3737
namespace.
38-
- id: pod/hostIPC/true
38+
- id: pod/spec/hostIPC/true
3939
description: When hostIPC is set to true, the Pod MUST use the host's inter-process
4040
communication namespace.
41-
- id: pod/hostIPC/false
41+
- id: pod/spec/hostIPC/false
4242
description: When hostIPC is set to false, the Pod MUST NOT use the host's inter-process
4343
communication namespace.
44+
- id: pod/spec/label/create
45+
decription: Create a Pod with a unique label. Query for the Pod with the label as selector MUST be successful.
46+
- id: pod/spec/label/patch
47+
decription: A patch request must be able to update the pod to change the value of an existing Label. Query for the Pod with the new value for the label MUST be successful.
48+
- id: pod/spec/container/resources
49+
description: Create a Pod with CPU and Memory request and limits. Pod status MUST have QOSClass set to PodQOSGuaranteed.

test/conformance/testdata/conformance.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@
244244
Query for the Pod with the new value for the label MUST be successful.
245245
release: v1.9
246246
file: test/e2e/common/pods.go
247+
behaviors:
248+
- pod/spec/label/create
249+
- pod/spec/label/patch
247250
- testname: Pods, service environment variables
248251
codename: '[k8s.io] Pods should contain environment variables for services [NodeConformance]
249252
[Conformance]'
@@ -482,6 +485,8 @@
482485
have QOSClass set to PodQOSGuaranteed.
483486
release: v1.9
484487
file: test/e2e/node/pods.go
488+
behaviors:
489+
- pod/spec/container/resources
485490
- testname: Pods, prestop hook
486491
codename: '[k8s.io] [sig-node] PreStop should call prestop when killing a pod [Conformance]'
487492
description: Create a server pod with a rest endpoint '/write' that changes state.Received

test/e2e/common/pods.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,9 @@ var _ = framework.KubeDescribe("Pods", func() {
337337
Release : v1.9
338338
Testname: Pods, update
339339
Description: Create a Pod with a unique label. Query for the Pod with the label as selector MUST be successful. Update the pod to change the value of the Label. Query for the Pod with the new value for the label MUST be successful.
340+
Behaviors:
341+
- pod/spec/label/create
342+
- pod/spec/label/patch
340343
*/
341344
framework.ConformanceIt("should be updated [NodeConformance]", func() {
342345
ginkgo.By("creating the pod")

test/e2e/node/pods.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ var _ = SIGDescribe("Pods Extended", func() {
166166
Release : v1.9
167167
Testname: Pods, QOS
168168
Description: Create a Pod with CPU and Memory request and limits. Pod status MUST have QOSClass set to PodQOSGuaranteed.
169+
Behaviors:
170+
- pod/spec/container/resources
169171
*/
170172
framework.ConformanceIt("should be set on Pods with matching resource requests and limits for memory and cpu", func() {
171173
ginkgo.By("creating the pod")

0 commit comments

Comments
 (0)