Skip to content

Commit 5194114

Browse files
tirthcttirthct
committed
HYPERFLEET-853 - feat: Fix observed_generation for all inconsistent examples (removed aliases inclusion
1 parent 649d9f1 commit 5194114

8 files changed

Lines changed: 60 additions & 60 deletions

File tree

‎models-core/cluster/example_cluster.tsp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const exampleDeletedCluster: Cluster = #{
8585
status: ResourceConditionStatus.True,
8686
reason: ExampleReadyReason,
8787
message: ExampleReadyMessage,
88-
observed_generation: 1,
88+
observed_generation: 2,
8989
created_time: "2021-01-01T10:00:00Z",
9090
last_updated_time: "2021-01-01T10:00:00Z",
9191
last_transition_time: "2021-01-01T10:00:00Z",
@@ -95,7 +95,7 @@ const exampleDeletedCluster: Cluster = #{
9595
status: ResourceConditionStatus.True,
9696
reason: ExampleReconciledReason,
9797
message: ExampleReconciledMessage,
98-
observed_generation: 1,
98+
observed_generation: 2,
9999
created_time: "2021-01-01T10:00:00Z",
100100
last_updated_time: "2021-01-01T10:00:00Z",
101101
last_transition_time: "2021-01-01T10:00:00Z",
@@ -105,7 +105,7 @@ const exampleDeletedCluster: Cluster = #{
105105
status: ResourceConditionStatus.True,
106106
reason: ExampleAvailableReason,
107107
message: ExampleAvailableMessage,
108-
observed_generation: 1,
108+
observed_generation: 2,
109109
created_time: "2021-01-01T10:00:00Z",
110110
last_updated_time: "2021-01-01T10:00:00Z",
111111
last_transition_time: "2021-01-01T10:00:00Z",
@@ -115,7 +115,7 @@ const exampleDeletedCluster: Cluster = #{
115115
status: ResourceConditionStatus.True,
116116
reason: ExampleAdapter1AvaliableReason,
117117
message: ExampleAdapter1AvaliableMessage,
118-
observed_generation: 1,
118+
observed_generation: 2,
119119
created_time: "2021-01-01T10:00:00Z",
120120
last_updated_time: "2021-01-01T10:00:00Z",
121121
last_transition_time: "2021-01-01T10:00:00Z",
@@ -125,7 +125,7 @@ const exampleDeletedCluster: Cluster = #{
125125
status: ResourceConditionStatus.True,
126126
reason: ExampleAdapter2AvaliableReason,
127127
message: ExampleAdapter2AvaliableMessage,
128-
observed_generation: 1,
128+
observed_generation: 2,
129129
created_time: "2021-01-01T10:01:00Z",
130130
last_updated_time: "2021-01-01T10:01:00Z",
131131
last_transition_time: "2021-01-01T10:01:00Z",

‎models-core/nodepool/example_nodepool.tsp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ const exampleDeletedNodePool: NodePool = #{
9595
status: ResourceConditionStatus.True,
9696
reason: ExampleReadyReason,
9797
message: ExampleReadyMessage,
98-
observed_generation: 1,
98+
observed_generation: 2,
9999
created_time: "2021-01-01T10:00:00Z",
100100
last_updated_time: "2021-01-01T10:00:00Z",
101101
last_transition_time: "2021-01-01T10:00:00Z",
@@ -105,7 +105,7 @@ const exampleDeletedNodePool: NodePool = #{
105105
status: ResourceConditionStatus.True,
106106
reason: ExampleReconciledReason,
107107
message: ExampleReconciledMessage,
108-
observed_generation: 1,
108+
observed_generation: 2,
109109
created_time: "2021-01-01T10:00:00Z",
110110
last_updated_time: "2021-01-01T10:00:00Z",
111111
last_transition_time: "2021-01-01T10:00:00Z",
@@ -115,7 +115,7 @@ const exampleDeletedNodePool: NodePool = #{
115115
status: ResourceConditionStatus.True,
116116
reason: ExampleAvailableReason,
117117
message: ExampleAvailableMessage,
118-
observed_generation: 1,
118+
observed_generation: 2,
119119
created_time: "2021-01-01T10:00:00Z",
120120
last_updated_time: "2021-01-01T10:00:00Z",
121121
last_transition_time: "2021-01-01T10:00:00Z",
@@ -125,7 +125,7 @@ const exampleDeletedNodePool: NodePool = #{
125125
status: ResourceConditionStatus.True,
126126
reason: ExampleAdapter1AvaliableReason,
127127
message: ExampleAdapter1AvaliableMessage,
128-
observed_generation: 1,
128+
observed_generation: 2,
129129
created_time: "2021-01-01T10:00:00Z",
130130
last_updated_time: "2021-01-01T10:00:00Z",
131131
last_transition_time: "2021-01-01T10:00:00Z",
@@ -135,7 +135,7 @@ const exampleDeletedNodePool: NodePool = #{
135135
status: ResourceConditionStatus.True,
136136
reason: ExampleAdapter2AvaliableReason,
137137
message: ExampleAdapter2AvaliableMessage,
138-
observed_generation: 1,
138+
observed_generation: 2,
139139
created_time: "2021-01-01T10:01:00Z",
140140
last_updated_time: "2021-01-01T10:01:00Z",
141141
last_transition_time: "2021-01-01T10:01:00Z",

‎models-gcp/cluster/example_cluster.tsp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ const exampleDeletedCluster: Cluster = #{
129129
status: ResourceConditionStatus.True,
130130
reason: ExampleReadyReason,
131131
message: ExampleReadyMessage,
132-
observed_generation: 1,
132+
observed_generation: 2,
133133
created_time: "2021-01-01T10:00:00Z",
134134
last_updated_time: "2021-01-01T10:00:00Z",
135135
last_transition_time: "2021-01-01T10:00:00Z",
@@ -139,7 +139,7 @@ const exampleDeletedCluster: Cluster = #{
139139
status: ResourceConditionStatus.True,
140140
reason: ExampleReconciledReason,
141141
message: ExampleReconciledMessage,
142-
observed_generation: 1,
142+
observed_generation: 2,
143143
created_time: "2021-01-01T10:00:00Z",
144144
last_updated_time: "2021-01-01T10:00:00Z",
145145
last_transition_time: "2021-01-01T10:00:00Z",
@@ -149,7 +149,7 @@ const exampleDeletedCluster: Cluster = #{
149149
status: ResourceConditionStatus.True,
150150
reason: ExampleAvailableReason,
151151
message: ExampleAvailableMessage,
152-
observed_generation: 1,
152+
observed_generation: 2,
153153
created_time: "2021-01-01T10:00:00Z",
154154
last_updated_time: "2021-01-01T10:00:00Z",
155155
last_transition_time: "2021-01-01T10:00:00Z",
@@ -159,7 +159,7 @@ const exampleDeletedCluster: Cluster = #{
159159
status: ResourceConditionStatus.True,
160160
reason: ExampleAdapter1AvaliableReason,
161161
message: ExampleAdapter1AvaliableMessage,
162-
observed_generation: 1,
162+
observed_generation: 2,
163163
created_time: "2021-01-01T10:00:00Z",
164164
last_updated_time: "2021-01-01T10:00:00Z",
165165
last_transition_time: "2021-01-01T10:00:00Z",
@@ -169,7 +169,7 @@ const exampleDeletedCluster: Cluster = #{
169169
status: ResourceConditionStatus.True,
170170
reason: ExampleAdapter2AvaliableReason,
171171
message: ExampleAdapter2AvaliableMessage,
172-
observed_generation: 1,
172+
observed_generation: 2,
173173
created_time: "2021-01-01T10:01:00Z",
174174
last_updated_time: "2021-01-01T10:01:00Z",
175175
last_transition_time: "2021-01-01T10:01:00Z",

‎models-gcp/nodepool/example_nodepool.tsp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ const exampleDeletedNodePool: NodePool = #{
138138
status: ResourceConditionStatus.True,
139139
reason: "ResourceReady",
140140
message: "All conditions successful for current spec generation",
141-
observed_generation: 1,
141+
observed_generation: 2,
142142
created_time: "2021-01-01T10:00:00Z",
143143
last_updated_time: "2021-01-01T10:00:00Z",
144144
last_transition_time: "2021-01-01T10:00:00Z",
@@ -148,7 +148,7 @@ const exampleDeletedNodePool: NodePool = #{
148148
status: ResourceConditionStatus.True,
149149
reason: ExampleReconciledReason,
150150
message: ExampleReconciledMessage,
151-
observed_generation: 1,
151+
observed_generation: 2,
152152
created_time: "2021-01-01T10:00:00Z",
153153
last_updated_time: "2021-01-01T10:00:00Z",
154154
last_transition_time: "2021-01-01T10:00:00Z",
@@ -158,7 +158,7 @@ const exampleDeletedNodePool: NodePool = #{
158158
status: ResourceConditionStatus.True,
159159
reason: "ResourceAvailable",
160160
message: "All conditions successful for observed_generation",
161-
observed_generation: 1,
161+
observed_generation: 2,
162162
created_time: "2021-01-01T10:00:00Z",
163163
last_updated_time: "2021-01-01T10:00:00Z",
164164
last_transition_time: "2021-01-01T10:00:00Z",
@@ -168,7 +168,7 @@ const exampleDeletedNodePool: NodePool = #{
168168
status: ResourceConditionStatus.True,
169169
reason: "All validations passed",
170170
message: "NodePool validation passed",
171-
observed_generation: 1,
171+
observed_generation: 2,
172172
created_time: "2021-01-01T10:00:00Z",
173173
last_updated_time: "2021-01-01T10:00:00Z",
174174
last_transition_time: "2021-01-01T10:00:00Z",
@@ -178,7 +178,7 @@ const exampleDeletedNodePool: NodePool = #{
178178
status: ResourceConditionStatus.True,
179179
reason: "NodePool provisioned successfully",
180180
message: "NodePool has 3 nodes running",
181-
observed_generation: 1,
181+
observed_generation: 2,
182182
created_time: "2021-01-01T10:01:00Z",
183183
last_updated_time: "2021-01-01T10:01:00Z",
184184
last_transition_time: "2021-01-01T10:01:00Z",

‎schemas/core/openapi.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -175,39 +175,39 @@ paths:
175175
status: 'True'
176176
reason: All adapters reported Ready True for the current generation
177177
message: All adapters reported Ready True for the current generation
178-
observed_generation: 1
178+
observed_generation: 2
179179
created_time: '2021-01-01T10:00:00Z'
180180
last_updated_time: '2021-01-01T10:00:00Z'
181181
last_transition_time: '2021-01-01T10:00:00Z'
182182
- type: Reconciled
183183
status: 'True'
184184
reason: All required adapters reported Available=True or Finalized=True at the current generation
185185
message: All required adapters reported Available=True or Finalized=True at the current generation
186-
observed_generation: 1
186+
observed_generation: 2
187187
created_time: '2021-01-01T10:00:00Z'
188188
last_updated_time: '2021-01-01T10:00:00Z'
189189
last_transition_time: '2021-01-01T10:00:00Z'
190190
- type: Available
191191
status: 'True'
192192
reason: All adapters reported Available True for the same generation
193193
message: All adapters reported Available True for the same generation
194-
observed_generation: 1
194+
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: Adapter1Successful
199199
status: 'True'
200200
reason: This adapter1 is available
201201
message: This adapter1 is available
202-
observed_generation: 1
202+
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: Adapter2Successful
207207
status: 'True'
208208
reason: This adapter2 is available
209209
message: This adapter2 is available
210-
observed_generation: 1
210+
observed_generation: 2
211211
created_time: '2021-01-01T10:01:00Z'
212212
last_updated_time: '2021-01-01T10:01:00Z'
213213
last_transition_time: '2021-01-01T10:01:00Z'
@@ -378,39 +378,39 @@ paths:
378378
status: 'True'
379379
reason: All adapters reported Ready True for the current generation
380380
message: All adapters reported Ready True for the current generation
381-
observed_generation: 1
381+
observed_generation: 2
382382
created_time: '2021-01-01T10:00:00Z'
383383
last_updated_time: '2021-01-01T10:00:00Z'
384384
last_transition_time: '2021-01-01T10:00:00Z'
385385
- type: Reconciled
386386
status: 'True'
387387
reason: All required adapters reported Available=True or Finalized=True at the current generation
388388
message: All required adapters reported Available=True or Finalized=True at the current generation
389-
observed_generation: 1
389+
observed_generation: 2
390390
created_time: '2021-01-01T10:00:00Z'
391391
last_updated_time: '2021-01-01T10:00:00Z'
392392
last_transition_time: '2021-01-01T10:00:00Z'
393393
- type: Available
394394
status: 'True'
395395
reason: All adapters reported Available True for the same generation
396396
message: All adapters reported Available True for the same generation
397-
observed_generation: 1
397+
observed_generation: 2
398398
created_time: '2021-01-01T10:00:00Z'
399399
last_updated_time: '2021-01-01T10:00:00Z'
400400
last_transition_time: '2021-01-01T10:00:00Z'
401401
- type: Adapter1Successful
402402
status: 'True'
403403
reason: This adapter1 is available
404404
message: This adapter1 is available
405-
observed_generation: 1
405+
observed_generation: 2
406406
created_time: '2021-01-01T10:00:00Z'
407407
last_updated_time: '2021-01-01T10:00:00Z'
408408
last_transition_time: '2021-01-01T10:00:00Z'
409409
- type: Adapter2Successful
410410
status: 'True'
411411
reason: This adapter2 is available
412412
message: This adapter2 is available
413-
observed_generation: 1
413+
observed_generation: 2
414414
created_time: '2021-01-01T10:01:00Z'
415415
last_updated_time: '2021-01-01T10:01:00Z'
416416
last_transition_time: '2021-01-01T10:01:00Z'

‎schemas/core/swagger.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ paths:
155155
message: >-
156156
All adapters reported Ready True for the current
157157
generation
158-
observed_generation: 1
158+
observed_generation: 2
159159
reason: >-
160160
All adapters reported Ready True for the current
161161
generation
@@ -167,7 +167,7 @@ paths:
167167
message: >-
168168
All required adapters reported Available=True or
169169
Finalized=True at the current generation
170-
observed_generation: 1
170+
observed_generation: 2
171171
reason: >-
172172
All required adapters reported Available=True or
173173
Finalized=True at the current generation
@@ -179,7 +179,7 @@ paths:
179179
message: >-
180180
All adapters reported Available True for the same
181181
generation
182-
observed_generation: 1
182+
observed_generation: 2
183183
reason: >-
184184
All adapters reported Available True for the same
185185
generation
@@ -189,15 +189,15 @@ paths:
189189
last_transition_time: '2021-01-01T10:00:00Z'
190190
last_updated_time: '2021-01-01T10:00:00Z'
191191
message: This adapter1 is available
192-
observed_generation: 1
192+
observed_generation: 2
193193
reason: This adapter1 is available
194194
status: 'True'
195195
type: Adapter1Successful
196196
- created_time: '2021-01-01T10:01:00Z'
197197
last_transition_time: '2021-01-01T10:01:00Z'
198198
last_updated_time: '2021-01-01T10:01:00Z'
199199
message: This adapter2 is available
200-
observed_generation: 1
200+
observed_generation: 2
201201
reason: This adapter2 is available
202202
status: 'True'
203203
type: Adapter2Successful
@@ -437,7 +437,7 @@ paths:
437437
message: >-
438438
All adapters reported Ready True for the current
439439
generation
440-
observed_generation: 1
440+
observed_generation: 2
441441
reason: >-
442442
All adapters reported Ready True for the current
443443
generation
@@ -449,7 +449,7 @@ paths:
449449
message: >-
450450
All required adapters reported Available=True or
451451
Finalized=True at the current generation
452-
observed_generation: 1
452+
observed_generation: 2
453453
reason: >-
454454
All required adapters reported Available=True or
455455
Finalized=True at the current generation
@@ -461,7 +461,7 @@ paths:
461461
message: >-
462462
All adapters reported Available True for the same
463463
generation
464-
observed_generation: 1
464+
observed_generation: 2
465465
reason: >-
466466
All adapters reported Available True for the same
467467
generation
@@ -471,15 +471,15 @@ paths:
471471
last_transition_time: '2021-01-01T10:00:00Z'
472472
last_updated_time: '2021-01-01T10:00:00Z'
473473
message: This adapter1 is available
474-
observed_generation: 1
474+
observed_generation: 2
475475
reason: This adapter1 is available
476476
status: 'True'
477477
type: Adapter1Successful
478478
- created_time: '2021-01-01T10:01:00Z'
479479
last_transition_time: '2021-01-01T10:01:00Z'
480480
last_updated_time: '2021-01-01T10:01:00Z'
481481
message: This adapter2 is available
482-
observed_generation: 1
482+
observed_generation: 2
483483
reason: This adapter2 is available
484484
status: 'True'
485485
type: Adapter2Successful

0 commit comments

Comments
 (0)