Fixed eventtype create-delete loop on built in sources #7245

Cali0707 · 2023-09-08T19:35:59Z

It appears that the eventtypes KReference in the default namespace were being retrieved with Namespace: "", while the eventtypes KReference they were being compared to had Namespace: "default". This caused the deep equality to fail, so they were continually deleted and recreated in the duck reconciler.

Proposed Changes

Set Namespace = "default" if Namespace == ""

Pre-review Checklist

At least 80% unit test coverage
E2E tests for any new behavior
Docs PR for any user-facing impact
Spec PR for any new API feature
Conformance test for any change to the spec

Release Note

Fixed bug where eventtypes for builtin sources were created and deleted in a loop

Signed-off-by: Calum Murray <cmurray@redhat.com>

Cali0707 · 2023-09-08T19:36:12Z

/cc @matzew

Signed-off-by: Calum Murray <cmurray@redhat.com>

codecov · 2023-09-08T20:12:49Z

Codecov Report

Patch coverage: 23.07% and project coverage change: -0.06% ⚠️

Comparison is base (b082850) 77.75% compared to head (bdd7402) 77.70%.
Report is 3 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #7245      +/-   ##
==========================================
- Coverage   77.75%   77.70%   -0.06%     
==========================================
  Files         246      247       +1     
  Lines       13284    13311      +27     
==========================================
+ Hits        10329    10343      +14     
- Misses       2433     2445      +12     
- Partials      522      523       +1

Files Changed	Coverage Δ
pkg/reconciler/apiserversource/apiserversource.go	`78.99% <0.00%> (-1.85%)`	⬇️
pkg/reconciler/pingsource/pingsource.go	`80.37% <0.00%> (-3.94%)`	⬇️
pkg/reconciler/source/duck/duck.go	`75.15% <100.00%> (+0.47%)`	⬆️

... and 5 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Cali0707 · 2023-09-08T20:26:12Z

/test upgrade-tests

matzew · 2023-09-11T09:47:02Z

/test reconciler-tests

matzew

/lgtm
/approve

creydr · 2023-09-11T12:00:37Z

/retest

Cali0707 · 2023-09-11T14:26:49Z

/retest-required

Signed-off-by: Calum Murray <cmurray@redhat.com>

Cali0707 · 2023-09-11T18:15:37Z

I fixed the finalizer problems now
/cc @matzew @creydr

matzew

/lgtm
/approve

knative-prow · 2023-09-12T05:45:24Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Cali0707, matzew

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [matzew]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

matzew · 2023-09-12T05:45:41Z

/cherry-pick release-1.11

knative-prow-robot · 2023-09-12T05:45:42Z

@matzew: once the present PR merges, I will cherry-pick it on top of release-1.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

knative-prow-robot · 2023-09-12T05:48:32Z

@matzew: #7245 failed to apply on top of branch "release-1.11":

Applying: Fixed eventtype create-delete loop on built in sources
Applying: Fix unit tests
Applying: Fixed source finalizers
Applying: Fixed tests
Using index info to reconstruct a base tree...
M	test/rekt/features/apiserversource/data_plane.go
Falling back to patching base and 3-way merge...
Auto-merging test/rekt/features/apiserversource/data_plane.go
CONFLICT (content): Merge conflict in test/rekt/features/apiserversource/data_plane.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 Fixed tests
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Cali0707 · 2023-09-12T12:42:30Z

@matzew I will manually cherry pick this

* Fixed eventtype create-delete loop on built in sources Signed-off-by: Calum Murray <cmurray@redhat.com> * Fix unit tests Signed-off-by: Calum Murray <cmurray@redhat.com> * Fixed source finalizers Signed-off-by: Calum Murray <cmurray@redhat.com> * Fixed tests Signed-off-by: Calum Murray <cmurray@redhat.com> --------- Signed-off-by: Calum Murray <cmurray@redhat.com>

* Fixed eventtype create-delete loop on built in sources * Fix unit tests * Fixed source finalizers * Fixed tests --------- Signed-off-by: Calum Murray <cmurray@redhat.com>

…knative#7250) * Fixed eventtype create-delete loop on built in sources * Fix unit tests * Fixed source finalizers * Fixed tests --------- Signed-off-by: Calum Murray <cmurray@redhat.com>

…knative#7250) (#491) * Fixed eventtype create-delete loop on built in sources * Fix unit tests * Fixed source finalizers * Fixed tests --------- Signed-off-by: Calum Murray <cmurray@redhat.com> Co-authored-by: Calum Murray <cmurray@redhat.com>

pierDipi · 2024-02-26T12:30:18Z

pkg/reconciler/apiserversource/apiserversource.go

+func (r *Reconciler) FinalizeKind(ctx context.Context, source *v1.ApiServerSource) pkgreconciler.Event {
+	logging.FromContext(ctx).Info("Deleting source")
+	// Allow for eventtypes to be cleaned up
+	source.Status.CloudEventAttributes = []duckv1.CloudEventAttributes{}
+	return nil
+}
+


This update is not guaranteed to be seen by the other controller (since after FinalizeKind ends the finalizer is removed and with it the resource) and also I think there is (or there should be) an owner reference that should clean up event types associated with this source.

pierDipi · 2024-02-26T12:34:58Z

pkg/reconciler/source/duck/duck.go

+		if eventType.Spec.Reference.Namespace == "" {
+			eventType.Spec.Reference.Namespace = defaultNamespace
+		}


If we want to set a namespace, the correct one is src.Namespace, assuming default is wrong

I think we had this assumption before.

but I like this suggestion

We did not, that was on the Broker name, which different from the reference namespace here

…ve#7245)" This reverts commit 93cec0f.

Fixed eventtype create-delete loop on built in sources

5415e0d

Signed-off-by: Calum Murray <cmurray@redhat.com>

knative-prow bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 8, 2023

knative-prow bot requested review from aslom and matzew September 8, 2023 19:36

Fix unit tests

0de41db

Signed-off-by: Calum Murray <cmurray@redhat.com>

knative-prow bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 8, 2023

matzew approved these changes Sep 11, 2023

View reviewed changes

knative-prow bot assigned matzew Sep 11, 2023

knative-prow bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 11, 2023

Cali0707 added 2 commits September 11, 2023 13:16

Fixed source finalizers

b815268

Signed-off-by: Calum Murray <cmurray@redhat.com>

Fixed tests

bdd7402

Signed-off-by: Calum Murray <cmurray@redhat.com>

knative-prow bot requested review from creydr and matzew September 11, 2023 18:15

matzew approved these changes Sep 12, 2023

View reviewed changes

knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label Sep 12, 2023

knative-prow bot merged commit 93cec0f into knative:main Sep 12, 2023
36 of 39 checks passed

Cali0707 mentioned this pull request Sep 12, 2023

[release-1.11] Fixed eventtype create-delete loop on built in sources (#7245) #7250

Merged

pierDipi reviewed Feb 26, 2024

View reviewed changes

pierDipi added a commit to pierDipi/eventing that referenced this pull request Feb 26, 2024

Revert "Fixed eventtype create-delete loop on built in sources (knati…

a36a278

…ve#7245)" This reverts commit 93cec0f.

This was referenced Feb 26, 2024

[WIP] [release-v1.11] Alternative fix for eventtype create-delete loop on built in sources openshift-knative/eventing#546

Closed

Remove assumption on default namespace for EventType reference #7724

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed eventtype create-delete loop on built in sources #7245

Fixed eventtype create-delete loop on built in sources #7245

Cali0707 commented Sep 8, 2023

Cali0707 commented Sep 8, 2023

codecov bot commented Sep 8, 2023 •

edited

Loading

Cali0707 commented Sep 8, 2023

matzew commented Sep 11, 2023

matzew left a comment

creydr commented Sep 11, 2023

Cali0707 commented Sep 11, 2023

Cali0707 commented Sep 11, 2023

matzew left a comment

knative-prow bot commented Sep 12, 2023

matzew commented Sep 12, 2023

knative-prow-robot commented Sep 12, 2023

knative-prow-robot commented Sep 12, 2023

Cali0707 commented Sep 12, 2023

pierDipi Feb 26, 2024 •

edited

Loading

pierDipi Feb 26, 2024

matzew Feb 26, 2024

pierDipi Feb 26, 2024 •

edited

Loading

Fixed eventtype create-delete loop on built in sources #7245

Fixed eventtype create-delete loop on built in sources #7245

Conversation

Cali0707 commented Sep 8, 2023

Proposed Changes

Pre-review Checklist

Cali0707 commented Sep 8, 2023

codecov bot commented Sep 8, 2023 • edited Loading

Codecov Report

Cali0707 commented Sep 8, 2023

matzew commented Sep 11, 2023

matzew left a comment

Choose a reason for hiding this comment

creydr commented Sep 11, 2023

Cali0707 commented Sep 11, 2023

Cali0707 commented Sep 11, 2023

matzew left a comment

Choose a reason for hiding this comment

knative-prow bot commented Sep 12, 2023

matzew commented Sep 12, 2023

knative-prow-robot commented Sep 12, 2023

knative-prow-robot commented Sep 12, 2023

Cali0707 commented Sep 12, 2023

pierDipi Feb 26, 2024 • edited Loading

Choose a reason for hiding this comment

pierDipi Feb 26, 2024

Choose a reason for hiding this comment

matzew Feb 26, 2024

Choose a reason for hiding this comment

pierDipi Feb 26, 2024 • edited Loading

Choose a reason for hiding this comment

codecov bot commented Sep 8, 2023 •

edited

Loading

pierDipi Feb 26, 2024 •

edited

Loading

pierDipi Feb 26, 2024 •

edited

Loading