Skip to content

Commit 62b8fae

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #93539 from Jefftree/conformance-format
Update formatting of conformance comment
2 parents debcc37 + fca714f commit 62b8fae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+291
-288
lines changed

‎test/conformance/cf_header.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ clean up the tests.
1515
Example:
1616
```
1717
/*
18-
Release : v1.13
18+
Release: v1.13
1919
Testname: Kubelet, log output, default
2020
Description: By default the stdout and stderr from the process being executed in a pod MUST be sent to the pod's logs.
2121
*/

‎test/e2e/apimachinery/aggregator.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ var _ = SIGDescribe("Aggregator", func() {
9090
})
9191

9292
/*
93-
Release : v1.17
93+
Release: v1.17
9494
Testname: aggregator-supports-the-sample-apiserver
9595
Description: Ensure that the sample-apiserver code from 1.17 and compiled against 1.17
9696
will work on the current Aggregator/API-Server.

‎test/e2e/apimachinery/crd_conversion_webhook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ var _ = SIGDescribe("CustomResourceConversionWebhook [Privileged:ClusterAdmin]",
139139
})
140140

141141
/*
142-
Release : v1.16
142+
Release: v1.16
143143
Testname: Custom Resource Definition Conversion Webhook, conversion custom resource
144144
Description: Register a conversion webhook and a custom resource definition. Create a v1 custom
145145
resource. Attempts to read it at v2 MUST succeed.
@@ -173,7 +173,7 @@ var _ = SIGDescribe("CustomResourceConversionWebhook [Privileged:ClusterAdmin]",
173173
})
174174

175175
/*
176-
Release : v1.16
176+
Release: v1.16
177177
Testname: Custom Resource Definition Conversion Webhook, convert mixed version list
178178
Description: Register a conversion webhook and a custom resource definition. Create a custom resource stored at
179179
v1. Change the custom resource definition storage to v2. Create a custom resource stored at v2. Attempt to list

‎test/e2e/apimachinery/custom_resource_definition.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var _ = SIGDescribe("CustomResourceDefinition resources [Privileged:ClusterAdmin
4747

4848
ginkgo.Context("Simple CustomResourceDefinition", func() {
4949
/*
50-
Release : v1.9
50+
Release: v1.9
5151
Testname: Custom Resource Definition, create
5252
Description: Create a API extension client and define a random custom resource definition.
5353
Create the custom resource definition and then delete it. The creation and deletion MUST
@@ -73,7 +73,7 @@ var _ = SIGDescribe("CustomResourceDefinition resources [Privileged:ClusterAdmin
7373
})
7474

7575
/*
76-
Release : v1.16
76+
Release: v1.16
7777
Testname: Custom Resource Definition, list
7878
Description: Create a API extension client, define 10 labeled custom resource definitions and list them using
7979
a label selector; the list result MUST contain only the labeled custom resource definitions. Delete the labeled
@@ -135,7 +135,7 @@ var _ = SIGDescribe("CustomResourceDefinition resources [Privileged:ClusterAdmin
135135
})
136136

137137
/*
138-
Release : v1.16
138+
Release: v1.16
139139
Testname: Custom Resource Definition, status sub-resource
140140
Description: Create a custom resource definition. Attempt to read, update and patch its status sub-resource;
141141
all mutating sub-resource operations MUST be visible to subsequent reads.
@@ -258,7 +258,7 @@ var _ = SIGDescribe("CustomResourceDefinition resources [Privileged:ClusterAdmin
258258
})
259259

260260
/*
261-
Release : v1.17
261+
Release: v1.17
262262
Testname: Custom Resource Definition, defaulting
263263
Description: Create a custom resource definition without default. Create CR. Add default and read CR until
264264
the default is applied. Create another CR. Remove default, add default for another field and read CR until

‎test/e2e/apimachinery/events.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var _ = ginkgo.Describe("[sig-api-machinery] Events", func() {
3939
f := framework.NewDefaultFramework("events")
4040

4141
/*
42-
Release : v1.19
42+
Release: v1.19
4343
Testname: Event resource lifecycle
4444
Description: Create an event, the event MUST exist.
4545
The event is patched with a new message, the check MUST have the update message.
@@ -124,7 +124,7 @@ var _ = ginkgo.Describe("[sig-api-machinery] Events", func() {
124124
})
125125

126126
/*
127-
Release : v1.19
127+
Release: v1.19
128128
Testname: Event, delete a collection
129129
Description: A set of events is created with a label selector which MUST be found when listed.
130130
The set of events is deleted and MUST NOT show up when listed by its label selector.

‎test/e2e/apimachinery/garbage_collector.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ var _ = SIGDescribe("Garbage collector", func() {
320320
f := framework.NewDefaultFramework("gc")
321321

322322
/*
323-
Release : v1.9
323+
Release: v1.9
324324
Testname: Garbage Collector, delete replication controller, propagation policy background
325325
Description: Create a replication controller with 2 Pods. Once RC is created and the first Pod is created, delete RC with deleteOptions.PropagationPolicy set to Background. Deleting the Replication Controller MUST cause pods created by that RC to be deleted.
326326
*/
@@ -378,7 +378,7 @@ var _ = SIGDescribe("Garbage collector", func() {
378378
})
379379

380380
/*
381-
Release : v1.9
381+
Release: v1.9
382382
Testname: Garbage Collector, delete replication controller, propagation policy orphan
383383
Description: Create a replication controller with maximum allocatable Pods between 10 and 100 replicas. Once RC is created and the all Pods are created, delete RC with deleteOptions.PropagationPolicy set to Orphan. Deleting the Replication Controller MUST cause pods created by that RC to be orphaned.
384384
*/
@@ -499,7 +499,7 @@ var _ = SIGDescribe("Garbage collector", func() {
499499
})
500500

501501
/*
502-
Release : v1.9
502+
Release: v1.9
503503
Testname: Garbage Collector, delete deployment, propagation policy background
504504
Description: Create a deployment with a replicaset. Once replicaset is created , delete the deployment with deleteOptions.PropagationPolicy set to Background. Deleting the deployment MUST delete the replicaset created by the deployment and also the Pods that belong to the deployments MUST be deleted.
505505
*/
@@ -558,7 +558,7 @@ var _ = SIGDescribe("Garbage collector", func() {
558558
})
559559

560560
/*
561-
Release : v1.9
561+
Release: v1.9
562562
Testname: Garbage Collector, delete deployment, propagation policy orphan
563563
Description: Create a deployment with a replicaset. Once replicaset is created , delete the deployment with deleteOptions.PropagationPolicy set to Orphan. Deleting the deployment MUST cause the replicaset created by the deployment to be orphaned, also the Pods created by the deployments MUST be orphaned.
564564
*/
@@ -642,7 +642,7 @@ var _ = SIGDescribe("Garbage collector", func() {
642642
})
643643

644644
/*
645-
Release : v1.9
645+
Release: v1.9
646646
Testname: Garbage Collector, delete replication controller, after owned pods
647647
Description: Create a replication controller with maximum allocatable Pods between 10 and 100 replicas. Once RC is created and the all Pods are created, delete RC with deleteOptions.PropagationPolicy set to Foreground. Deleting the Replication Controller MUST cause pods created by that RC to be deleted before the RC is deleted.
648648
*/
@@ -727,7 +727,7 @@ var _ = SIGDescribe("Garbage collector", func() {
727727

728728
// TODO: this should be an integration test
729729
/*
730-
Release : v1.9
730+
Release: v1.9
731731
Testname: Garbage Collector, multiple owners
732732
Description: Create a replication controller RC1, with maximum allocatable Pods between 10 and 100 replicas. Create second replication controller RC2 and set RC2 as owner for half of those replicas. Once RC1 is created and the all Pods are created, delete RC1 with deleteOptions.PropagationPolicy set to Foreground. Half of the Pods that has RC2 as owner MUST not be deleted but have a deletion timestamp. Deleting the Replication Controller MUST not delete Pods that are owned by multiple replication controllers.
733733
*/
@@ -841,7 +841,7 @@ var _ = SIGDescribe("Garbage collector", func() {
841841

842842
// TODO: should be an integration test
843843
/*
844-
Release : v1.9
844+
Release: v1.9
845845
Testname: Garbage Collector, dependency cycle
846846
Description: Create three pods, patch them with Owner references such that pod1 has pod3, pod2 has pod1 and pod3 has pod2 as owner references respectively. Delete pod1 MUST delete all pods. The dependency cycle MUST not block the garbage collection.
847847
*/

‎test/e2e/apimachinery/namespace.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"sync"
2525
"time"
2626

27-
"k8s.io/api/core/v1"
27+
v1 "k8s.io/api/core/v1"
2828
apierrors "k8s.io/apimachinery/pkg/api/errors"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
"k8s.io/apimachinery/pkg/util/intstr"
@@ -228,15 +228,15 @@ var _ = SIGDescribe("Namespaces [Serial]", func() {
228228
f := framework.NewDefaultFramework("namespaces")
229229

230230
/*
231-
Release : v1.11
231+
Release: v1.11
232232
Testname: namespace-deletion-removes-pods
233233
Description: Ensure that if a namespace is deleted then all pods are removed from that namespace.
234234
*/
235235
framework.ConformanceIt("should ensure that all pods are removed when a namespace is deleted",
236236
func() { ensurePodsAreRemovedWhenNamespaceIsDeleted(f) })
237237

238238
/*
239-
Release : v1.11
239+
Release: v1.11
240240
Testname: namespace-deletion-removes-services
241241
Description: Ensure that if a namespace is deleted then all services are removed from that namespace.
242242
*/
@@ -251,7 +251,7 @@ var _ = SIGDescribe("Namespaces [Serial]", func() {
251251
func() { extinguish(f, 100, 0, 150) })
252252

253253
/*
254-
Release : v1.18
254+
Release: v1.18
255255
Testname: Namespace patching
256256
Description: A Namespace is created.
257257
The Namespace is patched.

‎test/e2e/apimachinery/server_version.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ limitations under the License.
1717
package apimachinery
1818

1919
import (
20+
"regexp"
21+
2022
"k8s.io/apimachinery/pkg/version"
2123
"k8s.io/kubernetes/test/e2e/framework"
22-
"regexp"
2324

2425
"github.com/onsi/ginkgo"
2526
)
@@ -28,7 +29,7 @@ var _ = SIGDescribe("server version", func() {
2829
f := framework.NewDefaultFramework("server-version")
2930

3031
/*
31-
Release : v1.19
32+
Release: v1.19
3233
Testname: Confirm a server version
3334
Description: Ensure that an API server version can be retrieved.
3435
Both the major and minor versions MUST only be an integer.

‎test/e2e/apimachinery/table_conversion.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ var _ = SIGDescribe("Servers with support for Table transformation", func() {
146146
})
147147

148148
/*
149-
Release : v1.16
149+
Release: v1.16
150150
Testname: API metadata HTTP return
151151
Description: Issue a HTTP request to the API.
152152
HTTP request MUST return a HTTP status code of 406.

‎test/e2e/apimachinery/watch.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"math/rand"
2323
"time"
2424

25-
"k8s.io/api/core/v1"
25+
v1 "k8s.io/api/core/v1"
2626
apiequality "k8s.io/apimachinery/pkg/api/equality"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/runtime"
@@ -46,7 +46,7 @@ var _ = SIGDescribe("Watchers", func() {
4646
f := framework.NewDefaultFramework("watch")
4747

4848
/*
49-
Release : v1.11
49+
Release: v1.11
5050
Testname: watch-configmaps-with-multiple-watchers
5151
Description: Ensure that multiple watchers are able to receive all add,
5252
update, and delete notifications on configmaps that match a label selector and do
@@ -133,7 +133,7 @@ var _ = SIGDescribe("Watchers", func() {
133133
})
134134

135135
/*
136-
Release : v1.11
136+
Release: v1.11
137137
Testname: watch-configmaps-from-resource-version
138138
Description: Ensure that a watch can be opened from a particular resource version
139139
in the past and only notifications happening after that resource version are observed.
@@ -181,7 +181,7 @@ var _ = SIGDescribe("Watchers", func() {
181181
})
182182

183183
/*
184-
Release : v1.11
184+
Release: v1.11
185185
Testname: watch-configmaps-closed-and-restarted
186186
Description: Ensure that a watch can be reopened from the last resource version
187187
observed by the previous watch, and it will continue delivering notifications from
@@ -247,7 +247,7 @@ var _ = SIGDescribe("Watchers", func() {
247247
})
248248

249249
/*
250-
Release : v1.11
250+
Release: v1.11
251251
Testname: watch-configmaps-label-changed
252252
Description: Ensure that a watched object stops meeting the requirements of
253253
a watch's selector, the watch will observe a delete, and will not observe
@@ -324,8 +324,8 @@ var _ = SIGDescribe("Watchers", func() {
324324
})
325325

326326
/*
327+
Release: v1.15
327328
Testname: watch-consistency
328-
Release : v1.15
329329
Description: Ensure that concurrent watches are consistent with each other by initiating an additional watch
330330
for events received from the first watch, initiated at the resource version of the event, and checking that all
331331
resource versions of all events match. Events are produced from writes on a background goroutine.

0 commit comments

Comments
 (0)