这是indexloc提供的服务，不要输入任何密码
Skip to content

Revert channel parts of #1720 #1824

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
Merged
merged 1 commit into from
Feb 1, 2022
Merged

Revert channel parts of #1720 #1824

merged 1 commit into from
Feb 1, 2022

Conversation

aliok
Copy link
Member

@aliok aliok commented Jan 28, 2022 •
edited
Loading

Fixes #

Proposed Changes

Release Note

:wastebasket: Reverted the channel related changes done in https://github.com/knative-sandbox/eventing-kafka-broker/pull/1720. The reference information for metrics was not built successfully for channels.

Docs

@knative-prow-robot knative-prow-robot added area/control-plane approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 28, 2022
@knative-metrics-robot
Copy link

The following is the coverage report on the affected files.
Say /test pull-knative-sandbox-eventing-kafka-broker-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
control-plane/pkg/reconciler/channel/channel.go 69.8% 69.8% -0.0

@codecov
Copy link

codecov bot commented Jan 28, 2022 •
edited
Loading

Codecov Report

Merging #1824 (0e7abfc) into main (db70212) will decrease coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##               main    #1824      +/-   ##
============================================
- Coverage     68.79%   68.76%   -0.04%     
  Complexity      614      614              
============================================
  Files           131      131              
  Lines          5492     5477      -15     
  Branches        178      178              
============================================
- Hits           3778     3766      -12     
+ Misses         1410     1408       -2     
+ Partials        304      303       -1
Flag Coverage Δ
java-unittests 82.01% <ø> (ø)

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

Impacted Files Coverage Δ
control-plane/pkg/reconciler/channel/channel.go 61.88% <ø> (-0.12%) ⬇️
control-plane/pkg/reconciler/channel/controller.go 86.53% <ø> (-0.26%) ⬇️
...lane/pkg/reconciler/consumergroup/consumergroup.go 76.82% <0.00%> (-2.44%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update db70212...0e7abfc. Read the comment docs.

@aliok aliok mentioned this pull request Jan 28, 2022
Merged
@aliok
Copy link
Member Author

aliok commented Jan 28, 2022

/test pull-knative-sandbox-eventing-kafka-broker-integration-tests

pierDipi
pierDipi approved these changes Jan 28, 2022
View reviewed changes
Copy link
Member

@pierDipi pierDipi left a comment

Choose a reason for hiding this comment

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

@aliok can you create a PR against the 1.2 branch too?

/lgtm

@knative-prow-robot knative-prow-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 28, 2022
@knative-prow-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aliok, 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

@aliok
Copy link
Member Author

aliok commented Jan 31, 2022 •
edited
Loading

/cherrypick release-1.2

@pierDipi
Copy link
Member

/cherypick release-1.2

FYI, If you want this PR to be part of tomorrow's patch release we need a patch before we can merge this one.

@aliok aliok mentioned this pull request Jan 31, 2022
Merged
@aliok
Copy link
Member Author

aliok commented Jan 31, 2022

@pierDipi #1835

Thanks!

@aliok
Copy link
Member Author

aliok commented Feb 1, 2022

/retest

@pierDipi
Copy link
Member

pierDipi commented Feb 1, 2022

/test pull-knative-sandbox-eventing-kafka-broker-upgrade-tests

@knative-prow-robot knative-prow-robot merged commit 862e933 into knative-extensions:main Feb 1, 2022
@aliok aliok deleted the 2022-01-28-revert-metrics-changes-for-channel branch February 1, 2022 14:37
@knative-prow-robot
Copy link
Contributor

@aliok: #1824 failed to apply on top of branch "release-1.2":

Applying: Revert channel parts of #1720
Using index info to reconstruct a base tree...
M	control-plane/pkg/reconciler/channel/channel.go
M	control-plane/pkg/reconciler/channel/channel_test.go
M	control-plane/pkg/reconciler/channel/controller.go
M	control-plane/pkg/reconciler/channel/controller_test.go
A	vendor/knative.dev/eventing/pkg/client/injection/informers/messaging/v1/subscription/fake/fake.go
A	vendor/knative.dev/eventing/pkg/client/injection/informers/messaging/v1/subscription/subscription.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
CONFLICT (rename/delete): vendor/knative.dev/eventing/pkg/client/injection/informers/messaging/v1/subscription/fake/fake.go deleted in Revert channel parts of #1720 and renamed to vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/fake/fake.go in HEAD. Version HEAD of vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/fake/fake.go left in tree.
CONFLICT (rename/delete): vendor/knative.dev/eventing/pkg/client/injection/informers/messaging/v1/subscription/subscription.go deleted in Revert channel parts of #1720 and renamed to vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/broker.go in HEAD. Version HEAD of vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/broker.go left in tree.
Auto-merging control-plane/pkg/reconciler/channel/channel_test.go
Auto-merging control-plane/pkg/reconciler/channel/channel.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 Revert channel parts of #1720
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:

/cherrypick release-1.2

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.

This was referenced Feb 1, 2022
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pierDipi pierDipi pierDipi approved these changes

Assignees

@pierDipi pierDipi

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aliok @knative-metrics-robot @knative-prow-robot @pierDipi