remove orphaned subscribers from nats jetstream channels by astelmashenko · Pull Request #679 · knative-extensions/eventing-natss

astelmashenko · 2025-09-03T10:24:14Z

There was an issues that sometime we observeved incosistency in actual subscribers CRDs and channels' list of subs. There were non-existent subs in channel.

Proposed Changes

This PR fixes that by checking list of subscription CRD against NastJetStreamChannel list of subscriptions.

Release Note

Reconclier now can remove non-existing subscriptions.

codecov · 2025-09-03T12:10:04Z

Codecov Report

❌ Patch coverage is 6.94444% with 67 lines in your changes missing coverage. Please review.
✅ Project coverage is 26.24%. Comparing base (fe02889) to head (eeb17b2).
⚠️ Report is 6 commits behind head on main.

Files with missing lines	Patch %	Lines
pkg/channel/jetstream/dispatcher/reconciler.go	7.69%	59 Missing and 1 partial ⚠️
pkg/channel/jetstream/dispatcher/controller.go	0.00%	7 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #679      +/-   ##
==========================================
- Coverage   26.69%   26.24%   -0.46%     
==========================================
  Files          44       44              
  Lines        2772     2839      +67     
==========================================
+ Hits          740      745       +5     
- Misses       1974     2035      +61     
- Partials       58       59       +1

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

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

astelmashenko · 2025-09-03T14:51:19Z

/cherrypick release-1.18

knative-prow-robot · 2025-09-03T14:51:22Z

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

Details

In response to this:

/cherrypick release-1.18

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-sigs/prow repository.

astelmashenko · 2025-09-03T14:52:26Z

/assign @Cali0707

Cali0707 · 2025-09-03T18:24:34Z

+		subsUids.Insert(string(s.UID))
+	}
+
+	orphanedSubs := subsUids.Difference(allSubsInNsUids)


I think we should have some sort of check for the type of Channel the subscription is referencing, as there are scenarios where users have multiple types of Channels (e.g. In Memory + NATS)

My concern is that we would be deleting too many subscriptions in this scenario

@Cali0707 , it is difference, it works the next way:

Difference returns a set of objects that are not in s2. For example: s1 = {a1, a2, a3} s2 = {a1, a2, a4, a5} s1.Difference(s2) = {a3} s2.Difference(s1) = {a4, a5}

s1 in our case is Channel.Spec.Subscriptions, s2 is all sub in a namespace, so there is no issue if we take all subs in a namespace, making difference of UIDS we just remove all subs from s1 which are actually exist and leftovers are those do not exist. And we do not delete any CRDs, we only delete orphaned subscriptions from a Channel.Spec.Subscriptions and Channel.Status.Subscriptions.

Cali0707

/lgtm

astelmashenko · 2025-09-10T13:35:29Z

@creydr , could you please skip codecov for this one?

Cali0707

/lgtm

knative-prow · 2025-09-11T13:04:37Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [Cali0707,astelmashenko]

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

astelmashenko · 2025-09-11T13:43:21Z

@dprotaso , could you please skip codecov for this PR?

dprotaso · 2025-09-11T13:54:22Z

/override "codecov/patch"

you can adjust the settings here - https://github.com/knative-extensions/eventing-natss/blob/main/.codecov.yaml

knative-prow · 2025-09-11T13:54:26Z

@dprotaso: Overrode contexts on behalf of dprotaso: codecov/patch

Details

In response to this:

/override "codecov/patch"

you can adjust the settings here - https://github.com/knative-extensions/eventing-natss/blob/main/.codecov.yaml

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-sigs/prow repository.

knative-prow-robot · 2025-09-11T13:56:14Z

@astelmashenko: new pull request created: #685

Details

In response to this:

/cherrypick release-1.18

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-sigs/prow repository.

astelmashenko · 2025-09-11T13:56:17Z

/cherrypick release-1.18

astelmashenko · 2025-09-11T13:56:52Z

/cherrypick release-1.19

knative-prow-robot · 2025-09-11T13:56:55Z

@astelmashenko: new pull request could not be created: failed to create pull request against knative-extensions/eventing-natss#release-1.18 from head knative-prow-robot:cherry-pick-679-to-release-1.18: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for knative-prow-robot:cherry-pick-679-to-release-1.18."}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request","status":"422"}

Details

In response to this:

/cherrypick release-1.18

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-sigs/prow repository.

knative-prow-robot · 2025-09-11T13:57:39Z

@astelmashenko: new pull request created: #686

Details

In response to this:

/cherrypick release-1.19

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-sigs/prow repository.

added feature to remove orphaned subscribers from channels

1025c2c

knative-prow Bot requested review from creydr and dan-j September 3, 2025 10:24

astelmashenko added 3 commits September 3, 2025 13:42

fixed dispatcher test

d9968f6

added messaging client assign in tests

24aa40d

switched off check orphaned subs in tests

1b2d978

astelmashenko added 3 commits September 3, 2025 17:13

renamed orphaned subs check flag

3158d9e

changed flags values

7968d6d

removed unnecessary logs

f5cb206

astelmashenko marked this pull request as ready for review September 3, 2025 14:52

knative-prow Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 3, 2025

knative-prow Bot requested a review from Leo6Leo September 3, 2025 14:52

knative-prow Bot assigned Cali0707 Sep 3, 2025

Cali0707 reviewed Sep 3, 2025

View reviewed changes

astelmashenko requested a review from Cali0707 September 4, 2025 09:30

Cali0707 approved these changes Sep 10, 2025

View reviewed changes

knative-prow Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 10, 2025

included orphaned subs into checks

eeb17b2

knative-prow Bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 11, 2025

Cali0707 approved these changes Sep 11, 2025

View reviewed changes

knative-prow Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 11, 2025

knative-prow Bot merged commit 64abebf into knative-extensions:main Sep 11, 2025
21 of 22 checks passed

knative-prow-robot mentioned this pull request Sep 11, 2025

[release-1.18] remove orphaned subscribers from nats jetstream channels #685

Merged

knative-prow-robot mentioned this pull request Sep 11, 2025

[release-1.19] remove orphaned subscribers from nats jetstream channels #686

Merged

astelmashenko mentioned this pull request Sep 22, 2025

removed patching of ophaned subs from CRD status #689

Merged

astelmashenko deleted the bugfix/remove-orphaned-subs branch January 28, 2026 11:58

Uh oh!

Conversation

astelmashenko commented Sep 3, 2025

Proposed Changes

Uh oh!

codecov Bot commented Sep 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

astelmashenko commented Sep 3, 2025

Uh oh!

knative-prow-robot commented Sep 3, 2025

Uh oh!

astelmashenko commented Sep 3, 2025

Uh oh!

Cali0707 Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

astelmashenko Sep 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Cali0707 left a comment

Choose a reason for hiding this comment

Uh oh!

astelmashenko commented Sep 10, 2025

Uh oh!

Cali0707 left a comment

Choose a reason for hiding this comment

Uh oh!

knative-prow Bot commented Sep 11, 2025

Uh oh!

astelmashenko commented Sep 11, 2025

Uh oh!

dprotaso commented Sep 11, 2025

Uh oh!

knative-prow Bot commented Sep 11, 2025

Uh oh!

Uh oh!

knative-prow-robot commented Sep 11, 2025

Uh oh!

astelmashenko commented Sep 11, 2025

Uh oh!

astelmashenko commented Sep 11, 2025

Uh oh!

knative-prow-robot commented Sep 11, 2025

Uh oh!

knative-prow-robot commented Sep 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov Bot commented Sep 3, 2025 •

edited

Loading

astelmashenko Sep 4, 2025 •

edited

Loading