Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ConsumerGroup status on finalization for better error reporing #3415

Merged
merged 1 commit into from
Oct 23, 2023
Merged

Update ConsumerGroup status on finalization for better error reporing #3415

merged 1 commit into from
Oct 23, 2023

Conversation

pierDipi
Copy link
Member

This will make sure that we report finalization issues up to the KafkaSource resource.

@knative-prow
Copy link

knative-prow bot commented Oct 23, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pierDipi

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:

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

@pierDipi
Copy link
Member Author

/cc @creydr @Cali0707

@knative-prow knative-prow bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 23, 2023
@pierDipi pierDipi force-pushed the update-cg-status-cond-on-finalization branch from a445e70 to 9f10c5d Compare October 23, 2023 08:51
@codecov
Copy link

codecov bot commented Oct 23, 2023 •
edited
Loading

Codecov Report

Merging #3415 (cc0df71) into main (36cf0b4) will increase coverage by 0.01%.
The diff coverage is 16.66%.

@@             Coverage Diff              @@
##               main    #3415      +/-   ##
============================================
+ Coverage     61.47%   61.49%   +0.01%     
  Complexity      761      761              
============================================
  Files           181      181              
  Lines         12362    12364       +2     
  Branches        265      265              
============================================
+ Hits           7600     7603       +3     
  Misses         4161     4161              
+ Partials        601      600       -1
Flag Coverage Δ
java-unittests 70.84% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...lane/pkg/reconciler/consumergroup/consumergroup.go 55.64% <50.00%> (+0.79%) ⬆️
...afka/eventing/v1alpha1/consumer_group_lifecycle.go 0.00% <0.00%> (ø)

@creydr
Copy link
Contributor

creydr commented Oct 23, 2023

@pierDipi could you check on the failing unit test?

@pierDipi
Update ConsumerGroup status on finalization for better error reporing
cc0df71 
This will make sure that we report finalization issues up to the
KafkaSource resource.

Signed-off-by: Pierangelo Di Pilato <[email protected]>
@pierDipi pierDipi force-pushed the update-cg-status-cond-on-finalization branch from 9f10c5d to cc0df71 Compare October 23, 2023 09:14
@pierDipi
Copy link
Member Author

Fixed

@knative-prow knative-prow bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 23, 2023
creydr
creydr reviewed Oct 23, 2023
View reviewed changes
Copy link
Contributor

@creydr creydr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@knative-prow knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label Oct 23, 2023
@knative-prow knative-prow bot merged commit 9991502 into knative-extensions:main Oct 23, 2023
18 of 22 checks passed
@pierDipi
Copy link
Member Author

/cherry-pick release-1.11

@knative-prow-robot
Copy link
Contributor

@pierDipi: #3415 failed to apply on top of branch "release-1.11":

Applying: Update ConsumerGroup status on finalization for better error reporing
Using index info to reconstruct a base tree...
M	control-plane/pkg/reconciler/consumergroup/consumergroup.go
M	control-plane/pkg/reconciler/consumergroup/consumergroup_test.go
M	control-plane/pkg/reconciler/testing/objects_consumergroup.go
Falling back to patching base and 3-way merge...
Auto-merging control-plane/pkg/reconciler/testing/objects_consumergroup.go
Auto-merging control-plane/pkg/reconciler/consumergroup/consumergroup_test.go
Auto-merging control-plane/pkg/reconciler/consumergroup/consumergroup.go
CONFLICT (content): Merge conflict in control-plane/pkg/reconciler/consumergroup/consumergroup.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update ConsumerGroup status on finalization for better error reporing
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.

@pierDipi pierDipi deleted the update-cg-status-cond-on-finalization branch October 23, 2023 10:54
pierDipi added a commit to pierDipi/eventing-kafka-broker that referenced this pull request Oct 23, 2023
@pierDipi
Update ConsumerGroup status on finalization for better error reporing (…
2355c0e 
…knative-extensions#3415)

This will make sure that we report finalization issues up to the
KafkaSource resource.

Signed-off-by: Pierangelo Di Pilato <[email protected]>
@pierDipi pierDipi mentioned this pull request Oct 23, 2023
Merged
pierDipi added a commit to pierDipi/eventing-kafka-broker that referenced this pull request Oct 23, 2023
@pierDipi
Update ConsumerGroup status on finalization for better error reporing (…
a4fab2e 
…knative-extensions#3415)

This will make sure that we report finalization issues up to the
KafkaSource resource.

Signed-off-by: Pierangelo Di Pilato <[email protected]>
knative-prow bot pushed a commit that referenced this pull request Oct 23, 2023
@pierDipi
Update ConsumerGroup status on finalization for better error reporing (…
d186c99 
…#3415) (#3417)

This will make sure that we report finalization issues up to the
KafkaSource resource.

Signed-off-by: Pierangelo Di Pilato <[email protected]>
knative-prow-robot pushed a commit to knative-prow-robot/eventing-kafka-broker that referenced this pull request Oct 23, 2023
@pierDipi @knative-prow-robot
Update ConsumerGroup status on finalization for better error reporing (…
96854ea 
…knative-extensions#3415)

This will make sure that we report finalization issues up to the
KafkaSource resource.

Signed-off-by: Pierangelo Di Pilato <[email protected]>
knative-prow bot pushed a commit that referenced this pull request Oct 23, 2023
@knative-prow-robot @pierDipi
Update ConsumerGroup status on finalization for better error reporing (…
a26e6c5 
…#3415) (#3420)

This will make sure that we report finalization issues up to the
KafkaSource resource.

Signed-off-by: Pierangelo Di Pilato <[email protected]>
Co-authored-by: Pierangelo Di Pilato <[email protected]>
openshift-ci bot pushed a commit to openshift-knative/eventing-kafka-broker that referenced this pull request Oct 25, 2023
@pierDipi
Update ConsumerGroup status on finalization for better error reporing (…
1441071 
…knative-extensions#3415) (#878)

This will make sure that we report finalization issues up to the
KafkaSource resource.

Signed-off-by: Pierangelo Di Pilato <[email protected]>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/eventing-kafka-broker that referenced this pull request Oct 25, 2023
@pierDipi
Update ConsumerGroup status on finalization for better error reporing (…
52aa39f 
…knative-extensions#3415)

This will make sure that we report finalization issues up to the
KafkaSource resource.

Signed-off-by: Pierangelo Di Pilato <[email protected]>
pierDipi added a commit to openshift-knative/eventing-kafka-broker that referenced this pull request Nov 2, 2023
@openshift-cherrypick-robot @pierDipi
Update ConsumerGroup status on finalization for better error reporing (…
82b28e6 
…knative-extensions#3415) (#886)

This will make sure that we report finalization issues up to the
KafkaSource resource.

Signed-off-by: Pierangelo Di Pilato <[email protected]>
Co-authored-by: Pierangelo Di Pilato <[email protected]>
@pierDipi pierDipi restored the update-cg-status-cond-on-finalization branch August 5, 2024 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@creydr creydr creydr left review comments

@Cali0707 Cali0707 Awaiting requested review from Cali0707

@odacremolbap odacremolbap Awaiting requested review from odacremolbap

Assignees

@creydr creydr

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pierDipi @creydr @knative-prow-robot