Skip to content

Commit bee7c09

Browse files
authored
Merge pull request crossplane#6248 from jbw976/nokia-remove_composed_event
Remove Successfully composed resources event
2 parents 933c39c + c7924e7 commit bee7c09

File tree

2 files changed

+1
-37
lines changed

2 files changed

+1
-37
lines changed

internal/controller/apiextensions/composite/reconciler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
640640
// considered synced (i.e. severe enough to return a ReconcileError) but
641641
// they are severe enough that we probably shouldn't say we successfully
642642
// composed resources.
643-
r.record.Event(xr, event.Normal(reasonCompose, "Successfully composed resources"))
643+
log.Debug("Successfully composed resources")
644644
}
645645

646646
var unready []ComposedResource

internal/controller/apiextensions/composite/reconciler_test.go

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -749,15 +749,6 @@ func TestReconcile(t *testing.T) {
749749
Annotations: map[string]string{},
750750
},
751751
},
752-
eventArgs{
753-
Kind: compositeKind,
754-
Event: event.Event{
755-
Type: event.Type(corev1.EventTypeNormal),
756-
Reason: "ComposeResources",
757-
Message: "Successfully composed resources",
758-
Annotations: map[string]string{},
759-
},
760-
},
761752
)),
762753
WithCompositeFinalizer(resource.NewNopFinalizer()),
763754
WithCompositionSelector(CompositionSelectorFn(func(_ context.Context, cr resource.Composite) error {
@@ -1102,15 +1093,6 @@ func TestReconcile(t *testing.T) {
11021093
Annotations: map[string]string{},
11031094
},
11041095
},
1105-
eventArgs{
1106-
Kind: compositeKind,
1107-
Event: event.Event{
1108-
Type: event.Type(corev1.EventTypeNormal),
1109-
Reason: "ComposeResources",
1110-
Message: "Successfully composed resources",
1111-
Annotations: map[string]string{},
1112-
},
1113-
},
11141096
)),
11151097
WithCompositeFinalizer(resource.NewNopFinalizer()),
11161098
WithCompositionSelector(CompositionSelectorFn(func(_ context.Context, cr resource.Composite) error {
@@ -1199,15 +1181,6 @@ func TestReconcile(t *testing.T) {
11991181
Annotations: map[string]string{},
12001182
},
12011183
},
1202-
eventArgs{
1203-
Kind: compositeKind,
1204-
Event: event.Event{
1205-
Type: event.Type(corev1.EventTypeNormal),
1206-
Reason: "ComposeResources",
1207-
Message: "Successfully composed resources",
1208-
Annotations: map[string]string{},
1209-
},
1210-
},
12111184
)),
12121185
WithCompositeFinalizer(resource.NewNopFinalizer()),
12131186
WithCompositionSelector(CompositionSelectorFn(func(_ context.Context, cr resource.Composite) error {
@@ -1280,15 +1253,6 @@ func TestReconcile(t *testing.T) {
12801253
Annotations: map[string]string{},
12811254
},
12821255
},
1283-
eventArgs{
1284-
Kind: compositeKind,
1285-
Event: event.Event{
1286-
Type: event.Type(corev1.EventTypeNormal),
1287-
Reason: "ComposeResources",
1288-
Message: "Successfully composed resources",
1289-
Annotations: map[string]string{},
1290-
},
1291-
},
12921256
)),
12931257
WithCompositeFinalizer(resource.NewNopFinalizer()),
12941258
WithCompositionSelector(CompositionSelectorFn(func(_ context.Context, cr resource.Composite) error {

0 commit comments

Comments
 (0)