[release-v1.14] Prevent generation only updates (#3915)

[pierDipi]

Cherry-pick of knative-extensions@483904b

[pierDipi]

/cc @mgencur @maschmid @creydr

[creydr]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

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

• OWNERS [creydr,pierDipi]

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

[pierDipi]

/retest

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD beba7b0 and 2 for PR HEAD a082da4 in total

[pierDipi]

/retest

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 6544de7 and 1 for PR HEAD a082da4 in total

[pierDipi]

/cherry-pick release-1.12

[pierDipi]

/cherry-pick release-v1.12

[openshift-cherrypick-robot]

@pierDipi: cannot checkout release-1.12: error checking out "release-1.12": exit status 1 error: pathspec 'release-1.12' did not match any file(s) known to git

In response to this:

/cherry-pick release-1.12

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.

[openshift-cherrypick-robot]

@pierDipi: #1102 failed to apply on top of branch "release-v1.12":

Applying: Prevent generation only updates (#3915)
Using index info to reconstruct a base tree...
M	control-plane/pkg/reconciler/broker/broker.go
M	control-plane/pkg/reconciler/channel/channel.go
M	control-plane/pkg/reconciler/channel/v2/channelv2.go
M	control-plane/pkg/reconciler/consumer/consumer.go
M	control-plane/pkg/reconciler/sink/kafka_sink.go
M	control-plane/pkg/reconciler/trigger/trigger.go
M	control-plane/pkg/reconciler/trigger/trigger_test.go
Falling back to patching base and 3-way merge...
Auto-merging control-plane/pkg/reconciler/trigger/trigger_test.go
Auto-merging control-plane/pkg/reconciler/trigger/trigger.go
Auto-merging control-plane/pkg/reconciler/sink/kafka_sink.go
Auto-merging control-plane/pkg/reconciler/consumer/consumer.go
Auto-merging control-plane/pkg/reconciler/channel/v2/channelv2.go
CONFLICT (content): Merge conflict in control-plane/pkg/reconciler/channel/v2/channelv2.go
Auto-merging control-plane/pkg/reconciler/channel/channel.go
CONFLICT (content): Merge conflict in control-plane/pkg/reconciler/channel/channel.go
Auto-merging control-plane/pkg/reconciler/broker/broker.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 Prevent generation only updates (#3915)
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-v1.12

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.