Skip to content

Commit 4eddd8c

Browse files
committed
Order an operator CR's status.Component.Refs array
Problem: The operator CR's status includes a list of componenets owned by the operator. The list of components are ordered by GVK, but the order of objects with the same GVK may change. If an operator owns many components, there is a high likelyhood that OLM will continuously update the status of the operator CR because the order of its components have changed, Solution: Order an operators component references so OLM does not attempt to update the status of the operator CR. Signed-off-by: Alexander Greene <[email protected]>
1 parent 91e5d90 commit 4eddd8c

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

pkg/controller/operators/decorators/operator.go

+17
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package decorators
22

33
import (
44
"fmt"
5+
"sort"
56
"strings"
67

78
"github.com/itchyny/gojq"
@@ -331,6 +332,22 @@ func (o *Operator) AddComponents(components ...runtime.Object) error {
331332

332333
o.Status.Components.Refs = append(o.Status.Components.Refs, refs...)
333334

335+
// Sort to ensure ordering
336+
sort.SliceStable(o.Status.Components.Refs, func(i, j int) bool {
337+
if o.Status.Components.Refs[i].Kind != o.Status.Components.Refs[j].Kind {
338+
return o.Status.Components.Refs[i].Kind < o.Status.Components.Refs[j].Kind
339+
}
340+
341+
if o.Status.Components.Refs[i].APIVersion != o.Status.Components.Refs[j].APIVersion {
342+
return o.Status.Components.Refs[i].APIVersion < o.Status.Components.Refs[j].APIVersion
343+
}
344+
345+
if o.Status.Components.Refs[i].Namespace != o.Status.Components.Refs[j].Namespace {
346+
return o.Status.Components.Refs[i].Namespace < o.Status.Components.Refs[j].Namespace
347+
}
348+
return o.Status.Components.Refs[i].Name < o.Status.Components.Refs[j].Name
349+
})
350+
334351
return nil
335352
}
336353

pkg/controller/operators/operator_controller.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package operators
33
import (
44
"context"
55
"fmt"
6+
"reflect"
67

78
"github.com/go-logr/logr"
89
appsv1 "k8s.io/api/apps/v1"
@@ -152,9 +153,11 @@ func (r *OperatorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
152153
return ctrl.Result{Requeue: true}, nil
153154
}
154155
} else {
155-
if err := r.Status().Update(ctx, operator.Operator); err != nil {
156-
log.Error(err, "Could not update Operator status")
157-
return ctrl.Result{Requeue: true}, nil
156+
if !reflect.DeepEqual(in.Status, operator.Operator.Status) {
157+
if err := r.Status().Update(ctx, operator.Operator); err != nil {
158+
log.Error(err, "Could not update Operator status")
159+
return ctrl.Result{Requeue: true}, nil
160+
}
158161
}
159162
}
160163

0 commit comments

Comments
 (0)