Skip to content

Commit 553eeb6

Browse files
rafabenerafabene
committed
HYPERFLEET-1017 - fix: align example reason/message with aggregation code output
1 parent cd11b21 commit 553eeb6

5 files changed

Lines changed: 97 additions & 121 deletions

File tree

‎models/common/model.tsp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,11 @@ model ResourceCondition {
244244
@format("date-time") last_updated_time: string;
245245
}
246246

247-
const ExampleLastKnownReconciledReason: string = "All required adapters were reconciled at a common observed generation";
248-
const ExampleLastKnownReconciledMessage: string = "All required adapters were reconciled at a common observed generation";
249-
const ExampleReadyReason: string = "All adapters reported Available=True for the current generation";
250-
const ExampleReadyMessage: string = "All adapters reported Available=True for the current generation";
251-
const ExampleReconciledReason: string = "All required adapters reported Available=True or Finalized=True at the current generation";
247+
const ExampleLastKnownReconciledReason: string = "AllAdaptersReconciled";
248+
const ExampleLastKnownReconciledMessage: string = "All required adapters report Available=True for the tracked generation";
249+
const ExampleReadyReason: string = "ReconciledAll";
250+
const ExampleReadyMessage: string = "All required adapters reported Available=True or Finalized=True at the current generation";
251+
const ExampleReconciledReason: string = "ReconciledAll";
252252
const ExampleReconciledMessage: string = "All required adapters reported Available=True or Finalized=True at the current generation";
253253
const ExampleAdapter1: string = "adapter1";
254254
const ExampleAdapter2: string = "adapter2";

‎schemas/core/openapi.yaml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -189,24 +189,24 @@ paths:
189189
conditions:
190190
- type: Ready
191191
status: 'True'
192-
reason: All adapters reported Available=True for the current generation
193-
message: All adapters reported Available=True for the current generation
192+
reason: ReconciledAll
193+
message: All required adapters reported Available=True or Finalized=True at the current generation
194194
observed_generation: 2
195195
created_time: '2021-01-01T10:00:00Z'
196196
last_updated_time: '2021-01-01T10:00:00Z'
197197
last_transition_time: '2021-01-01T10:00:00Z'
198198
- type: Reconciled
199199
status: 'True'
200-
reason: All required adapters reported Available=True or Finalized=True at the current generation
200+
reason: ReconciledAll
201201
message: All required adapters reported Available=True or Finalized=True at the current generation
202202
observed_generation: 2
203203
created_time: '2021-01-01T10:00:00Z'
204204
last_updated_time: '2021-01-01T10:00:00Z'
205205
last_transition_time: '2021-01-01T10:00:00Z'
206206
- type: LastKnownReconciled
207207
status: 'True'
208-
reason: All required adapters were reconciled at a common observed generation
209-
message: All required adapters were reconciled at a common observed generation
208+
reason: AllAdaptersReconciled
209+
message: All required adapters report Available=True for the tracked generation
210210
observed_generation: 2
211211
created_time: '2021-01-01T10:00:00Z'
212212
last_updated_time: '2021-01-01T10:00:00Z'
@@ -402,24 +402,24 @@ paths:
402402
conditions:
403403
- type: Ready
404404
status: 'True'
405-
reason: All adapters reported Available=True for the current generation
406-
message: All adapters reported Available=True for the current generation
405+
reason: ReconciledAll
406+
message: All required adapters reported Available=True or Finalized=True at the current generation
407407
observed_generation: 2
408408
created_time: '2021-01-01T10:00:00Z'
409409
last_updated_time: '2021-01-01T10:00:00Z'
410410
last_transition_time: '2021-01-01T10:00:00Z'
411411
- type: Reconciled
412412
status: 'True'
413-
reason: All required adapters reported Available=True or Finalized=True at the current generation
413+
reason: ReconciledAll
414414
message: All required adapters reported Available=True or Finalized=True at the current generation
415415
observed_generation: 2
416416
created_time: '2021-01-01T10:00:00Z'
417417
last_updated_time: '2021-01-01T10:00:00Z'
418418
last_transition_time: '2021-01-01T10:00:00Z'
419419
- type: LastKnownReconciled
420420
status: 'True'
421-
reason: All required adapters were reconciled at a common observed generation
422-
message: All required adapters were reconciled at a common observed generation
421+
reason: AllAdaptersReconciled
422+
message: All required adapters report Available=True for the tracked generation
423423
observed_generation: 2
424424
created_time: '2021-01-01T10:00:00Z'
425425
last_updated_time: '2021-01-01T10:00:00Z'
@@ -1174,24 +1174,24 @@ components:
11741174
conditions:
11751175
- type: Ready
11761176
status: 'True'
1177-
reason: All adapters reported Available=True for the current generation
1178-
message: All adapters reported Available=True for the current generation
1177+
reason: ReconciledAll
1178+
message: All required adapters reported Available=True or Finalized=True at the current generation
11791179
observed_generation: 1
11801180
created_time: '2021-01-01T10:00:00Z'
11811181
last_updated_time: '2021-01-01T10:00:00Z'
11821182
last_transition_time: '2021-01-01T10:00:00Z'
11831183
- type: Reconciled
11841184
status: 'True'
1185-
reason: All required adapters reported Available=True or Finalized=True at the current generation
1185+
reason: ReconciledAll
11861186
message: All required adapters reported Available=True or Finalized=True at the current generation
11871187
observed_generation: 1
11881188
created_time: '2021-01-01T10:00:00Z'
11891189
last_updated_time: '2021-01-01T10:00:00Z'
11901190
last_transition_time: '2021-01-01T10:00:00Z'
11911191
- type: LastKnownReconciled
11921192
status: 'True'
1193-
reason: All required adapters were reconciled at a common observed generation
1194-
message: All required adapters were reconciled at a common observed generation
1193+
reason: AllAdaptersReconciled
1194+
message: All required adapters report Available=True for the tracked generation
11951195
observed_generation: 1
11961196
created_time: '2021-01-01T10:00:00Z'
11971197
last_updated_time: '2021-01-01T10:00:00Z'
@@ -1473,24 +1473,24 @@ components:
14731473
conditions:
14741474
- type: Ready
14751475
status: 'True'
1476-
reason: All adapters reported Available=True for the current generation
1477-
message: All adapters reported Available=True for the current generation
1476+
reason: ReconciledAll
1477+
message: All required adapters reported Available=True or Finalized=True at the current generation
14781478
observed_generation: 1
14791479
created_time: '2021-01-01T10:00:00Z'
14801480
last_updated_time: '2021-01-01T10:00:00Z'
14811481
last_transition_time: '2021-01-01T10:00:00Z'
14821482
- type: Reconciled
14831483
status: 'True'
1484-
reason: All required adapters reported Available=True or Finalized=True at the current generation
1484+
reason: ReconciledAll
14851485
message: All required adapters reported Available=True or Finalized=True at the current generation
14861486
observed_generation: 1
14871487
created_time: '2021-01-01T10:00:00Z'
14881488
last_updated_time: '2021-01-01T10:00:00Z'
14891489
last_transition_time: '2021-01-01T10:00:00Z'
14901490
- type: LastKnownReconciled
14911491
status: 'True'
1492-
reason: All required adapters were reconciled at a common observed generation
1493-
message: All required adapters were reconciled at a common observed generation
1492+
reason: AllAdaptersReconciled
1493+
message: All required adapters report Available=True for the tracked generation
14941494
observed_generation: 1
14951495
created_time: '2021-01-01T10:00:00Z'
14961496
last_updated_time: '2021-01-01T10:00:00Z'

‎schemas/core/swagger.yaml‎

Lines changed: 26 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,10 @@ paths:
158158
last_transition_time: '2021-01-01T10:00:00Z'
159159
last_updated_time: '2021-01-01T10:00:00Z'
160160
message: >-
161-
All adapters reported Available=True for the current
162-
generation
161+
All required adapters reported Available=True or Finalized=True at
162+
the current generation
163163
observed_generation: 2
164-
reason: >-
165-
All adapters reported Available=True for the current
166-
generation
164+
reason: ReconciledAll
167165
status: 'True'
168166
type: Ready
169167
- created_time: '2021-01-01T10:00:00Z'
@@ -182,12 +180,10 @@ paths:
182180
last_transition_time: '2021-01-01T10:00:00Z'
183181
last_updated_time: '2021-01-01T10:00:00Z'
184182
message: >-
185-
All required adapters were reconciled at a common observed
186-
generation
183+
All required adapters report Available=True for the tracked
184+
generation
187185
observed_generation: 2
188-
reason: >-
189-
All required adapters were reconciled at a common observed
190-
generation
186+
reason: AllAdaptersReconciled
191187
status: 'True'
192188
type: LastKnownReconciled
193189
- created_time: '2021-01-01T10:00:00Z'
@@ -455,12 +451,10 @@ paths:
455451
last_transition_time: '2021-01-01T10:00:00Z'
456452
last_updated_time: '2021-01-01T10:00:00Z'
457453
message: >-
458-
All adapters reported Available=True for the current
459-
generation
454+
All required adapters reported Available=True or Finalized=True at
455+
the current generation
460456
observed_generation: 2
461-
reason: >-
462-
All adapters reported Available=True for the current
463-
generation
457+
reason: ReconciledAll
464458
status: 'True'
465459
type: Ready
466460
- created_time: '2021-01-01T10:00:00Z'
@@ -479,12 +473,10 @@ paths:
479473
last_transition_time: '2021-01-01T10:00:00Z'
480474
last_updated_time: '2021-01-01T10:00:00Z'
481475
message: >-
482-
All required adapters were reconciled at a common observed
483-
generation
476+
All required adapters report Available=True for the tracked
477+
generation
484478
observed_generation: 2
485-
reason: >-
486-
All required adapters were reconciled at a common observed
487-
generation
479+
reason: AllAdaptersReconciled
488480
status: 'True'
489481
type: LastKnownReconciled
490482
- created_time: '2021-01-01T10:00:00Z'
@@ -1273,9 +1265,11 @@ definitions:
12731265
- created_time: '2021-01-01T10:00:00Z'
12741266
last_transition_time: '2021-01-01T10:00:00Z'
12751267
last_updated_time: '2021-01-01T10:00:00Z'
1276-
message: All adapters reported Available=True for the current generation
1268+
message: >-
1269+
All required adapters reported Available=True or Finalized=True at
1270+
the current generation
12771271
observed_generation: 1
1278-
reason: All adapters reported Available=True for the current generation
1272+
reason: ReconciledAll
12791273
status: 'True'
12801274
type: Ready
12811275
- created_time: '2021-01-01T10:00:00Z'
@@ -1285,21 +1279,17 @@ definitions:
12851279
All required adapters reported Available=True or Finalized=True at
12861280
the current generation
12871281
observed_generation: 1
1288-
reason: >-
1289-
All required adapters reported Available=True or Finalized=True at
1290-
the current generation
1282+
reason: ReconciledAll
12911283
status: 'True'
12921284
type: Reconciled
12931285
- created_time: '2021-01-01T10:00:00Z'
12941286
last_transition_time: '2021-01-01T10:00:00Z'
12951287
last_updated_time: '2021-01-01T10:00:00Z'
12961288
message: >-
1297-
All required adapters were reconciled at a common observed
1289+
All required adapters report Available=True for the tracked
12981290
generation
12991291
observed_generation: 1
1300-
reason: >-
1301-
All required adapters were reconciled at a common observed
1302-
generation
1292+
reason: AllAdaptersReconciled
13031293
status: 'True'
13041294
type: LastKnownReconciled
13051295
- created_time: '2021-01-01T10:00:00Z'
@@ -1599,9 +1589,11 @@ definitions:
15991589
- created_time: '2021-01-01T10:00:00Z'
16001590
last_transition_time: '2021-01-01T10:00:00Z'
16011591
last_updated_time: '2021-01-01T10:00:00Z'
1602-
message: All adapters reported Available=True for the current generation
1592+
message: >-
1593+
All required adapters reported Available=True or Finalized=True at
1594+
the current generation
16031595
observed_generation: 1
1604-
reason: All adapters reported Available=True for the current generation
1596+
reason: ReconciledAll
16051597
status: 'True'
16061598
type: Ready
16071599
- created_time: '2021-01-01T10:00:00Z'
@@ -1611,21 +1603,17 @@ definitions:
16111603
All required adapters reported Available=True or Finalized=True at
16121604
the current generation
16131605
observed_generation: 1
1614-
reason: >-
1615-
All required adapters reported Available=True or Finalized=True at
1616-
the current generation
1606+
reason: ReconciledAll
16171607
status: 'True'
16181608
type: Reconciled
16191609
- created_time: '2021-01-01T10:00:00Z'
16201610
last_transition_time: '2021-01-01T10:00:00Z'
16211611
last_updated_time: '2021-01-01T10:00:00Z'
16221612
message: >-
1623-
All required adapters were reconciled at a common observed
1613+
All required adapters report Available=True for the tracked
16241614
generation
16251615
observed_generation: 1
1626-
reason: >-
1627-
All required adapters were reconciled at a common observed
1628-
generation
1616+
reason: AllAdaptersReconciled
16291617
status: 'True'
16301618
type: LastKnownReconciled
16311619
- created_time: '2021-01-01T10:00:00Z'

0 commit comments

Comments
 (0)