Repository: knative-sandbox/eventing-kafka-broker
Pull request #2104 (2022-04-14 20:03:12)

[data-plane]: Bump micrometer-bom from 1.8.4 to 1.8.5 in /data-plane
Bumps [micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.8.4 to 1.8.5.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/micrometer-metrics/micrometer/releases">micrometer-bom's releases</a>.</em></p>
<blockquote>
<h2>1.8.5</h2>
<h2>:lady_beetle: Bug Fixes</h2>
<ul>
<li>TimedAspect advice return value should be marked Nullable <a href="https://github-redirect.dependabot.com/micrometer-metrics/micrometer/issues/3041">#3041</a></li>
</ul>
<h2>:heart: Contributors</h2>
<p>We'd like to thank all the contributors who worked on this release!</p>
<ul>
<li><a href="https://github.com/izeye"><code>@​izeye</code></a>, <a href="https://github.com/jprinet"><code>@​jprinet</code></a>, <a href="https://github.com/breedx-splk"><code>@​breedx-splk</code></a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/micrometer-metrics/micrometer/commit/e74b79e975d85261f069bebf18ebe90d07b9edb7"><code>e74b79e</code></a> Merge branch '1.7.x' into 1.8.x</li>
<li><a href="https://github.com/micrometer-metrics/micrometer/commit/5e6113c47465187bbc2d75a6b362b2516e7ba067"><code>5e6113c</code></a> Return value of aspect-timed method is Nullable</li>
<li><a href="https://github.com/micrometer-metrics/micrometer/commit/2f0ea459280a5f588e87aca85f371bb6d2cea5bd"><code>2f0ea45</code></a> Bump up Gradle Enterprise plugin to 3.9</li>
<li><a href="https://github.com/micrometer-metrics/micrometer/commit/df20d29d98c90c590b428a47f49fed26289ca449"><code>df20d29</code></a> Normalize Build-Date-UTC property</li>
<li><a href="https://github.com/micrometer-metrics/micrometer/commit/b087856355667abf9bf2386265edef8642e0e077"><code>b087856</code></a> Merge branch '1.7.x' into 1.8.x</li>
<li><a href="https://github.com/micrometer-metrics/micrometer/commit/81f372fe12ea7c429b8c7be6ed13a5520490aad3"><code>81f372f</code></a> migrate away from antiquated language to more inclusive terms. (<a href="https://github-redirect.dependabot.com/micrometer-metrics/micrometer/issues/3117">#3117</a>)</li>
<li><a href="https://github.com/micrometer-metrics/micrometer/commit/cc8caaeed36d112278a34ab7edabd585d8e17160"><code>cc8caae</code></a> Change max heap size for Gradle daemon to 1 GB (<a href="https://github-redirect.dependabot.com/micrometer-metrics/micrometer/issues/3114">#3114</a>)</li>
<li><a href="https://github.com/micrometer-metrics/micrometer/commit/8428bca91b9d7b87eda90f6dca75e40674796d5e"><code>8428bca</code></a> Merge branch '1.7.x' into 1.8.x</li>
<li><a href="https://github.com/micrometer-metrics/micrometer/commit/16b99bb93569c18957ef9f301d88d69052bc277b"><code>16b99bb</code></a> Upgrade to Gradle Wrapper 7.4.2 (<a href="https://github-redirect.dependabot.com/micrometer-metrics/micrometer/issues/3109">#3109</a>)</li>
<li><a href="https://github.com/micrometer-metrics/micrometer/commit/d4d68903d7a4213236efb868e4f8a77e6bebfa3b"><code>d4d6890</code></a> Merge branch '1.7.x' into 1.8.x</li>
<li>Additional commits viewable in <a href="https://github.com/micrometer-metrics/micrometer/compare/v1.8.4...v1.8.5">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=io.micrometer:micrometer-bom&package-manager=maven&previous-version=1.8.4&new-version=1.8.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

knative-prow[bot]: [APPROVALNOTIFIER] This PR is **NOT APPROVED**

This pull-request has been approved by: *<a href="https://github.com/knative-sandbox/eventing-kafka-broker/pull/2104#" title="Author self-approved">dependabot[bot]</a>*
To complete the [pull request process](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process), please assign **rhuss** after the PR has been reviewed.
You can assign the PR to them by writing `/assign @rhuss` in a comment when ready.

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=knative-sandbox%2Feventing-kafka-broker).

<details open>
Needs approval from an approver in each of these files:

- **[OWNERS](https://github.com/knative-sandbox/eventing-kafka-broker/blob/main/OWNERS)**

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":["rhuss"]} -->
knative-prow[bot]: Hi @dependabot[bot]. Thanks for your PR.

I'm waiting for a [knative-sandbox](https://github.com/orgs/knative-sandbox/people) member to verify that this patch is reasonable to test. If it is, they should reply with `/ok-to-test` on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should [join the org](https://github.com/orgs/knative-sandbox/people) to skip this step.

Once the patch is verified, the new status will be reflected by the `ok-to-test` label.

I understand the commands that are listed [here](https://go.k8s.io/bot-commands?repo=knative-sandbox%2Feventing-kafka-broker).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>

knative-prow[bot]: [APPROVALNOTIFIER] This PR is **NOT APPROVED**

This pull-request has been approved by: *<a href="https://github.com/knative-sandbox/eventing-kafka-broker/pull/2104#" title="Author self-approved">dependabot[bot]</a>*
To complete the [pull request process](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process), please ask for approval from **pierdipi** after the PR has been reviewed.

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=knative-sandbox%2Feventing-kafka-broker).

<details open>
Needs approval from an approver in each of these files:

- **[OWNERS](https://github.com/knative-sandbox/eventing-kafka-broker/blob/main/OWNERS)**

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":["pierdipi"]} -->
codecov[bot]: # [Codecov](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox) Report
> Merging [#2104](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox) (2c97f92) into [main](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/commit/25b975d0e3359cb536d7415a73a209fb9e9d9b90?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox) (25b975d) will **decrease** coverage by `5.38%`.
> The diff coverage is `n/a`.

> :exclamation: Current head 2c97f92 differs from pull request most recent head 76753b3. Consider uploading reports for the commit 76753b3 to get more accurate results

```diff
@@             Coverage Diff              @@
##               main    #2104      +/-   ##
============================================
- Coverage     66.57%   61.18%   -5.39%     
============================================
  Files           142       70      -72     
  Lines          9138     6841    -2297     
  Branches        196        0     -196     
============================================
- Hits           6084     4186    -1898     
+ Misses         2650     2356     -294     
+ Partials        404      299     -105     
```

| Flag | Coverage Δ | |
|---|---|---|
| java-unittests | `?` | |

Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#carryforward-flags-in-the-pull-request-comment) to find out more.

| [Impacted Files](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox) | Coverage Δ | |
|---|---|---|
| [...ive/eventing/kafka/broker/core/AsyncCloseable.java](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-ZGF0YS1wbGFuZS9jb3JlL3NyYy9tYWluL2phdmEvZGV2L2tuYXRpdmUvZXZlbnRpbmcva2Fma2EvYnJva2VyL2NvcmUvQXN5bmNDbG9zZWFibGUuamF2YQ==) | | |
| [...er/dispatcher/impl/consumer/InvalidCloudEvent.java](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-ZGF0YS1wbGFuZS9kaXNwYXRjaGVyL3NyYy9tYWluL2phdmEvZGV2L2tuYXRpdmUvZXZlbnRpbmcva2Fma2EvYnJva2VyL2Rpc3BhdGNoZXIvaW1wbC9jb25zdW1lci9JbnZhbGlkQ2xvdWRFdmVudC5qYXZh) | | |
| [...eceiver/impl/IngressProducerReconcilableStore.java](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-ZGF0YS1wbGFuZS9yZWNlaXZlci9zcmMvbWFpbi9qYXZhL2Rldi9rbmF0aXZlL2V2ZW50aW5nL2thZmthL2Jyb2tlci9yZWNlaXZlci9pbXBsL0luZ3Jlc3NQcm9kdWNlclJlY29uY2lsYWJsZVN0b3JlLmphdmE=) | | |
| [...her/impl/filter/subscriptionsapi/PrefixFilter.java](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-ZGF0YS1wbGFuZS9kaXNwYXRjaGVyL3NyYy9tYWluL2phdmEvZGV2L2tuYXRpdmUvZXZlbnRpbmcva2Fma2EvYnJva2VyL2Rpc3BhdGNoZXIvaW1wbC9maWx0ZXIvc3Vic2NyaXB0aW9uc2FwaS9QcmVmaXhGaWx0ZXIuamF2YQ==) | | |
| [...tive/eventing/kafka/broker/core/utils/BaseEnv.java](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-ZGF0YS1wbGFuZS9jb3JlL3NyYy9tYWluL2phdmEvZGV2L2tuYXRpdmUvZXZlbnRpbmcva2Fma2EvYnJva2VyL2NvcmUvdXRpbHMvQmFzZUVudi5qYXZh) | | |
| [...nting/kafka/broker/core/tracing/TracingConfig.java](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-ZGF0YS1wbGFuZS9jb3JlL3NyYy9tYWluL2phdmEvZGV2L2tuYXRpdmUvZXZlbnRpbmcva2Fma2EvYnJva2VyL2NvcmUvdHJhY2luZy9UcmFjaW5nQ29uZmlnLmphdmE=) | | |
| [...roker/dispatcher/impl/filter/AttributesFilter.java](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-ZGF0YS1wbGFuZS9kaXNwYXRjaGVyL3NyYy9tYWluL2phdmEvZGV2L2tuYXRpdmUvZXZlbnRpbmcva2Fma2EvYnJva2VyL2Rpc3BhdGNoZXIvaW1wbC9maWx0ZXIvQXR0cmlidXRlc0ZpbHRlci5qYXZh) | | |
| [...atcher/impl/filter/subscriptionsapi/AllFilter.java](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-ZGF0YS1wbGFuZS9kaXNwYXRjaGVyL3NyYy9tYWluL2phdmEvZGV2L2tuYXRpdmUvZXZlbnRpbmcva2Fma2EvYnJva2VyL2Rpc3BhdGNoZXIvaW1wbC9maWx0ZXIvc3Vic2NyaXB0aW9uc2FwaS9BbGxGaWx0ZXIuamF2YQ==) | | |
| [...a/broker/core/security/KubernetesAuthProvider.java](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-ZGF0YS1wbGFuZS9jb3JlL3NyYy9tYWluL2phdmEvZGV2L2tuYXRpdmUvZXZlbnRpbmcva2Fma2EvYnJva2VyL2NvcmUvc2VjdXJpdHkvS3ViZXJuZXRlc0F1dGhQcm92aWRlci5qYXZh) | | |
| [...venting/kafka/broker/receiver/IngressProducer.java](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-ZGF0YS1wbGFuZS9yZWNlaXZlci9zcmMvbWFpbi9qYXZhL2Rldi9rbmF0aXZlL2V2ZW50aW5nL2thZmthL2Jyb2tlci9yZWNlaXZlci9JbmdyZXNzUHJvZHVjZXIuamF2YQ==) | | |
| ... and [62 more](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox) | |

------

[Continue to review full report at Codecov](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox). Last update [25b975d...76753b3](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2104?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox).

knative-prow[bot]: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/knative-sandbox/eventing-kafka-broker/pull/2104#" title="Author self-approved">dependabot[bot]</a>*, *<a href="https://github.com/knative-sandbox/eventing-kafka-broker/pull/2104#pullrequestreview-945326403" title="Approved">matzew</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=knative-sandbox%2Feventing-kafka-broker).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/knative-sandbox/eventing-kafka-broker/blob/main/OWNERS)~~ [matzew]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
knative-prow[bot]: @dependabot[bot]: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
unit-tests_eventing-kafka-broker_main | 76753b3d1a0472c4d9048374697dbff2440c0717 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka-broker/2104/unit-tests_eventing-kafka-broker_main/1516340109551603712) | true | `/test unit-tests_eventing-kafka-broker_main`

[Your PR dashboard](https://prow.knative.dev/pr).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->

Patch:
diff --git a/control-plane/cmd/kafka-controller/main.go b/control-plane/cmd/kafka-controller/main.go
index 5447ae63e..5a9624445 100644
--- a/control-plane/cmd/kafka-controller/main.go
+++ b/control-plane/cmd/kafka-controller/main.go
@@ -83,7 +83,7 @@ func main() {
 		injection.NamedControllerConstructor{
 			Name: "channel-controller",
 			ControllerConstructor: func(ctx context.Context, watcher configmap.Watcher) *controller.Impl {
-				return channel.NewController(ctx, watcher, channelEnv)
+				return channel.NewController(ctx, channelEnv)
 			},
 		},
 
diff --git a/control-plane/pkg/reconciler/channel/controller.go b/control-plane/pkg/reconciler/channel/controller.go
index 95b327420..e3792d3f3 100644
--- a/control-plane/pkg/reconciler/channel/controller.go
+++ b/control-plane/pkg/reconciler/channel/controller.go
@@ -36,7 +36,6 @@ import (
 	secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret"
 	serviceinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/service"
 
-	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/logging"
 	"knative.dev/pkg/network"
@@ -47,8 +46,7 @@ import (
 	"knative.dev/eventing-kafka-broker/control-plane/pkg/reconciler/base"
 )
 
-// TODO: no need for a configmap watcher?
-func NewController(ctx context.Context, watcher configmap.Watcher, configs *config.Env) *controller.Impl {
+func NewController(ctx context.Context, configs *config.Env) *controller.Impl {
 
 	messagingv1beta.RegisterAlternateKafkaChannelConditionSet(base.IngressConditionSet)
 
diff --git a/data-plane/THIRD-PARTY.txt b/data-plane/THIRD-PARTY.txt
index a4fdfb9d3..1d7293bf3 100644
--- a/data-plane/THIRD-PARTY.txt
+++ b/data-plane/THIRD-PARTY.txt
@@ -67,8 +67,8 @@ Lists of 157 third-party dependencies.
      (Apache License, Version 2.0) Fabric8 :: Kubernetes :: Server Mock (io.fabric8:kubernetes-server-mock:5.12.2 - http://fabric8.io/kubernetes-server-mock/)
      (Apache License, Version 2.0) Fabric8 :: Mock Web Server (io.fabric8:mockwebserver:0.2.2 - http://fabric8.io/)
      (The Apache Software License, Version 2.0) zjsonpatch (io.fabric8:zjsonpatch:0.3.0 - https://github.com/fabric8io/zjsonpatch/)
-     (The Apache Software License, Version 2.0) micrometer-core (io.micrometer:micrometer-core:1.8.4 - https://github.com/micrometer-metrics/micrometer)
-     (The Apache Software License, Version 2.0) micrometer-registry-prometheus (io.micrometer:micrometer-registry-prometheus:1.8.4 - https://github.com/micrometer-metrics/micrometer)
+     (The Apache Software License, Version 2.0) micrometer-core (io.micrometer:micrometer-core:1.8.5 - https://github.com/micrometer-metrics/micrometer)
+     (The Apache Software License, Version 2.0) micrometer-registry-prometheus (io.micrometer:micrometer-registry-prometheus:1.8.5 - https://github.com/micrometer-metrics/micrometer)
      (Apache License, Version 2.0) Netty/Buffer (io.netty:netty-buffer:4.1.74.Final - https://netty.io/netty-buffer/)
      (Apache License, Version 2.0) Netty/Codec (io.netty:netty-codec:4.1.74.Final - https://netty.io/netty-codec/)
      (Apache License, Version 2.0) Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.74.Final - https://netty.io/netty-codec-dns/)
diff --git a/data-plane/pom.xml b/data-plane/pom.xml
index b6672e37e..b3dc43afa 100644
--- a/data-plane/pom.xml
+++ b/data-plane/pom.xml
@@ -43,7 +43,7 @@
     <!-- dependencies version -->
     <vertx.version>4.2.5</vertx.version>
     <cloudevents.sdk.version>2.3.0</cloudevents.sdk.version>
-    <micrometer.version>1.8.4</micrometer.version>
+    <micrometer.version>1.8.5</micrometer.version>
     <opentelemetry.version>1.13.0</opentelemetry.version>
     <jackson.version>2.13.2.20220328</jackson.version>
     <protobuf.version>3.20.0</protobuf.version>
diff --git a/go.mod b/go.mod
index 6343492bf..58e06b99e 100644
--- a/go.mod
+++ b/go.mod
@@ -23,10 +23,10 @@ require (
 	k8s.io/apiserver v0.23.4
 	k8s.io/client-go v0.23.5
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
-	knative.dev/eventing v0.30.1-0.20220411142907-e874b89d6d56
-	knative.dev/eventing-kafka v0.30.1-0.20220411133507-bdbcc864cf94
+	knative.dev/eventing v0.31.0
+	knative.dev/eventing-kafka v0.31.0
 	knative.dev/hack v0.0.0-20220411131823-6ffd8417de7c
-	knative.dev/pkg v0.0.0-20220411234407-00c122e376d0
-	knative.dev/reconciler-test v0.0.0-20220411142808-55eab02440e9
+	knative.dev/pkg v0.0.0-20220412134708-e325df66cb51
+	knative.dev/reconciler-test v0.0.0-20220412165608-994f0c3fab62
 	sigs.k8s.io/yaml v1.3.0
 )
diff --git a/go.sum b/go.sum
index 489021e91..76d2e176a 100644
--- a/go.sum
+++ b/go.sum
@@ -246,7 +246,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrp
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
 github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
@@ -282,7 +281,6 @@ github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
-github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -837,7 +835,6 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
@@ -1052,9 +1049,7 @@ golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -1358,37 +1353,28 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs=
 k8s.io/api v0.23.4/go.mod h1:i77F4JfyNNrhOjZF7OwwNJS5Y1S9dpwvb9iYRYRczfI=
 k8s.io/api v0.23.5 h1:zno3LUiMubxD/V1Zw3ijyKO3wxrhbUF1Ck+VjBvfaoA=
 k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8=
-k8s.io/apiextensions-apiserver v0.22.5/go.mod h1:tIXeZ0BrDxUb1PoAz+tgOz43Zi1Bp4BEEqVtUccMJbE=
 k8s.io/apiextensions-apiserver v0.23.4 h1:AFDUEu/yEf0YnuZhqhIFhPLPhhcQQVuR1u3WCh0rveU=
 k8s.io/apiextensions-apiserver v0.23.4/go.mod h1:TWYAKymJx7nLMxWCgWm2RYGXHrGlVZnxIlGnvtfYu+g=
 k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
 k8s.io/apimachinery v0.19.7/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q=
-k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U=
 k8s.io/apimachinery v0.23.4/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
 k8s.io/apimachinery v0.23.5 h1:Va7dwhp8wgkUPWsEXk6XglXWU4IKYLKNlv8VkX7SDM0=
 k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
-k8s.io/apiserver v0.22.5/go.mod h1:s2WbtgZAkTKt679sYtSudEQrTGWUSQAPe6MupLnlmaQ=
 k8s.io/apiserver v0.23.4 h1:zNvQlG+C/ERjuUz4p7eY/0IWHaMixRSBoxgmyIdwo9Y=
 k8s.io/apiserver v0.23.4/go.mod h1:A6l/ZcNtxGfPSqbFDoxxOjEjSKBaQmE+UTveOmMkpNc=
-k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y=
 k8s.io/client-go v0.23.4/go.mod h1:PKnIL4pqLuvYUK1WU7RLTMYKPiIh7MYShLshtRY9cj0=
 k8s.io/client-go v0.23.5 h1:zUXHmEuqx0RY4+CsnkOn5l0GU+skkRXKGJrhmE2SLd8=
 k8s.io/client-go v0.23.5/go.mod h1:flkeinTO1CirYgzMPRWxUCnV0G4Fbu2vLhYCObnt/r4=
-k8s.io/code-generator v0.22.5/go.mod h1:sbdWCOVob+KaQ5O7xs8PNNaCTpbWVqNgA6EPwLOmRNk=
 k8s.io/code-generator v0.23.4/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
 k8s.io/code-generator v0.23.5 h1:xn3a6J5pUL49AoH6SPrOFtnB5cvdMl76f/bEY176R3c=
 k8s.io/code-generator v0.23.5/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
-k8s.io/component-base v0.22.5/go.mod h1:VK3I+TjuF9eaa+Ln67dKxhGar5ynVbwnGrUiNF4MqCI=
 k8s.io/component-base v0.23.4/go.mod h1:8o3Gg8i2vnUXGPOwciiYlkSaZT+p+7gA9Scoz8y4W4E=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/gengo v0.0.0-20220307231824-4627b89bbf1b h1:vEhKDJESYfeRiaBNmRvO+/12RAo1cFeu6vGm1fBFY34=
 k8s.io/gengo v0.0.0-20220307231824-4627b89bbf1b/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
@@ -1396,53 +1382,28 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
 k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/klog/v2 v2.40.2-0.20220227211518-7ea6d6adb645/go.mod h1:N3kgBtsFxMb4nQ0eBDgbHEt/dtxBuTkSFQ+7K5OUoz4=
 k8s.io/klog/v2 v2.60.1-0.20220317184644-43cc75f9ae89 h1:bUNlsw5yb353zbKMj8srOr6V2Ajhz1VkTKonP1L8r2o=
 k8s.io/klog/v2 v2.60.1-0.20220317184644-43cc75f9ae89/go.mod h1:N3kgBtsFxMb4nQ0eBDgbHEt/dtxBuTkSFQ+7K5OUoz4=
 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
-k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4=
 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
 k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc=
 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-knative.dev/control-protocol v0.0.0-20220321133447-b92711ba8bfd/go.mod h1:ROaAETMPMmrf+vXlCYkyBaooDl1P005FopSS5XFRtog=
-knative.dev/eventing v0.30.1-0.20220322132012-a27ee9e2097c/go.mod h1:jefwGT1mmjQUnS1mvWH95mE1TtO9KbKzVelDCjE/4QU=
-knative.dev/eventing v0.30.1-0.20220411142907-e874b89d6d56 h1:AEt76KgwdxCrJmnvtQdU3mO5FVY0qWce56EpaFLJSUE=
-knative.dev/eventing v0.30.1-0.20220411142907-e874b89d6d56/go.mod h1:BGFxvInA40GsYeMBERaOjVq97kFJwubFO/A/dOdXtSg=
-knative.dev/eventing-kafka v0.30.1-0.20220411133507-bdbcc864cf94 h1:pllOCoDOhNNJx4sTaSzERdldOwsI411IrV3MQhFCltI=
-knative.dev/eventing-kafka v0.30.1-0.20220411133507-bdbcc864cf94/go.mod h1:NOLTYCYqacXsr4WJLXeYfLCi+BzGAs645tY/hIr8nCM=
-knative.dev/hack v0.0.0-20220224013837-e1785985d364/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/hack v0.0.0-20220314052818-c9c3ea17a2e9/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/hack v0.0.0-20220318020218-14f832e506f8/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/hack v0.0.0-20220328133751-f06773764ce3/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/hack v0.0.0-20220407171644-0e0784b13cef/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/hack v0.0.0-20220411013954-02c525c25eb7/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
+knative.dev/control-protocol v0.0.0-20220412172608-013cfc57d96d/go.mod h1:1lv5PHz2hL0DiqXrlEjTRUhdHAA8F5I7mIL/EsQ1W9A=
+knative.dev/eventing v0.31.0 h1:Bu1cBSwxAT1BsaexQ6PJPWc1mxx2LF/DeszvYEIytJ0=
+knative.dev/eventing v0.31.0/go.mod h1:XgJY27IxyBjmu/mz53cVlz+oMPPzzRaVXlPmWKCqEd8=
+knative.dev/eventing-kafka v0.31.0 h1:1zB6/uGyhvCjmVd0z7Wg2vxQNnhTDd9ItL+QUzr708s=
+knative.dev/eventing-kafka v0.31.0/go.mod h1:RZ/b/xO0sEPL0it4Xm0kSbrhATdsND1WVQq5AcHi7ro=
 knative.dev/hack v0.0.0-20220411131823-6ffd8417de7c h1:aXsFXeky/GccNQxwf72CS4NR3EoqTqsCVNKQnblfwr0=
 knative.dev/hack v0.0.0-20220411131823-6ffd8417de7c/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/hack/schema v0.0.0-20220314052818-c9c3ea17a2e9/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0=
-knative.dev/hack/schema v0.0.0-20220411013954-02c525c25eb7/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0=
-knative.dev/pkg v0.0.0-20220301181942-2fdd5f232e77/go.mod h1:SsH9J6Gz+CvrHmoL0TELJXmMmohqKSQ5bpJvCv+1+ZI=
-knative.dev/pkg v0.0.0-20220310195447-38af013b30ff/go.mod h1:SsH9J6Gz+CvrHmoL0TELJXmMmohqKSQ5bpJvCv+1+ZI=
-knative.dev/pkg v0.0.0-20220316002959-3a4cc56708b9/go.mod h1:3r6srDeiuiG5DXSGfIe12r2U3Tj5JeeHnQaIXPe/4Zc=
-knative.dev/pkg v0.0.0-20220318133418-7f16595277b2/go.mod h1:nKJ2L4o7or3j58eqMK843kbIM0SiYnAXXsisfEQECS8=
-knative.dev/pkg v0.0.0-20220318185521-e6e3cf03d765/go.mod h1:nKJ2L4o7or3j58eqMK843kbIM0SiYnAXXsisfEQECS8=
-knative.dev/pkg v0.0.0-20220407210145-4d62e1dbb943/go.mod h1:0A5D5tOLettuVoi5x+0SLGRfrvVemXXtLH247WupPJk=
-knative.dev/pkg v0.0.0-20220411053220-ca82d2bbb2da/go.mod h1:0A5D5tOLettuVoi5x+0SLGRfrvVemXXtLH247WupPJk=
-knative.dev/pkg v0.0.0-20220411131850-75629c8ab60e/go.mod h1:0A5D5tOLettuVoi5x+0SLGRfrvVemXXtLH247WupPJk=
-knative.dev/pkg v0.0.0-20220411234407-00c122e376d0 h1:dY5DItNU5gQGFddsxkGQvBt4Zu1cZWE7irhNV9rYHpU=
-knative.dev/pkg v0.0.0-20220411234407-00c122e376d0/go.mod h1:0A5D5tOLettuVoi5x+0SLGRfrvVemXXtLH247WupPJk=
-knative.dev/reconciler-test v0.0.0-20220303141206-84821d26ed1f/go.mod h1:K5pZJkenonlT9o+MtRaNsBP7BazGwjhqYPepuV1zdnU=
-knative.dev/reconciler-test v0.0.0-20220314160418-3b7a0d7f7b4b/go.mod h1:RX+Piu5qCWSN3ciiJCOnWDEwd9v9hawbpW73z4HgKA8=
-knative.dev/reconciler-test v0.0.0-20220321082547-afd9ca7f6603/go.mod h1:kqLx5ImxclqwC7SR1w+2pzuhqvkHMDVqDzEmbAixkII=
-knative.dev/reconciler-test v0.0.0-20220411014048-490effc323f3/go.mod h1:lpugBzYOTtwVbTS+UHDG8oCBEb6mRsBnJm7Lp/Yhcq4=
-knative.dev/reconciler-test v0.0.0-20220411142808-55eab02440e9 h1:igM2d9OHjEabeX4WP1h5Ov95Kecl1x/7c8e5ZOqZAy0=
-knative.dev/reconciler-test v0.0.0-20220411142808-55eab02440e9/go.mod h1:gH/ghOMDp7c2I2EAAhH4kYh0MI2hJ75OtiAMfeSl85o=
+knative.dev/hack/schema v0.0.0-20220411131823-6ffd8417de7c/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0=
+knative.dev/pkg v0.0.0-20220412134708-e325df66cb51 h1:4AmaxeY7+r/PYYz3HS9pMY21Mw3ykO6STLFEk2FoJ2s=
+knative.dev/pkg v0.0.0-20220412134708-e325df66cb51/go.mod h1:j2MeD8s+JoCu1vegX80GbRXV/xd20Jm1NznxBYtVXiM=
+knative.dev/reconciler-test v0.0.0-20220412165608-994f0c3fab62 h1:NAX8bVXDuTOOGH+XPLHWA/A5ZH4NvDXBgx3GytAt3vk=
+knative.dev/reconciler-test v0.0.0-20220412165608-994f0c3fab62/go.mod h1:BZai3XTZ7+A3HSwgm5cSgwS/Oc/9mOZJrAk+TtESABA=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
 modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
@@ -1453,13 +1414,11 @@ pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.27/go.mod h1:tq2nT0Kx7W+/f2JVE+zxYtUhdjuELJkVpNz+x/QN5R4=
 sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s=
 sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
diff --git a/vendor/knative.dev/eventing-kafka/pkg/common/tracing/tracing.go b/vendor/knative.dev/eventing-kafka/pkg/common/tracing/tracing.go
new file mode 100644
index 000000000..db934cc1c
--- /dev/null
+++ b/vendor/knative.dev/eventing-kafka/pkg/common/tracing/tracing.go
@@ -0,0 +1,134 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tracing
+
+import (
+	"context"
+	"net/http"
+	"strings"
+
+	"github.com/Shopify/sarama"
+	protocolkafka "github.com/cloudevents/sdk-go/protocol/kafka_sarama/v2"
+	"go.opencensus.io/plugin/ochttp/propagation/tracecontext"
+	"go.opencensus.io/trace"
+	"go.uber.org/zap"
+)
+
+const (
+	traceParentHeader = "traceparent"
+	traceStateHeader  = "tracestate"
+)
+
+var format = &tracecontext.HTTPFormat{}
+
+// SerializeTrace returns the traceparent and tracestate values from a span context as a slice
+// of sarama.RecordHeader structs that can be appended to an existing sarama.ProducerMessage
+func SerializeTrace(spanContext trace.SpanContext) []sarama.RecordHeader {
+	traceParent, traceState := format.SpanContextToHeaders(spanContext)
+
+	if traceState != "" {
+		return []sarama.RecordHeader{{
+			Key:   []byte(traceParentHeader),
+			Value: []byte(traceParent),
+		}, {
+			Key:   []byte(traceStateHeader),
+			Value: []byte(traceState),
+		}}
+	}
+
+	return []sarama.RecordHeader{{
+		Key:   []byte(traceParentHeader),
+		Value: []byte(traceParent),
+	}}
+}
+
+// StartTraceFromMessage extracts the headers from a message (traceparent and tracestate) and
+// uses them to start a span, which can be used with whatever tracing backend is set up (e.g. Zipkin)
+// in order to trace the flow of a message.  Multiple spans may be part of a single trace, for
+// example, a dead letter message or a reply should be easy to match with the original message based
+// on the trace ID.  This ID is originally set in the first message header using the SerializeTrace function.
+func StartTraceFromMessage(logger *zap.SugaredLogger, inCtx context.Context, message *protocolkafka.Message, spanName string) (context.Context, *trace.Span) {
+	sc, ok := ParseSpanContext(message.Headers)
+	if !ok {
+		logger.Warn("Cannot parse the spancontext, creating a new span")
+		return trace.StartSpan(inCtx, spanName)
+	}
+
+	return trace.StartSpanWithRemoteParent(inCtx, spanName, sc)
+}
+
+// ParseSpanContext takes the "traceparent" and "tracestate" headers and regenerates the
+// trace span context from them.  This context can then be used to start a new span
+// that uses the same trace ID as a different (but related) span.
+func ParseSpanContext(headers map[string][]byte) (sc trace.SpanContext, ok bool) {
+	traceParentBytes, ok := headers[traceParentHeader]
+	if !ok {
+		return trace.SpanContext{}, false
+	}
+	traceParent := string(traceParentBytes)
+
+	traceState := ""
+	if traceStateBytes, ok := headers[traceStateHeader]; ok {
+		traceState = string(traceStateBytes)
+	}
+
+	return format.SpanContextFromHeaders(traceParent, traceState)
+}
+
+// ConvertHttpHeaderToRecordHeaders converts the specified HTTP Header to Sarama RecordHeaders
+// It returns an array of RecordHeaders as is used in the Sarama ProducerMessage.
+// Multi-value HTTP Headers are decomposed into separate RecordHeader instances rather
+// than serializing as JSON or similar.
+func ConvertHttpHeaderToRecordHeaders(httpHeader http.Header) []sarama.RecordHeader {
+	recordHeaders := make([]sarama.RecordHeader, 0)
+	for headerKey, headerValues := range httpHeader {
+		for _, headerValue := range headerValues {
+			recordHeader := sarama.RecordHeader{
+				Key:   []byte(headerKey),
+				Value: []byte(headerValue),
+			}
+			recordHeaders = append(recordHeaders, recordHeader)
+		}
+	}
+	return recordHeaders
+}
+
+// ConvertRecordHeadersToHttpHeader converts the specified Sarama RecordHeaders to an HTTP Header.
+// It expects an array of RecordHeader pointers as is used in the Sarama ConsumerMessage.
+// Multi-value HTTP Headers are re-composed form RecordHeader instances sharing the same
+// Key rather than de-serializing JSON or similar.
+func ConvertRecordHeadersToHttpHeader(recordHeaders []*sarama.RecordHeader) http.Header {
+	httpHeader := make(http.Header)
+	for _, recordHeader := range recordHeaders {
+		if recordHeader != nil {
+			httpHeader.Add(string(recordHeader.Key), string(recordHeader.Value))
+		}
+	}
+	return httpHeader
+}
+
+// FilterCeRecordHeaders returns a new array of RecordHeader pointers including only
+// instances with non "ce_" Keys.
+func FilterCeRecordHeaders(recordHeaders []*sarama.RecordHeader) []*sarama.RecordHeader {
+	filteredRecordHeaders := make([]*sarama.RecordHeader, 0)
+	for _, recordHeader := range recordHeaders {
+		if recordHeader != nil && !strings.HasPrefix(string(recordHeader.Key), "ce_") {
+			filteredRecordHeaders = append(filteredRecordHeaders, recordHeader)
+		}
+	}
+	return filteredRecordHeaders
+}
diff --git a/vendor/knative.dev/eventing/pkg/scheduler/statefulset/scheduler.go b/vendor/knative.dev/eventing/pkg/scheduler/statefulset/scheduler.go
index 643bae00f..8f472043c 100644
--- a/vendor/knative.dev/eventing/pkg/scheduler/statefulset/scheduler.go
+++ b/vendor/knative.dev/eventing/pkg/scheduler/statefulset/scheduler.go
@@ -143,7 +143,7 @@ func (s *StatefulSetScheduler) Schedule(vpod scheduler.VPod) ([]duckv1alpha1.Pla
 		return nil, err
 	}
 	vpodFromLister := st.GetVPod(vpod.GetKey(), vpods)
-	if vpod.GetResourceVersion() != vpodFromLister.GetResourceVersion() {
+	if vpodFromLister != nil && vpod.GetResourceVersion() != vpodFromLister.GetResourceVersion() {
 		return nil, fmt.Errorf("vpod to schedule has resource version different from one in indexer")
 	}
 
@@ -682,36 +682,19 @@ func (s *StatefulSetScheduler) updateStatefulset(obj interface{}) {
 }
 
 func (s *StatefulSetScheduler) reservePlacements(vpod scheduler.VPod, placements []duckv1alpha1.Placement) {
-	existing := vpod.GetPlacements()
-
 	if len(placements) == 0 { // clear our old placements in reserved
 		s.reserved[vpod.GetKey()] = make(map[string]int32)
 	}
 
 	for _, p := range placements {
-		placed := int32(0)
-		for _, e := range existing {
-			if e.PodName == p.PodName {
-				placed = e.VReplicas
-				break
-			}
-		}
-
-		// Only record placements exceeding existing ones, since the
-		// goal is to prevent pods to be overcommitted.
-		// When less than existing ones, recording is done to help with
-		// for removal of vreps with descheduling policies
 		// note: track all vreplicas, not only the new ones since
 		// the next time `state()` is called some vreplicas might
 		// have been committed.
-		if placed != p.VReplicas {
-			if _, ok := s.reserved[vpod.GetKey()]; !ok {
-				s.reserved[vpod.GetKey()] = make(map[string]int32)
-			}
-			s.reserved[vpod.GetKey()][p.PodName] = p.VReplicas
+		if _, ok := s.reserved[vpod.GetKey()]; !ok {
+			s.reserved[vpod.GetKey()] = make(map[string]int32)
 		}
+		s.reserved[vpod.GetKey()][p.PodName] = p.VReplicas
 	}
-
 }
 
 func (s *StatefulSetScheduler) makeZeroPlacements(vpod scheduler.VPod, placements []duckv1alpha1.Placement) {
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 647b1e3e6..633e2ba22 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1150,7 +1150,7 @@ k8s.io/utils/internal/third_party/forked/golang/net
 k8s.io/utils/net
 k8s.io/utils/pointer
 k8s.io/utils/trace
-# knative.dev/eventing v0.30.1-0.20220411142907-e874b89d6d56
+# knative.dev/eventing v0.31.0
 ## explicit
 knative.dev/eventing/pkg/apis/config
 knative.dev/eventing/pkg/apis/duck
@@ -1298,7 +1298,7 @@ knative.dev/eventing/test/upgrade/prober/wathola/fetcher
 knative.dev/eventing/test/upgrade/prober/wathola/forwarder
 knative.dev/eventing/test/upgrade/prober/wathola/receiver
 knative.dev/eventing/test/upgrade/prober/wathola/sender
-# knative.dev/eventing-kafka v0.30.1-0.20220411133507-bdbcc864cf94
+# knative.dev/eventing-kafka v0.31.0
 ## explicit
 knative.dev/eventing-kafka/pkg/apis/bindings
 knative.dev/eventing-kafka/pkg/apis/bindings/v1beta1
@@ -1352,6 +1352,7 @@ knative.dev/eventing-kafka/pkg/common/config
 knative.dev/eventing-kafka/pkg/common/constants
 knative.dev/eventing-kafka/pkg/common/kafka/offset
 knative.dev/eventing-kafka/pkg/common/kafka/sarama
+knative.dev/eventing-kafka/pkg/common/tracing
 knative.dev/eventing-kafka/test
 knative.dev/eventing-kafka/test/e2e/helpers
 knative.dev/eventing-kafka/test/lib
@@ -1366,7 +1367,7 @@ knative.dev/eventing-kafka/test/upgrade/installation
 ## explicit
 knative.dev/hack
 knative.dev/hack/shell
-# knative.dev/pkg v0.0.0-20220411234407-00c122e376d0
+# knative.dev/pkg v0.0.0-20220412134708-e325df66cb51
 ## explicit
 knative.dev/pkg/apiextensions/storageversion
 knative.dev/pkg/apiextensions/storageversion/cmd/migrate
@@ -1469,7 +1470,7 @@ knative.dev/pkg/webhook/json
 knative.dev/pkg/webhook/resourcesemantics
 knative.dev/pkg/webhook/resourcesemantics/defaulting
 knative.dev/pkg/webhook/resourcesemantics/validation
-# knative.dev/reconciler-test v0.0.0-20220411142808-55eab02440e9
+# knative.dev/reconciler-test v0.0.0-20220412165608-994f0c3fab62
 ## explicit
 knative.dev/reconciler-test/cmd/eventshub
 knative.dev/reconciler-test/pkg/environment


Test patch:
diff --git a/control-plane/pkg/reconciler/channel/channel_test.go b/control-plane/pkg/reconciler/channel/channel_test.go
index e9d7045bf..4028cac26 100644
--- a/control-plane/pkg/reconciler/channel/channel_test.go
+++ b/control-plane/pkg/reconciler/channel/channel_test.go
@@ -79,15 +79,6 @@ var DefaultEnv = &config.Env{
 	DataPlaneConfigFormat:       base.Json,
 }
 
-// TODO: compare with inmemorychannel_test.go at /Users/aliok/code/github.com/knative/eventing/pkg/reconciler/inmemorychannel/controller/inmemorychannel_test.go
-// TODO: compare with channel_test.go at /Users/aliok/code/github.com/knative/eventing/pkg/reconciler/channel/channel_test.go
-// TODO: are we setting a InitialOffsetsCommitted status? we gotta set it on the subscription. 1) can we do it? 2) does it make sense?
-// TODO: test if things from channel spec is used properly?
-// TODO: test if things from subscription spec is used properly?
-// TODO: rename test cases consistently
-// TODO: fix the order of status updates
-// TODO: add tests where there are no CM updates
-
 func TestReconcileKind(t *testing.T) {
 
 	t.Setenv("SYSTEM_NAMESPACE", "knative-eventing")
@@ -200,7 +191,6 @@ func TestReconcileKind(t *testing.T) {
 						StatusConfigMapUpdatedReady(&env),
 						StatusTopicReadyWithName(ChannelTopic()),
 						StatusDataPlaneAvailable,
-						//StatusInitialOffsetsCommitted,
 						ChannelAddressable(&env),
 						StatusProbeSucceeded,
 					),
@@ -348,7 +338,6 @@ func TestReconcileKind(t *testing.T) {
 						StatusConfigMapUpdatedReady(&env),
 						StatusTopicReadyWithName(ChannelTopic()),
 						StatusDataPlaneAvailable,
-						//StatusInitialOffsetsCommitted,
 						StatusProbeFailed(prober.StatusNotReady),
 					),
 				},
@@ -417,7 +406,6 @@ func TestReconcileKind(t *testing.T) {
 						StatusConfigMapUpdatedReady(&env),
 						StatusTopicReadyWithName(ChannelTopic()),
 						StatusDataPlaneAvailable,
-						//StatusInitialOffsetsCommitted,
 						StatusProbeFailed(prober.StatusUnknown),
 					),
 				},
@@ -486,7 +474,6 @@ func TestReconcileKind(t *testing.T) {
 						StatusConfigMapUpdatedReady(&env),
 						StatusTopicReadyWithName(ChannelTopic()),
 						StatusDataPlaneAvailable,
-						//StatusInitialOffsetsCommitted,
 						WithSubscribers(Subscriber1(WithFreshSubscriber, WithNoSubscriberURI)),
 					),
 				},
@@ -563,7 +550,6 @@ func TestReconcileKind(t *testing.T) {
 						StatusConfigMapUpdatedReady(&env),
 						StatusTopicReadyWithName(ChannelTopic()),
 						StatusDataPlaneAvailable,
-						//StatusInitialOffsetsCommitted,
 						ChannelAddressable(&env),
 						WithSubscribers(Subscriber1()),
 						StatusProbeSucceeded,
@@ -637,7 +623,6 @@ func TestReconcileKind(t *testing.T) {
 						StatusConfigMapUpdatedReady(&env),
 						StatusTopicReadyWithName(ChannelTopic()),
 						StatusDataPlaneAvailable,
-						//StatusInitialOffsetsCommitted,
 						ChannelAddressable(&env),
 						WithSubscribers(Subscriber1()),
 						StatusProbeSucceeded,
@@ -711,7 +696,6 @@ func TestReconcileKind(t *testing.T) {
 						StatusConfigMapUpdatedReady(&env),
 						StatusTopicReadyWithName(ChannelTopic()),
 						StatusDataPlaneAvailable,
-						//StatusInitialOffsetsCommitted,
 						ChannelAddressable(&env),
 						WithSubscribers(Subscriber1()),
 						StatusProbeSucceeded,
@@ -794,7 +778,6 @@ func TestReconcileKind(t *testing.T) {
 						StatusConfigMapUpdatedReady(&env),
 						StatusTopicReadyWithName(ChannelTopic()),
 						StatusDataPlaneAvailable,
-						//StatusInitialOffsetsCommitted,
 						ChannelAddressable(&env),
 						WithSubscribers(Subscriber1(), Subscriber2()),
 						StatusProbeSucceeded,
@@ -1066,7 +1049,6 @@ func TestReconcileKind(t *testing.T) {
 						StatusConfigMapUpdatedReady(&env),
 						StatusTopicReadyWithName(ChannelTopic()),
 						StatusDataPlaneAvailable,
-						//StatusInitialOffsetsCommitted,
 						ChannelAddressable(&env),
 						StatusProbeSucceeded,
 					),
@@ -1150,7 +1132,6 @@ func TestReconcileKind(t *testing.T) {
 						StatusConfigMapUpdatedReady(&env),
 						StatusTopicReadyWithName(ChannelTopic()),
 						StatusDataPlaneAvailable,
-						//StatusInitialOffsetsCommitted,
 						ChannelAddressable(&env),
 						WithSubscribers(Subscriber1()),
 						StatusProbeSucceeded,
@@ -1219,7 +1200,6 @@ func TestReconcileKind(t *testing.T) {
 						StatusConfigMapUpdatedReady(&env),
 						StatusTopicReadyWithName(ChannelTopic()),
 						StatusDataPlaneAvailable,
-						//StatusInitialOffsetsCommitted,
 						ChannelAddressable(&env),
 						StatusProbeSucceeded,
 					),
@@ -1285,7 +1265,6 @@ func TestReconcileKind(t *testing.T) {
 						StatusConfigMapUpdatedReady(&env),
 						StatusTopicReadyWithName(ChannelTopic()),
 						StatusDataPlaneAvailable,
-						//StatusInitialOffsetsCommitted,
 						ChannelAddressable(&env),
 						StatusProbeSucceeded,
 					),
diff --git a/control-plane/pkg/reconciler/channel/controller_test.go b/control-plane/pkg/reconciler/channel/controller_test.go
index 1717bcf8e..f41e93c91 100644
--- a/control-plane/pkg/reconciler/channel/controller_test.go
+++ b/control-plane/pkg/reconciler/channel/controller_test.go
@@ -30,7 +30,6 @@ import (
 	_ "knative.dev/pkg/client/injection/kube/informers/core/v1/pod/fake"
 	_ "knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake"
 	_ "knative.dev/pkg/client/injection/kube/informers/core/v1/service/fake"
-	"knative.dev/pkg/configmap"
 	dynamicclient "knative.dev/pkg/injection/clients/dynamicclient/fake"
 	reconcilertesting "knative.dev/pkg/reconciler/testing"
 
@@ -62,11 +61,6 @@ func TestNewController(t *testing.T) {
 
 	controller := NewController(
 		ctx,
-		configmap.NewStaticWatcher(&corev1.ConfigMap{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: "cm",
-			},
-		}),
 		configs,
 	)
 	if controller == nil {
diff --git a/test/upgrade/continual/channel-config.toml b/test/upgrade/continual/channel-config.toml
index 99f04dcf1..b825ddcad 100644
--- a/test/upgrade/continual/channel-config.toml
+++ b/test/upgrade/continual/channel-config.toml
@@ -1,7 +1,8 @@
 # logLevel = 'DEBUG'
+tracingConfig = '{{- .TracingConfig -}}'
 [sender]
 address = '{{- .Endpoint -}}'
 interval = {{ .Config.Interval.Nanoseconds }}
 
 [forwarder]
-target = 'http://wathola-receiver.{{- .Namespace -}}.svc.cluster.local'
+target = '{{- .ForwarderTarget -}}'
diff --git a/test/upgrade/continual/kafka-broker-config.toml b/test/upgrade/continual/kafka-broker-config.toml
index 99f04dcf1..b825ddcad 100644
--- a/test/upgrade/continual/kafka-broker-config.toml
+++ b/test/upgrade/continual/kafka-broker-config.toml
@@ -1,7 +1,8 @@
 # logLevel = 'DEBUG'
+tracingConfig = '{{- .TracingConfig -}}'
 [sender]
 address = '{{- .Endpoint -}}'
 interval = {{ .Config.Interval.Nanoseconds }}
 
 [forwarder]
-target = 'http://wathola-receiver.{{- .Namespace -}}.svc.cluster.local'
+target = '{{- .ForwarderTarget -}}'
diff --git a/test/upgrade/continual/kafka-sink-source-config.toml b/test/upgrade/continual/kafka-sink-source-config.toml
index 99f04dcf1..b825ddcad 100644
--- a/test/upgrade/continual/kafka-sink-source-config.toml
+++ b/test/upgrade/continual/kafka-sink-source-config.toml
@@ -1,7 +1,8 @@
 # logLevel = 'DEBUG'
+tracingConfig = '{{- .TracingConfig -}}'
 [sender]
 address = '{{- .Endpoint -}}'
 interval = {{ .Config.Interval.Nanoseconds }}
 
 [forwarder]
-target = 'http://wathola-receiver.{{- .Namespace -}}.svc.cluster.local'
+target = '{{- .ForwarderTarget -}}'
diff --git a/third_party/eventing-kafka-latest/channel-crds.yaml b/third_party/eventing-kafka-latest/channel-crds.yaml
index 6b0be523e..fcd14e6aa 100644
--- a/third_party/eventing-kafka-latest/channel-crds.yaml
+++ b/third_party/eventing-kafka-latest/channel-crds.yaml
@@ -17,7 +17,7 @@ kind: CustomResourceDefinition
 metadata:
   name: kafkachannels.messaging.knative.dev
   labels:
-    kafka.eventing.knative.dev/release: "v20220410-66242ea65"
+    kafka.eventing.knative.dev/release: "v20220419-a62d7ca56"
     knative.dev/crd-install: "true"
     messaging.knative.dev/subscribable: "true"
     duck.knative.dev/addressable: "true"
diff --git a/third_party/eventing-kafka-latest/source-crd.yaml b/third_party/eventing-kafka-latest/source-crd.yaml
index 1836b7dd4..a124ad7d6 100644
--- a/third_party/eventing-kafka-latest/source-crd.yaml
+++ b/third_party/eventing-kafka-latest/source-crd.yaml
@@ -16,7 +16,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    kafka.eventing.knative.dev/release: "v20220410-66242ea65"
+    kafka.eventing.knative.dev/release: "v20220419-a62d7ca56"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     knative.dev/crd-install: "true"
diff --git a/third_party/eventing-latest/eventing-core.yaml b/third_party/eventing-latest/eventing-core.yaml
index c29c6e016..39b6441a3 100644
--- a/third_party/eventing-latest/eventing-core.yaml
+++ b/third_party/eventing-latest/eventing-core.yaml
@@ -16,8 +16,8 @@ kind: Namespace
 metadata:
   name: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 
 ---
@@ -41,8 +41,8 @@ metadata:
   name: eventing-controller
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -50,8 +50,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-controller
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -67,8 +67,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-controller-resolver
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -84,8 +84,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-controller-source-observer
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -101,8 +101,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-controller-sources-controller
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -118,8 +118,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-controller-manipulator
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -151,8 +151,8 @@ metadata:
   name: pingsource-mt-adapter
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -160,8 +160,8 @@ kind: ClusterRoleBinding
 metadata:
   name: knative-eventing-pingsource-mt-adapter
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -193,8 +193,8 @@ metadata:
   name: eventing-webhook
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -202,8 +202,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-webhook
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -220,8 +220,8 @@ metadata:
   namespace: knative-eventing
   name: eventing-webhook
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -237,8 +237,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-webhook-resolver
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -254,8 +254,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-webhook-podspecable-binding
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -287,8 +287,8 @@ metadata:
   name: config-br-default-channel
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 data:
   channel-template-spec: |
@@ -316,8 +316,8 @@ metadata:
   name: config-br-defaults
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 data:
   # Configures the default for any Broker that does not specify a spec.config or Broker class.
@@ -354,8 +354,8 @@ metadata:
   name: default-ch-webhook
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 data:
   # Configuration for defaulting channels that do not specify CRD implementations.
@@ -389,10 +389,10 @@ metadata:
   name: config-ping-defaults
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
   annotations:
     knative.dev/example-checksum: "9185c153"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 data:
   _example: |
@@ -436,10 +436,10 @@ metadata:
   name: config-features
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/config-propagation: original
     knative.dev/config-category: eventing
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 data:
   # ALPHA feature: The kreference-group allows you to use the Group field in KReferences.
@@ -483,7 +483,7 @@ metadata:
   name: config-kreference-mapping
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/config-propagation: original
     knative.dev/config-category: eventing
   annotations:
@@ -532,8 +532,8 @@ metadata:
   name: config-leader-election
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
   annotations:
     knative.dev/example-checksum: "f7948630"
@@ -594,10 +594,10 @@ metadata:
   name: config-logging
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/config-propagation: original
     knative.dev/config-category: eventing
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 data:
   # Common configuration for all Knative codebase
@@ -648,10 +648,10 @@ metadata:
   name: config-observability
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/config-propagation: original
     knative.dev/config-category: eventing
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
   annotations:
     knative.dev/example-checksum: "f46cf09d"
@@ -725,8 +725,8 @@ metadata:
   name: config-sugar
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
   annotations:
     knative.dev/example-checksum: "b05e6e70"
@@ -783,10 +783,10 @@ metadata:
   name: config-tracing
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/config-propagation: original
     knative.dev/config-category: eventing
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
   annotations:
     knative.dev/example-checksum: "0492ceb0"
@@ -841,10 +841,10 @@ metadata:
   name: eventing-controller
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/high-availability: "true"
     app.kubernetes.io/component: eventing-controller
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   selector:
@@ -854,9 +854,9 @@ spec:
     metadata:
       labels:
         app: eventing-controller
-        eventing.knative.dev/release: "v20220411-bb76b30d7"
+        eventing.knative.dev/release: "v20220417-ff55a456c"
         app.kubernetes.io/component: eventing-controller
-        app.kubernetes.io/version: "20220411-bb76b30d7"
+        app.kubernetes.io/version: "20220417-ff55a456c"
         app.kubernetes.io/name: knative-eventing
     spec:
       # To avoid node becoming SPOF, spread our replicas to different nodes.
@@ -874,7 +874,7 @@ spec:
       containers:
         - name: eventing-controller
           terminationMessagePolicy: FallbackToLogsOnError
-          image: gcr.io/knative-nightly/knative.dev/eventing/cmd/controller@sha256:7e6f15136dce08f7fc41ead412b6bf8715b732033e799aee9017b27891357e90
+          image: gcr.io/knative-nightly/knative.dev/eventing/cmd/controller@sha256:36e9394df5ef29f7e687351972178a80ecb35d6a6a0ca750e4d15ab3d988d582
           resources:
             requests:
               cpu: 100m
@@ -892,7 +892,7 @@ spec:
               value: knative.dev/eventing
             # APIServerSource
             - name: APISERVER_RA_IMAGE
-              value: gcr.io/knative-nightly/knative.dev/eventing/cmd/apiserver_receive_adapter@sha256:c2e16ce4b21b96ce4174af2b8bf43e2284a07a5f0c2aa5d22a32756ec4d2416f
+              value: gcr.io/knative-nightly/knative.dev/eventing/cmd/apiserver_receive_adapter@sha256:8a537d4a7100be9f46a36d601672b43aada1a77cd5b696b7bcb340d0512e82e5
             - name: POD_NAME
               valueFrom:
                 fieldRef:
@@ -941,9 +941,9 @@ metadata:
   name: pingsource-mt-adapter
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     app.kubernetes.io/component: pingsource-mt-adapter
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   # when set to 0 (and only 0) will be set to 1 when the first PingSource is created.
@@ -956,9 +956,9 @@ spec:
     metadata:
       labels:
         !!merge <<: *labels
-        eventing.knative.dev/release: "v20220411-bb76b30d7"
+        eventing.knative.dev/release: "v20220417-ff55a456c"
         app.kubernetes.io/component: pingsource-mt-adapter
-        app.kubernetes.io/version: "20220411-bb76b30d7"
+        app.kubernetes.io/version: "20220417-ff55a456c"
         app.kubernetes.io/name: knative-eventing
     spec:
       affinity:
@@ -972,7 +972,7 @@ spec:
       enableServiceLinks: false
       containers:
         - name: dispatcher
-          image: gcr.io/knative-nightly/knative.dev/eventing/cmd/mtping@sha256:0369e4d7f81e1838af9c142d2f0d54407fdb7eeab5d5b0244ee1c953d3c840d8
+          image: gcr.io/knative-nightly/knative.dev/eventing/cmd/mtping@sha256:7f8c163ccd4097649889e78bb3f2d11fa55be70fd078280a1cdc455513155118
           env:
             - name: SYSTEM_NAMESPACE
               value: ''
@@ -1037,9 +1037,9 @@ metadata:
   name: eventing-webhook
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     app.kubernetes.io/component: eventing-webhook
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   scaleTargetRef:
@@ -1063,9 +1063,9 @@ metadata:
   name: eventing-webhook
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     app.kubernetes.io/component: eventing-webhook
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   minAvailable: 80%
@@ -1094,9 +1094,9 @@ metadata:
   name: eventing-webhook
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     app.kubernetes.io/component: eventing-webhook
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   selector:
@@ -1107,9 +1107,9 @@ spec:
     metadata:
       labels:
         !!merge <<: *labels
-        eventing.knative.dev/release: "v20220411-bb76b30d7"
+        eventing.knative.dev/release: "v20220417-ff55a456c"
         app.kubernetes.io/component: eventing-webhook
-        app.kubernetes.io/version: "20220411-bb76b30d7"
+        app.kubernetes.io/version: "20220417-ff55a456c"
         app.kubernetes.io/name: knative-eventing
     spec:
       # To avoid node becoming SPOF, spread our replicas to different nodes.
@@ -1129,7 +1129,7 @@ spec:
           terminationMessagePolicy: FallbackToLogsOnError
           # This is the Go import path for the binary that is containerized
           # and substituted here.
-          image: gcr.io/knative-nightly/knative.dev/eventing/cmd/webhook@sha256:07212b9b9dcfe564a62e7fa0cd750a662633d28d980f1de193edf4844d918b3a
+          image: gcr.io/knative-nightly/knative.dev/eventing/cmd/webhook@sha256:1ebfcaa22aa055d42e8402c2f2819ef9261b301026f52f88ac49abe4b37bd75b
           resources:
             requests:
               # taken from serving.
@@ -1198,10 +1198,10 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     role: eventing-webhook
     app.kubernetes.io/component: eventing-webhook
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
   name: eventing-webhook
   namespace: knative-eventing
@@ -1233,11 +1233,11 @@ kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
   annotations:
     # TODO add schemas and descriptions
@@ -1449,10 +1449,10 @@ kind: CustomResourceDefinition
 metadata:
   name: brokers.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: eventing.knative.dev
@@ -1616,11 +1616,11 @@ kind: CustomResourceDefinition
 metadata:
   name: channels.messaging.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
     messaging.knative.dev/subscribable: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: messaging.knative.dev
@@ -1891,11 +1891,11 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
   name: containersources.sources.knative.dev
 spec:
@@ -2045,9 +2045,9 @@ kind: CustomResourceDefinition
 metadata:
   name: eventtypes.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: eventing.knative.dev
@@ -2174,10 +2174,10 @@ kind: CustomResourceDefinition
 metadata:
   name: parallels.flows.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: flows.knative.dev
@@ -2429,11 +2429,11 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
   annotations:
     # TODO add schemas and descriptions
@@ -2620,10 +2620,10 @@ kind: CustomResourceDefinition
 metadata:
   name: sequences.flows.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: flows.knative.dev
@@ -2940,12 +2940,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     duck.knative.dev/binding: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
   name: sinkbindings.sources.knative.dev
 spec:
@@ -3132,9 +3132,9 @@ kind: CustomResourceDefinition
 metadata:
   name: subscriptions.messaging.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: messaging.knative.dev
@@ -3344,9 +3344,9 @@ kind: CustomResourceDefinition
 metadata:
   name: triggers.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: eventing.knative.dev
@@ -3530,8 +3530,8 @@ kind: ClusterRole
 metadata:
   name: addressable-resolver
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 aggregationRule:
   clusterRoleSelectors:
@@ -3544,9 +3544,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: service-addressable-resolver
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 # Do not use this role directly. These rules will be added to the "addressable-resolver" role.
 rules:
@@ -3564,9 +3564,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: serving-addressable-resolver
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 # Do not use this role directly. These rules will be added to the "addressable-resolver" role.
 rules:
@@ -3587,9 +3587,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: channel-addressable-resolver
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 # Do not use this role directly. These rules will be added to the "addressable-resolver" role.
 rules:
@@ -3614,9 +3614,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: broker-addressable-resolver
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 # Do not use this role directly. These rules will be added to the "addressable-resolver" role.
 rules:
@@ -3635,9 +3635,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: flows-addressable-resolver
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 # Do not use this role directly. These rules will be added to the "addressable-resolver" role.
 rules:
@@ -3673,8 +3673,8 @@ kind: ClusterRole
 metadata:
   name: eventing-broker-filter
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   - apiGroups:
@@ -3700,8 +3700,8 @@ kind: ClusterRole
 metadata:
   name: eventing-broker-ingress
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   - apiGroups:
@@ -3718,8 +3718,8 @@ kind: ClusterRole
 metadata:
   name: eventing-config-reader
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   - apiGroups:
@@ -3752,8 +3752,8 @@ kind: ClusterRole
 metadata:
   name: channelable-manipulator
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 aggregationRule:
   clusterRoleSelectors:
@@ -3766,9 +3766,9 @@ kind: ClusterRole
 metadata:
   name: meta-channelable-manipulator
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     duck.knative.dev/channelable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 # Do not use this role directly. These rules will be added to the "channelable-manipulator" role.
 rules:
@@ -3806,9 +3806,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: knative-eventing-namespaced-admin
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   - apiGroups: ["eventing.knative.dev"]
@@ -3820,9 +3820,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: knative-messaging-namespaced-admin
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   - apiGroups: ["messaging.knative.dev"]
@@ -3834,9 +3834,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: knative-flows-namespaced-admin
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   - apiGroups: ["flows.knative.dev"]
@@ -3848,9 +3848,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: knative-sources-namespaced-admin
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   - apiGroups: ["sources.knative.dev"]
@@ -3862,9 +3862,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: knative-bindings-namespaced-admin
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   - apiGroups: ["bindings.knative.dev"]
@@ -3877,8 +3877,8 @@ metadata:
   name: knative-eventing-namespaced-edit
   labels:
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   - apiGroups: ["eventing.knative.dev", "messaging.knative.dev", "sources.knative.dev", "flows.knative.dev", "bindings.knative.dev"]
@@ -3891,8 +3891,8 @@ metadata:
   name: knative-eventing-namespaced-view
   labels:
     rbac.authorization.k8s.io/aggregate-to-view: "true"
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   - apiGroups: ["eventing.knative.dev", "messaging.knative.dev", "sources.knative.dev", "flows.knative.dev", "bindings.knative.dev"]
@@ -3919,8 +3919,8 @@ kind: ClusterRole
 metadata:
   name: knative-eventing-controller
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   - apiGroups:
@@ -4055,8 +4055,8 @@ kind: ClusterRole
 metadata:
   name: knative-eventing-pingsource-mt-adapter
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   - apiGroups:
@@ -4123,8 +4123,8 @@ kind: ClusterRole
 metadata:
   name: podspecable-binding
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 aggregationRule:
   clusterRoleSelectors:
@@ -4137,9 +4137,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: builtin-podspecable-binding
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     duck.knative.dev/podspecable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 # Do not use this role directly. These rules will be added to the "podspecable-binding role.
 rules:
@@ -4185,8 +4185,8 @@ kind: ClusterRole
 metadata:
   name: source-observer
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 aggregationRule:
   clusterRoleSelectors:
@@ -4199,9 +4199,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: eventing-sources-source-observer
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     duck.knative.dev/source: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 # Do not use this role directly. These rules will be added to the "source-observer" role.
 rules:
@@ -4237,8 +4237,8 @@ kind: ClusterRole
 metadata:
   name: knative-eventing-sources-controller
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   - apiGroups:
@@ -4324,8 +4324,8 @@ kind: ClusterRole
 metadata:
   name: knative-eventing-webhook
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   # For watching logging configuration and getting certs.
@@ -4424,8 +4424,8 @@ metadata:
   namespace: knative-eventing
   name: knative-eventing-webhook
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 rules:
   # For manipulating certs into secrets.
@@ -4461,8 +4461,8 @@ kind: ValidatingWebhookConfiguration
 metadata:
   name: config.webhook.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 webhooks:
   - admissionReviewVersions: ["v1", "v1beta1"]
@@ -4499,8 +4499,8 @@ kind: MutatingWebhookConfiguration
 metadata:
   name: webhook.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 webhooks:
   - admissionReviewVersions: ["v1", "v1beta1"]
@@ -4533,8 +4533,8 @@ kind: ValidatingWebhookConfiguration
 metadata:
   name: validation.webhook.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 webhooks:
   - admissionReviewVersions: ["v1", "v1beta1"]
@@ -4568,8 +4568,8 @@ metadata:
   name: eventing-webhook-certs
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 # The data is populated at install time.
 
@@ -4593,8 +4593,8 @@ kind: MutatingWebhookConfiguration
 metadata:
   name: sinkbindings.webhook.sources.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 webhooks:
   - admissionReviewVersions: ["v1", "v1beta1"]
diff --git a/third_party/eventing-latest/eventing-crds.yaml b/third_party/eventing-latest/eventing-crds.yaml
index 90fe36982..acb979ee5 100644
--- a/third_party/eventing-latest/eventing-crds.yaml
+++ b/third_party/eventing-latest/eventing-crds.yaml
@@ -17,11 +17,11 @@ kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
   annotations:
     # TODO add schemas and descriptions
@@ -233,10 +233,10 @@ kind: CustomResourceDefinition
 metadata:
   name: brokers.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: eventing.knative.dev
@@ -400,11 +400,11 @@ kind: CustomResourceDefinition
 metadata:
   name: channels.messaging.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
     messaging.knative.dev/subscribable: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: messaging.knative.dev
@@ -675,11 +675,11 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
   name: containersources.sources.knative.dev
 spec:
@@ -829,9 +829,9 @@ kind: CustomResourceDefinition
 metadata:
   name: eventtypes.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: eventing.knative.dev
@@ -958,10 +958,10 @@ kind: CustomResourceDefinition
 metadata:
   name: parallels.flows.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: flows.knative.dev
@@ -1213,11 +1213,11 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
   annotations:
     # TODO add schemas and descriptions
@@ -1404,10 +1404,10 @@ kind: CustomResourceDefinition
 metadata:
   name: sequences.flows.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: flows.knative.dev
@@ -1724,12 +1724,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     duck.knative.dev/binding: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
   name: sinkbindings.sources.knative.dev
 spec:
@@ -1916,9 +1916,9 @@ kind: CustomResourceDefinition
 metadata:
   name: subscriptions.messaging.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: messaging.knative.dev
@@ -2128,9 +2128,9 @@ kind: CustomResourceDefinition
 metadata:
   name: triggers.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20220411-bb76b30d7"
+    eventing.knative.dev/release: "v20220417-ff55a456c"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20220411-bb76b30d7"
+    app.kubernetes.io/version: "20220417-ff55a456c"
     app.kubernetes.io/name: knative-eventing
 spec:
   group: eventing.knative.dev
diff --git a/vendor/knative.dev/eventing-kafka/test/upgrade/continual/channel-config.toml b/vendor/knative.dev/eventing-kafka/test/upgrade/continual/channel-config.toml
index 99f04dcf1..b825ddcad 100644
--- a/vendor/knative.dev/eventing-kafka/test/upgrade/continual/channel-config.toml
+++ b/vendor/knative.dev/eventing-kafka/test/upgrade/continual/channel-config.toml
@@ -1,7 +1,8 @@
 # logLevel = 'DEBUG'
+tracingConfig = '{{- .TracingConfig -}}'
 [sender]
 address = '{{- .Endpoint -}}'
 interval = {{ .Config.Interval.Nanoseconds }}
 
 [forwarder]
-target = 'http://wathola-receiver.{{- .Namespace -}}.svc.cluster.local'
+target = '{{- .ForwarderTarget -}}'
diff --git a/vendor/knative.dev/eventing-kafka/test/upgrade/continual/kafkasender.go b/vendor/knative.dev/eventing-kafka/test/upgrade/continual/kafkasender.go
index 2f0f30398..1b8044645 100644
--- a/vendor/knative.dev/eventing-kafka/test/upgrade/continual/kafkasender.go
+++ b/vendor/knative.dev/eventing-kafka/test/upgrade/continual/kafkasender.go
@@ -26,8 +26,10 @@ import (
 	protocolkafka "github.com/cloudevents/sdk-go/protocol/kafka_sarama/v2"
 	cloudevents "github.com/cloudevents/sdk-go/v2"
 	"github.com/cloudevents/sdk-go/v2/binding"
+	"go.opencensus.io/trace"
 	"go.uber.org/zap"
 	"knative.dev/eventing-kafka/pkg/common/client"
+	"knative.dev/eventing-kafka/pkg/common/tracing"
 	"knative.dev/eventing/test/upgrade/prober/wathola/sender"
 )
 
@@ -47,7 +49,7 @@ var (
 
 // CreateKafkaSender will create a wathola sender that sends events to Kafka
 // topic directly.
-func CreateKafkaSender(ctx context.Context, log *zap.SugaredLogger) sender.EventSender {
+func CreateKafkaSender(ctx context.Context, log *zap.SugaredLogger) sender.EventSenderWithContext {
 	return &kafkaSender{
 		ctx: ctx,
 		log: log,
@@ -64,14 +66,17 @@ func (k *kafkaSender) Supports(endpoint interface{}) bool {
 	}
 }
 
-func (k *kafkaSender) SendEvent(ce cloudevents.Event, rawEndpoint interface{}) error {
+func (k *kafkaSender) SendEventWithContext(ctx context.Context, ce cloudevents.Event, rawEndpoint interface{}) error {
 	endpoint, err := castAsTopicEndpoint(rawEndpoint)
 	if err != nil {
 		// this should never happen, as Supports func should be called first.
 		return err
 	}
+	clientID := "continualtests-kafka-sender"
+	kafkaSenderCtx, span := trace.StartSpan(ctx, clientID+"-"+endpoint.TopicName)
+	defer span.End()
 	conf, err := client.NewConfigBuilder().
-		WithClientId("continualtests-kafka-sender").
+		WithClientId(clientID).
 		WithDefaults().
 		Build(k.ctx)
 	// Prevent excessive wait time.
@@ -92,6 +97,7 @@ func (k *kafkaSender) SendEvent(ce cloudevents.Event, rawEndpoint interface{}) e
 	if err != nil {
 		return fmt.Errorf("%w: %v", ErrCantSend, err)
 	}
+	kafkaProducerMessage.Headers = append(kafkaProducerMessage.Headers, tracing.SerializeTrace(trace.FromContext(kafkaSenderCtx).SpanContext())...)
 	part, offset, err := producer.SendMessage(kafkaProducerMessage)
 	if err != nil {
 		return fmt.Errorf("%w: %v", ErrCantSend, err)
diff --git a/vendor/knative.dev/eventing-kafka/test/upgrade/continual/source-config.toml b/vendor/knative.dev/eventing-kafka/test/upgrade/continual/source-config.toml
index 0276bcd10..d5315489b 100644
--- a/vendor/knative.dev/eventing-kafka/test/upgrade/continual/source-config.toml
+++ b/vendor/knative.dev/eventing-kafka/test/upgrade/continual/source-config.toml
@@ -1,4 +1,5 @@
 # logLevel = 'DEBUG'
+tracingConfig = '{{- .TracingConfig -}}'
 [sender]
 interval = {{ .Config.Interval.Nanoseconds }}
   [sender.address]
@@ -6,4 +7,4 @@ interval = {{ .Config.Interval.Nanoseconds }}
     topicName = '{{- .Endpoint.TopicName -}}'
 
 [forwarder]
-target = 'http://wathola-receiver.{{- .Namespace -}}.svc.cluster.local'
+target = '{{- .ForwarderTarget -}}'
diff --git a/vendor/knative.dev/eventing-kafka/test/upgrade/installation/eventing_core.go b/vendor/knative.dev/eventing-kafka/test/upgrade/installation/eventing_core.go
index 274d16861..4bd0da305 100644
--- a/vendor/knative.dev/eventing-kafka/test/upgrade/installation/eventing_core.go
+++ b/vendor/knative.dev/eventing-kafka/test/upgrade/installation/eventing_core.go
@@ -22,5 +22,6 @@ import pkgupgrade "knative.dev/pkg/test/upgrade"
 func EventingCore() pkgupgrade.Operation {
 	return pkgupgrade.NewOperation("EventingCore", func(c pkgupgrade.Context) {
 		runShellFunc("start_latest_knative_eventing", c)
+		runShellFunc("install_zipkin", c)
 	})
 }
diff --git a/vendor/knative.dev/eventing-kafka/test/upgrade/test_main.go b/vendor/knative.dev/eventing-kafka/test/upgrade/test_main.go
index 00adb0c6c..c0636ef50 100644
--- a/vendor/knative.dev/eventing-kafka/test/upgrade/test_main.go
+++ b/vendor/knative.dev/eventing-kafka/test/upgrade/test_main.go
@@ -17,6 +17,7 @@ limitations under the License.
 package upgrade
 
 import (
+	"log"
 	"os"
 	"testing"
 
@@ -25,6 +26,7 @@ import (
 	eventingTest "knative.dev/eventing/test"
 	testlib "knative.dev/eventing/test/lib"
 	"knative.dev/pkg/system"
+	"knative.dev/pkg/test/zipkin"
 )
 
 var (
@@ -46,7 +48,10 @@ func RunMainTest(m *testing.M) {
 	}
 	os.Exit(func() int {
 		defer testlib.ExportLogs(testlib.SystemLogsDir, system.Namespace())
-
+		// Any tests may SetupZipkinTracing, it will only actually be done once. This should be the ONLY
+		// place that cleans it up. If an individual test calls this instead, then it will break other
+		// tests that need the tracing in place.
+		defer zipkin.CleanupZipkinTracingSetup(log.Printf)
 		return m.Run()
 	}())
 }
diff --git a/vendor/knative.dev/eventing/test/e2e-common.sh b/vendor/knative.dev/eventing/test/e2e-common.sh
index 2d794cd47..b3e96560b 100644
--- a/vendor/knative.dev/eventing/test/e2e-common.sh
+++ b/vendor/knative.dev/eventing/test/e2e-common.sh
@@ -246,17 +246,16 @@ function unleash_duck() {
 # Teardown the Knative environment after tests finish.
 function knative_teardown() {
   echo ">> Stopping Knative Eventing"
-  echo "Uninstalling Knative Eventing"
-  ko delete --ignore-not-found=true --now --timeout 60s -f ${EVENTING_CONFIG}
-  wait_until_object_does_not_exist namespaces ${SYSTEM_NAMESPACE}
-
-  echo ">> Uninstalling dependencies"
-  for i in ${!UNINSTALL_LIST[@]}; do
+  for i in "${!UNINSTALL_LIST[@]}"; do
     # We uninstall elements in the reverse of the order they were installed.
     local YAML="${UNINSTALL_LIST[$(( ${#array[@]} - $i ))]}"
     echo ">> Bringing down YAML: ${YAML}"
     kubectl delete --ignore-not-found=true -f "${YAML}" || return 1
   done
+  kubectl delete --ignore-not-found=true namespace "${SYSTEM_NAMESPACE}"
+  wait_until_object_does_not_exist namespaces "${SYSTEM_NAMESPACE}"
+  kubectl delete --ignore-not-found=true namespace 'knative-monitoring'
+  wait_until_object_does_not_exist namespaces 'knative-monitoring'
 }
 
 # Add function call to trap
diff --git a/vendor/knative.dev/eventing/test/upgrade/prober/verify.go b/vendor/knative.dev/eventing/test/upgrade/prober/verify.go
index 20e5302a0..75cb41e76 100644
--- a/vendor/knative.dev/eventing/test/upgrade/prober/verify.go
+++ b/vendor/knative.dev/eventing/test/upgrade/prober/verify.go
@@ -47,6 +47,7 @@ const (
 	jobWaitInterval     = time.Second
 	jobWaitTimeout      = 10 * time.Minute
 	stepEventMsgPattern = "event #([0-9]+).*"
+	exportTraceLimit    = 1000
 )
 
 // Verify will verify prober state after finished has been sent.
@@ -60,7 +61,6 @@ func (p *prober) Verify() (eventErrs []error, eventsSent int) {
 		// Required for proper cleanup.
 		zipkin.ZipkinTracingEnabled = true
 	}
-	defer zipkin.CleanupZipkinTracingSetup(p.log.Infof)
 	p.log.Info("Waiting for complete report from receiver...")
 	start := time.Now()
 	if err := wait.PollImmediate(jobWaitInterval, jobWaitTimeout, func() (bool, error) {
@@ -81,8 +81,11 @@ func (p *prober) Verify() (eventErrs []error, eventsSent int) {
 		elapsed, report.EventsSent, report.State)
 	p.log.Infof("Availability: %.3f%%, Requests sent: %d.",
 		availRate, report.TotalRequests)
-	for _, t := range report.Thrown.Missing {
+	for i, t := range report.Thrown.Missing {
 		eventErrs = append(eventErrs, errors.New(t))
+		if i > exportTraceLimit {
+			continue
+		}
 		stepNo := p.getStepNoFromMsg(t)
 		if err := p.exportTrace(p.getTraceForStepEvent(stepNo), fmt.Sprintf("step-%s.json", stepNo)); err != nil {
 			p.log.Warnf("Failed to export trace for Step event #%s: %v", stepNo, err)
@@ -94,12 +97,15 @@ func (p *prober) Verify() (eventErrs []error, eventsSent int) {
 	for _, t := range report.Thrown.Unavailable {
 		eventErrs = append(eventErrs, errors.New(t))
 	}
-	for _, t := range report.Thrown.Duplicated {
+	for i, t := range report.Thrown.Duplicated {
 		if p.config.OnDuplicate == Warn {
 			p.log.Warn("Duplicate events: ", t)
 		} else if p.config.OnDuplicate == Error {
 			eventErrs = append(eventErrs, errors.New(t))
 		}
+		if i > exportTraceLimit {
+			continue
+		}
 		stepNo := p.getStepNoFromMsg(t)
 		if err := p.exportTrace(p.getTraceForStepEvent(stepNo), fmt.Sprintf("step-%s.json", stepNo)); err != nil {
 			p.log.Warnf("Failed to export trace for Step event #%s: %v", stepNo, err)