Skip to content

Commit 2092d51

Browse files
nemarjancursoragent
nemarjan
and
cursoragent
committed
[kuttl] Drop null Job pod template creationTimestamp asserts
cifmw-multinode-kuttl started failing after GitHub check jobs moved from OCP 4.20 to 4.22. Dataplane deploy succeeds; KUTTL then compares live Jobs against a YAML dump that still has Job.spec.template.metadata.creationTimestamp: null. On 4.20 the API still serialized that null key. On 4.22 Kubernetes omits empty creationTimestamp (omitempty), so KUTTL waits the full timeout and fails with: .spec.template.metadata.creationTimestamp: key is missing from map Remove the dumped null fields from all remaining dataplane Job asserts so the tests do not depend on that serialization difference. Signed-off-by: Nemanja Marjanovic <nemarjan@redhat.com> Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 84322c7 commit 2092d51

13 files changed

Lines changed: 0 additions & 39 deletions

File tree

‎test/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ spec:
205205
suspend: false
206206
template:
207207
metadata:
208-
creationTimestamp: null
209208
labels:
210209
app: openstackansibleee
211210
batch.kubernetes.io/job-name: download-cache-edpm-compute-global-edpm-compute-global
@@ -303,7 +302,6 @@ spec:
303302
suspend: false
304303
template:
305304
metadata:
306-
creationTimestamp: null
307305
labels:
308306
app: openstackansibleee
309307
batch.kubernetes.io/job-name: bootstrap-edpm-compute-global-edpm-compute-global
@@ -407,7 +405,6 @@ spec:
407405
suspend: false
408406
template:
409407
metadata:
410-
creationTimestamp: null
411408
labels:
412409
app: openstackansibleee
413410
batch.kubernetes.io/job-name: configure-network-edpm-compute-global-edpm-compute-global
@@ -505,7 +502,6 @@ spec:
505502
suspend: false
506503
template:
507504
metadata:
508-
creationTimestamp: null
509505
labels:
510506
app: openstackansibleee
511507
batch.kubernetes.io/job-name: validate-network-edpm-compute-global-edpm-compute-global
@@ -603,7 +599,6 @@ spec:
603599
suspend: false
604600
template:
605601
metadata:
606-
creationTimestamp: null
607602
labels:
608603
app: openstackansibleee
609604
batch.kubernetes.io/job-name: configure-os-edpm-compute-global-edpm-compute-global
@@ -701,7 +696,6 @@ spec:
701696
suspend: false
702697
template:
703698
metadata:
704-
creationTimestamp: null
705699
labels:
706700
app: openstackansibleee
707701
batch.kubernetes.io/job-name: install-certs-edpm-compute-global-edpm-compute-global
@@ -848,7 +842,6 @@ spec:
848842
suspend: false
849843
template:
850844
metadata:
851-
creationTimestamp: null
852845
labels:
853846
app: openstackansibleee
854847
batch.kubernetes.io/job-name: ovn-edpm-compute-global-edpm-compute-global
@@ -957,7 +950,6 @@ spec:
957950
suspend: false
958951
template:
959952
metadata:
960-
creationTimestamp: null
961953
labels:
962954
app: openstackansibleee
963955
batch.kubernetes.io/job-name: neutron-metadata-edpm-compute-global-edpm-compute-global
@@ -1096,7 +1088,6 @@ spec:
10961088
suspend: false
10971089
template:
10981090
metadata:
1099-
creationTimestamp: null
11001091
labels:
11011092
app: openstackansibleee
11021093
batch.kubernetes.io/job-name: neutron-ovn-edpm-compute-global-edpm-compute-global
@@ -1235,7 +1226,6 @@ spec:
12351226
suspend: false
12361227
template:
12371228
metadata:
1238-
creationTimestamp: null
12391229
labels:
12401230
app: openstackansibleee
12411231
batch.kubernetes.io/job-name: neutron-sriov-edpm-compute-global-edpm-compute-global
@@ -1344,7 +1334,6 @@ spec:
13441334
suspend: false
13451335
template:
13461336
metadata:
1347-
creationTimestamp: null
13481337
labels:
13491338
app: openstackansibleee
13501339
batch.kubernetes.io/job-name: neutron-dhcp-edpm-compute-global-edpm-compute-global
@@ -1453,7 +1442,6 @@ spec:
14531442
suspend: false
14541443
template:
14551444
metadata:
1456-
creationTimestamp: null
14571445
labels:
14581446
app: openstackansibleee
14591447
batch.kubernetes.io/job-name: libvirt-edpm-compute-global-edpm-compute-global
@@ -1562,7 +1550,6 @@ spec:
15621550
suspend: false
15631551
template:
15641552
metadata:
1565-
creationTimestamp: null
15661553
labels:
15671554
app: openstackansibleee
15681555
batch.kubernetes.io/job-name: nova-edpm-compute-global-edpm-compute-global

‎test/kuttl/tests/dataplane-deploy-global-service-test/02-assert.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ spec:
9898
suspend: false
9999
template:
100100
metadata:
101-
creationTimestamp: null
102101
labels:
103102
app: openstackansibleee
104103
batch.kubernetes.io/job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset
@@ -195,7 +194,6 @@ spec:
195194
suspend: false
196195
template:
197196
metadata:
198-
creationTimestamp: null
199197
labels:
200198
app: openstackansibleee
201199
batch.kubernetes.io/job-name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset

‎test/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ spec:
9393
suspend: false
9494
template:
9595
metadata:
96-
creationTimestamp: null
9796
labels:
9897
app: openstackansibleee
9998
batch.kubernetes.io/job-name: download-cache-edpm-compute-no-nodes-edpm-compute-no-nodes
@@ -192,7 +191,6 @@ spec:
192191
suspend: false
193192
template:
194193
metadata:
195-
creationTimestamp: null
196194
labels:
197195
app: openstackansibleee
198196
batch.kubernetes.io/job-name: bootstrap-edpm-compute-no-nodes-edpm-compute-no-nodes
@@ -298,7 +296,6 @@ spec:
298296
suspend: false
299297
template:
300298
metadata:
301-
creationTimestamp: null
302299
labels:
303300
app: openstackansibleee
304301
batch.kubernetes.io/job-name: configure-network-edpm-compute-no-nodes-edpm-compute-no-nodes
@@ -398,7 +395,6 @@ spec:
398395
suspend: false
399396
template:
400397
metadata:
401-
creationTimestamp: null
402398
labels:
403399
app: openstackansibleee
404400
batch.kubernetes.io/job-name: validate-network-edpm-compute-no-nodes-edpm-compute-no-nodes
@@ -498,7 +494,6 @@ spec:
498494
suspend: false
499495
template:
500496
metadata:
501-
creationTimestamp: null
502497
labels:
503498
app: openstackansibleee
504499
batch.kubernetes.io/job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes
@@ -598,7 +593,6 @@ spec:
598593
suspend: false
599594
template:
600595
metadata:
601-
creationTimestamp: null
602596
labels:
603597
app: openstackansibleee
604598
batch.kubernetes.io/job-name: install-certs-edpm-compute-no-nodes-edpm-compute-no-nodes
@@ -740,7 +734,6 @@ spec:
740734
suspend: false
741735
template:
742736
metadata:
743-
creationTimestamp: null
744737
labels:
745738
app: openstackansibleee
746739
batch.kubernetes.io/job-name: ovn-edpm-compute-no-nodes-edpm-compute-no-nodes
@@ -850,7 +843,6 @@ spec:
850843
suspend: false
851844
template:
852845
metadata:
853-
creationTimestamp: null
854846
labels:
855847
app: openstackansibleee
856848
batch.kubernetes.io/job-name: neutron-metadata-edpm-compute-no-nodes-edpm-compute-no-nodes
@@ -990,7 +982,6 @@ spec:
990982
suspend: false
991983
template:
992984
metadata:
993-
creationTimestamp: null
994985
labels:
995986
app: openstackansibleee
996987
batch.kubernetes.io/job-name: neutron-ovn-edpm-compute-no-nodes-edpm-compute-no-nodes
@@ -1130,7 +1121,6 @@ spec:
11301121
suspend: false
11311122
template:
11321123
metadata:
1133-
creationTimestamp: null
11341124
labels:
11351125
app: openstackansibleee
11361126
batch.kubernetes.io/job-name: neutron-sriov-edpm-compute-no-nodes-edpm-compute-no-nodes
@@ -1240,7 +1230,6 @@ spec:
12401230
suspend: false
12411231
template:
12421232
metadata:
1243-
creationTimestamp: null
12441233
labels:
12451234
app: openstackansibleee
12461235
batch.kubernetes.io/job-name: neutron-dhcp-edpm-compute-no-nodes-edpm-compute-no-nodes
@@ -1350,7 +1339,6 @@ spec:
13501339
suspend: false
13511340
template:
13521341
metadata:
1353-
creationTimestamp: null
13541342
labels:
13551343
app: openstackansibleee
13561344
batch.kubernetes.io/job-name: libvirt-edpm-compute-no-nodes-edpm-compute-no-nodes
@@ -1460,7 +1448,6 @@ spec:
14601448
suspend: false
14611449
template:
14621450
metadata:
1463-
creationTimestamp: null
14641451
labels:
14651452
app: openstackansibleee
14661453
batch.kubernetes.io/job-name: nova-edpm-compute-no-nodes-edpm-compute-no-nodes

‎test/kuttl/tests/dataplane-deploy-no-nodes-test/02-assert.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ spec:
3535
metadata:
3636
annotations:
3737
k8s.v1.cni.cncf.io/networks: '[]'
38-
creationTimestamp: null
3938
labels:
4039
app: openstackansibleee
4140
batch.kubernetes.io/job-name: configure-os-edpm-compute-no-nodes-edpm-compute-no-nodes

‎test/kuttl/tests/dataplane-deploy-no-nodes-test/04-assert.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ spec:
9494
metadata:
9595
annotations:
9696
k8s.v1.cni.cncf.io/networks: '[]'
97-
creationTimestamp: null
9897
labels:
9998
app: openstackansibleee
10099
batch.kubernetes.io/job-name: ovn-edpm-compute-no-nodes-updated-ovn-cm-edpm-compute-no-nodes

‎test/kuttl/tests/dataplane-deploy-no-nodes-test/06-assert.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ spec:
203203
metadata:
204204
annotations:
205205
k8s.v1.cni.cncf.io/networks: '[]'
206-
creationTimestamp: null
207206
labels:
208207
app: openstackansibleee
209208
batch.kubernetes.io/job-name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset

‎test/kuttl/tests/dataplane-deploy-no-nodes-test/07-assert.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ spec:
2828
metadata:
2929
annotations:
3030
k8s.v1.cni.cncf.io/networks: '[]'
31-
creationTimestamp: null
3231
labels:
3332
app: openstackansibleee
3433
batch.kubernetes.io/job-name: configure-os-edpm-compute-node-selection-edpm-compute-no-nodes

‎test/kuttl/tests/dataplane-deploy-tls-test/02-assert.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ spec:
161161
metadata:
162162
annotations:
163163
k8s.v1.cni.cncf.io/networks: '[]'
164-
creationTimestamp: null
165164
labels:
166165
app: openstackansibleee
167166
batch.kubernetes.io/job-name: install-certs-ovrd-openstack-edpm-tls-openstack-edpm-tls
@@ -295,7 +294,6 @@ spec:
295294
metadata:
296295
annotations:
297296
k8s.v1.cni.cncf.io/networks: '[]'
298-
creationTimestamp: null
299297
labels:
300298
app: openstackansibleee
301299
batch.kubernetes.io/job-name: tls-dnsnames-openstack-edpm-tls-openstack-edpm-tls

‎test/kuttl/tests/dataplane-deploy-tls-test/03-assert.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ spec:
167167
metadata:
168168
annotations:
169169
k8s.v1.cni.cncf.io/networks: '[]'
170-
creationTimestamp: null
171170
labels:
172171
app: openstackansibleee
173172
batch.kubernetes.io/job-name: tls-dns-ips-openstack-edpm-tls-ovrd-openstack-edpm-tls

‎test/kuttl/tests/dataplane-extramounts/00-assert.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ spec:
5555
metadata:
5656
annotations:
5757
k8s.v1.cni.cncf.io/networks: '[]'
58-
creationTimestamp: null
5958
labels:
6059
app: openstackansibleee
6160
batch.kubernetes.io/job-name: test-service-edpm-extramounts-edpm-extramounts

0 commit comments

Comments
 (0)