Skip to content

Commit 1604448

Browse files
petr-mullerpetr-muller
committed
Rename ResourceReconciliationIssues to ReconciliationIssues 
1 parent 7bd3096 commit 1604448

File tree

5 files changed

+83
-83
lines changed

5 files changed

+83
-83
lines changed

‎pkg/cvo/reconciliation_issues.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package cvo
2+
3+
import v1 "github.com/openshift/api/config/v1"
4+
5+
const (
6+
reconciliationIssuesConditionType v1.ClusterStatusConditionType = "ReconciliationIssues"
7+
8+
noReconciliationIssuesReason string = "NoIssues"
9+
noReconciliationIssuesMessage string = "No issues found during reconciliation"
10+
11+
reconciliationIssuesFoundReason string = "IssuesFound"
12+
reconciliationIssuesFoundMessage string = "Issues found during reconciliation"
13+
)

‎pkg/cvo/resource_reconciliation_issues.go

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎pkg/cvo/status.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -381,22 +381,22 @@ func updateClusterVersionStatus(cvStatus *configv1.ClusterVersionStatus, status
381381
}
382382
}
383383

384-
oldRriCondition := resourcemerge.FindOperatorStatusCondition(cvStatus.Conditions, resourceReconciliationIssuesConditionType)
385-
if enabledGates.ResourceReconciliationIssuesCondition() || (oldRriCondition != nil && enabledGates.UnknownVersion()) {
386-
rriCondition := configv1.ClusterOperatorStatusCondition{
387-
Type: resourceReconciliationIssuesConditionType,
384+
oldRiCondition := resourcemerge.FindOperatorStatusCondition(cvStatus.Conditions, reconciliationIssuesConditionType)
385+
if enabledGates.ReconciliationIssuesCondition() || (oldRiCondition != nil && enabledGates.UnknownVersion()) {
386+
riCondition := configv1.ClusterOperatorStatusCondition{
387+
Type: reconciliationIssuesConditionType,
388388
Status: configv1.ConditionFalse,
389-
Reason: noResourceReconciliationIssuesReason,
390-
Message: noResourceReconciliationIssuesMessage,
389+
Reason: noReconciliationIssuesReason,
390+
Message: noReconciliationIssuesMessage,
391391
}
392392
if status.Failure != nil {
393-
rriCondition.Status = configv1.ConditionTrue
394-
rriCondition.Reason = resourceReconciliationIssuesFoundReason
395-
rriCondition.Message = fmt.Sprintf("%s: %s", resourceReconciliationIssuesFoundMessage, status.Failure.Error())
393+
riCondition.Status = configv1.ConditionTrue
394+
riCondition.Reason = reconciliationIssuesFoundReason
395+
riCondition.Message = fmt.Sprintf("%s: %s", reconciliationIssuesFoundMessage, status.Failure.Error())
396396
}
397-
resourcemerge.SetOperatorStatusCondition(&cvStatus.Conditions, rriCondition)
398-
} else if oldRriCondition != nil {
399-
resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, resourceReconciliationIssuesConditionType)
397+
resourcemerge.SetOperatorStatusCondition(&cvStatus.Conditions, riCondition)
398+
} else if oldRiCondition != nil {
399+
resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, reconciliationIssuesConditionType)
400400
}
401401

402402
// default retrieved updates if it is not set

‎pkg/cvo/status_test.go

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -196,20 +196,20 @@ func TestOperator_syncFailingStatus(t *testing.T) {
196196
}
197197
}
198198

199-
type fakeRriFlags struct {
200-
unknownVersion bool
201-
resourceReconciliationIssuesCondition bool
199+
type fakeRiFlags struct {
200+
unknownVersion bool
201+
reconciliationIssuesCondition bool
202202
}
203203

204-
func (f fakeRriFlags) UnknownVersion() bool {
204+
func (f fakeRiFlags) UnknownVersion() bool {
205205
return f.unknownVersion
206206
}
207207

208-
func (f fakeRriFlags) ResourceReconciliationIssuesCondition() bool {
209-
return f.resourceReconciliationIssuesCondition
208+
func (f fakeRiFlags) ReconciliationIssuesCondition() bool {
209+
return f.reconciliationIssuesCondition
210210
}
211211

212-
func TestUpdateClusterVersionStatus_UnknownVersionAndRRI(t *testing.T) {
212+
func TestUpdateClusterVersionStatus_UnknownVersionAndReconciliationIssues(t *testing.T) {
213213
ignoreLastTransitionTime := cmpopts.IgnoreFields(configv1.ClusterOperatorStatusCondition{}, "LastTransitionTime")
214214

215215
testCases := []struct {
@@ -219,49 +219,49 @@ func TestUpdateClusterVersionStatus_UnknownVersionAndRRI(t *testing.T) {
219219
oldCondition *configv1.ClusterOperatorStatusCondition
220220
failure error
221221

222-
expectedRriCondition *configv1.ClusterOperatorStatusCondition
222+
expectedRiCondition *configv1.ClusterOperatorStatusCondition
223223
}{
224224
{
225-
name: "RRI disabled, version known, no failure => condition not present",
226-
unknownVersion: false,
227-
expectedRriCondition: nil,
225+
name: "ReconciliationIssues disabled, version known, no failure => condition not present",
226+
unknownVersion: false,
227+
expectedRiCondition: nil,
228228
},
229229
{
230-
name: "RRI disabled, version known, failure => condition not present",
231-
unknownVersion: false,
232-
failure: fmt.Errorf("Something happened"),
233-
expectedRriCondition: nil,
230+
name: "ReconciliationIssues disabled, version known, failure => condition not present",
231+
unknownVersion: false,
232+
failure: fmt.Errorf("Something happened"),
233+
expectedRiCondition: nil,
234234
},
235235
{
236-
name: "RRI disabled, version unknown, failure, existing condition => condition present",
236+
name: "ReconciliationIssues disabled, version unknown, failure, existing condition => condition present",
237237
oldCondition: &configv1.ClusterOperatorStatusCondition{
238-
Type: resourceReconciliationIssuesConditionType,
238+
Type: reconciliationIssuesConditionType,
239239
Status: configv1.ConditionFalse,
240-
Reason: noResourceReconciliationIssuesReason,
240+
Reason: noReconciliationIssuesReason,
241241
Message: "Happy condition is happy",
242242
},
243243
unknownVersion: true,
244244
failure: fmt.Errorf("Something happened"),
245-
expectedRriCondition: &configv1.ClusterOperatorStatusCondition{
246-
Type: resourceReconciliationIssuesConditionType,
245+
expectedRiCondition: &configv1.ClusterOperatorStatusCondition{
246+
Type: reconciliationIssuesConditionType,
247247
Status: configv1.ConditionTrue,
248-
Reason: resourceReconciliationIssuesFoundReason,
249-
Message: "Issues found during resource reconciliation: Something happened",
248+
Reason: reconciliationIssuesFoundReason,
249+
Message: "Issues found during reconciliation: Something happened",
250250
},
251251
},
252252
{
253-
name: "RRI disabled, version unknown, failure, no existing condition => condition not present",
254-
unknownVersion: true,
255-
failure: fmt.Errorf("Something happened"),
256-
expectedRriCondition: nil,
253+
name: "ReconciliationIssues disabled, version unknown, failure, no existing condition => condition not present",
254+
unknownVersion: true,
255+
failure: fmt.Errorf("Something happened"),
256+
expectedRiCondition: nil,
257257
},
258258
}
259259
for _, tc := range testCases {
260260
tc := tc
261261
t.Run(tc.name, func(t *testing.T) {
262-
gates := fakeRriFlags{
263-
unknownVersion: tc.unknownVersion,
264-
resourceReconciliationIssuesCondition: false,
262+
gates := fakeRiFlags{
263+
unknownVersion: tc.unknownVersion,
264+
reconciliationIssuesCondition: false,
265265
}
266266
release := configv1.Release{}
267267
getAvailableUpdates := func() *availableUpdates { return nil }
@@ -271,8 +271,8 @@ func TestUpdateClusterVersionStatus_UnknownVersionAndRRI(t *testing.T) {
271271
cvStatus.Conditions = append(cvStatus.Conditions, *tc.oldCondition)
272272
}
273273
updateClusterVersionStatus(&cvStatus, &SyncWorkerStatus{Failure: tc.failure}, release, getAvailableUpdates, gates, noErrors)
274-
condition := resourcemerge.FindOperatorStatusCondition(cvStatus.Conditions, resourceReconciliationIssuesConditionType)
275-
if diff := cmp.Diff(tc.expectedRriCondition, condition, ignoreLastTransitionTime); diff != "" {
274+
condition := resourcemerge.FindOperatorStatusCondition(cvStatus.Conditions, reconciliationIssuesConditionType)
275+
if diff := cmp.Diff(tc.expectedRiCondition, condition, ignoreLastTransitionTime); diff != "" {
276276
t.Errorf("unexpected condition\n:%s", diff)
277277
}
278278
})
@@ -281,7 +281,7 @@ func TestUpdateClusterVersionStatus_UnknownVersionAndRRI(t *testing.T) {
281281

282282
}
283283

284-
func TestUpdateClusterVersionStatus_ResourceReconciliationIssues(t *testing.T) {
284+
func TestUpdateClusterVersionStatus_ReconciliationIssues(t *testing.T) {
285285
ignoreLastTransitionTime := cmpopts.IgnoreFields(configv1.ClusterOperatorStatusCondition{}, "LastTransitionTime")
286286

287287
testCases := []struct {
@@ -293,31 +293,31 @@ func TestUpdateClusterVersionStatus_ResourceReconciliationIssues(t *testing.T) {
293293
expectedCondition *configv1.ClusterOperatorStatusCondition
294294
}{
295295
{
296-
name: "ResourceReconciliationIssues present and happy when gate is enabled and no failures happened",
296+
name: "ReconciliationIssues present and happy when gate is enabled and no failures happened",
297297
syncWorkerStatus: SyncWorkerStatus{},
298298
enabled: true,
299299
expectedCondition: &configv1.ClusterOperatorStatusCondition{
300-
Type: resourceReconciliationIssuesConditionType,
300+
Type: reconciliationIssuesConditionType,
301301
Status: configv1.ConditionFalse,
302-
Reason: noResourceReconciliationIssuesReason,
303-
Message: noResourceReconciliationIssuesMessage,
302+
Reason: noReconciliationIssuesReason,
303+
Message: noReconciliationIssuesMessage,
304304
},
305305
},
306306
{
307-
name: "ResourceReconciliationIssues present and unhappy when gate is enabled and failures happened",
307+
name: "ReconciliationIssues present and unhappy when gate is enabled and failures happened",
308308
syncWorkerStatus: SyncWorkerStatus{
309309
Failure: fmt.Errorf("Something happened"),
310310
},
311311
enabled: true,
312312
expectedCondition: &configv1.ClusterOperatorStatusCondition{
313-
Type: resourceReconciliationIssuesConditionType,
313+
Type: reconciliationIssuesConditionType,
314314
Status: configv1.ConditionTrue,
315-
Reason: resourceReconciliationIssuesFoundReason,
316-
Message: "Issues found during resource reconciliation: Something happened",
315+
Reason: reconciliationIssuesFoundReason,
316+
Message: "Issues found during reconciliation: Something happened",
317317
},
318318
},
319319
{
320-
name: "ResourceReconciliationIssues not present when gate is enabled and failures happened",
320+
name: "ReconciliationIssues not present when gate is enabled and failures happened",
321321
syncWorkerStatus: SyncWorkerStatus{
322322
Failure: fmt.Errorf("Something happened"),
323323
},
@@ -329,16 +329,16 @@ func TestUpdateClusterVersionStatus_ResourceReconciliationIssues(t *testing.T) {
329329
for _, tc := range testCases {
330330
tc := tc
331331
t.Run(tc.name, func(t *testing.T) {
332-
gates := fakeRriFlags{
333-
unknownVersion: false,
334-
resourceReconciliationIssuesCondition: tc.enabled,
332+
gates := fakeRiFlags{
333+
unknownVersion: false,
334+
reconciliationIssuesCondition: tc.enabled,
335335
}
336336
release := configv1.Release{}
337337
getAvailableUpdates := func() *availableUpdates { return nil }
338338
var noErrors field.ErrorList
339339
cvStatus := configv1.ClusterVersionStatus{}
340340
updateClusterVersionStatus(&cvStatus, &tc.syncWorkerStatus, release, getAvailableUpdates, gates, noErrors)
341-
condition := resourcemerge.FindOperatorStatusCondition(cvStatus.Conditions, resourceReconciliationIssuesConditionType)
341+
condition := resourcemerge.FindOperatorStatusCondition(cvStatus.Conditions, reconciliationIssuesConditionType)
342342
if diff := cmp.Diff(tc.expectedCondition, condition, ignoreLastTransitionTime); diff != "" {
343343
t.Errorf("unexpected condition\n:%s", diff)
344344
}

‎pkg/featuregates/featuregates.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ type CvoGateChecker interface {
1717
// to restart when the flags change.
1818
UnknownVersion() bool
1919

20-
// ResourceReconciliationIssuesCondition controls whether CVO maintains a Condition with
21-
// ResourceReconciliationIssues type, containing a JSON that describes all "issues" that prevented
20+
// ReconciliationIssuesCondition controls whether CVO maintains a Condition with
21+
// ReconciliationIssues type, containing a JSON that describes all "issues" that prevented
2222
// or delayed CVO from reconciling individual resources in the cluster. This is a pseudo-API
2323
// that the experimental work for "oc adm upgrade status" uses to report upgrade status, and
2424
// should never be relied upon by any production code. We may want to eventually turn this into
2525
// some kind of "real" API.
26-
ResourceReconciliationIssuesCondition() bool
26+
ReconciliationIssuesCondition() bool
2727
}
2828

2929
type panicOnUsageBeforeInitializationFunc func()
@@ -36,7 +36,7 @@ func panicOnUsageBeforeInitialization() {
3636
// be used before CVO feature gates are actually known and some code tries to check them.
3737
var PanicOnUsageBeforeInitialization = panicOnUsageBeforeInitializationFunc(panicOnUsageBeforeInitialization)
3838

39-
func (p panicOnUsageBeforeInitializationFunc) ResourceReconciliationIssuesCondition() bool {
39+
func (p panicOnUsageBeforeInitializationFunc) ReconciliationIssuesCondition() bool {
4040
p()
4141
return false
4242
}
@@ -55,12 +55,12 @@ type CvoGates struct {
5555
desiredVersion string
5656

5757
// individual flags mirror the CvoGateChecker interface
58-
unknownVersion bool
59-
resourceReconciliationIssuesCondition bool
58+
unknownVersion bool
59+
reconciliationIssuesCondition bool
6060
}
6161

62-
func (c CvoGates) ResourceReconciliationIssuesCondition() bool {
63-
return c.resourceReconciliationIssuesCondition
62+
func (c CvoGates) ReconciliationIssuesCondition() bool {
63+
return c.reconciliationIssuesCondition
6464
}
6565

6666
func (c CvoGates) UnknownVersion() bool {
@@ -70,9 +70,9 @@ func (c CvoGates) UnknownVersion() bool {
7070
// DefaultCvoGates apply when actual features for given version are unknown
7171
func DefaultCvoGates(version string) CvoGates {
7272
return CvoGates{
73-
desiredVersion: version,
74-
unknownVersion: true,
75-
resourceReconciliationIssuesCondition: false,
73+
desiredVersion: version,
74+
unknownVersion: true,
75+
reconciliationIssuesCondition: false,
7676
}
7777
}
7878

@@ -90,12 +90,12 @@ func CvoGatesFromFeatureGate(gate *configv1.FeatureGate, version string) CvoGate
9090
enabledGates.unknownVersion = false
9191
for _, enabled := range g.Enabled {
9292
if enabled.Name == configv1.FeatureGateUpgradeStatus {
93-
enabledGates.resourceReconciliationIssuesCondition = true
93+
enabledGates.reconciliationIssuesCondition = true
9494
}
9595
}
9696
for _, disabled := range g.Disabled {
9797
if disabled.Name == configv1.FeatureGateUpgradeStatus {
98-
enabledGates.resourceReconciliationIssuesCondition = false
98+
enabledGates.reconciliationIssuesCondition = false
9999
}
100100
}
101101
}

0 commit comments

Comments
 (0)