Repository: knative-sandbox/eventing-kafka-broker
Pull request #103 (2020-08-17 05:44:33)

[data-plane]: Bump protobuf.version from 3.12.4 to 3.13.0 in /data-plane
Bumps `protobuf.version` from 3.12.4 to 3.13.0.
Updates `protobuf-java` from 3.12.4 to 3.13.0
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a"><code>fde7cf7</code></a> Update protobuf version</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/07105350894bf9376129f11e0d5f879e4c6ce9cf"><code>0710535</code></a> Fix segment fault for proto3 optional (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/7805">#7805</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/2ad43bfd3d5bfd09fd9fa6b8448138495daef219"><code>2ad43bf</code></a> Fixed tests for Python 2 in python/release.sh</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/14982862f5853d76f670d672a2127ca2932937f2"><code>1498286</code></a> Removed conflicting C# version line</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/98c2e69f8c708314632cee07c4d0231443491f03"><code>98c2e69</code></a> Update protobuf version</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/5ce6232605c358a05c5f924af5c40758aa2aaa67"><code>5ce6232</code></a> No need to generate addtional has method for proto2 (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/7802">#7802</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/d4ca92962c40637abbce61d14a8675f43bafb6a9"><code>d4ca929</code></a> Port php c extension to php8 (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/7793">#7793</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/008c72146f73d784f7fd2428eaaf9de102b92ea9"><code>008c721</code></a> Add docker file for php8.0 (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/7790">#7790</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/8947701be5e82eed76b19af8c1b1e409314156d5"><code>8947701</code></a> Add docker file for php8.0</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/610bbd0b95906962bdb574eacc9f63a2d35664e8"><code>610bbd0</code></a> Fixed compile_extension.sh --release to actually enable optimization. (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/7766">#7766</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/protocolbuffers/protobuf/compare/v3.12.4...v3.13.0">compare view</a></li>
</ul>
</details>
<br />

Updates `protobuf-java-util` from 3.12.4 to 3.13.0
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a"><code>fde7cf7</code></a> Update protobuf version</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/07105350894bf9376129f11e0d5f879e4c6ce9cf"><code>0710535</code></a> Fix segment fault for proto3 optional (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/7805">#7805</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/2ad43bfd3d5bfd09fd9fa6b8448138495daef219"><code>2ad43bf</code></a> Fixed tests for Python 2 in python/release.sh</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/14982862f5853d76f670d672a2127ca2932937f2"><code>1498286</code></a> Removed conflicting C# version line</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/98c2e69f8c708314632cee07c4d0231443491f03"><code>98c2e69</code></a> Update protobuf version</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/5ce6232605c358a05c5f924af5c40758aa2aaa67"><code>5ce6232</code></a> No need to generate addtional has method for proto2 (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/7802">#7802</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/d4ca92962c40637abbce61d14a8675f43bafb6a9"><code>d4ca929</code></a> Port php c extension to php8 (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/7793">#7793</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/008c72146f73d784f7fd2428eaaf9de102b92ea9"><code>008c721</code></a> Add docker file for php8.0 (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/7790">#7790</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/8947701be5e82eed76b19af8c1b1e409314156d5"><code>8947701</code></a> Add docker file for php8.0</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/610bbd0b95906962bdb574eacc9f63a2d35664e8"><code>610bbd0</code></a> Fixed compile_extension.sh --release to actually enable optimization. (<a href="https://github-redirect.dependabot.com/protocolbuffers/protobuf/issues/7766">#7766</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/protocolbuffers/protobuf/compare/v3.12.4...v3.13.0">compare view</a></li>
</ul>
</details>
<br />


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-robot: [APPROVALNOTIFIER] This PR is **NOT APPROVED**

This pull-request has been approved by: *<a href="https://github.com/knative-sandbox/eventing-kafka-broker/pull/103#" 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 **mattmoor**
You can assign the PR to them by writing `/assign @mattmoor` 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/master/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":["mattmoor"]} -->
knative-prow-robot: 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>

pierDipi: /ok-to-test
knative-prow-robot: @dependabot[bot]: The following test **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-sandbox-eventing-kafka-broker-integration-tests | d1ae301c7bb8806a4de6681a040bb314218776a5 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka-broker/103/pull-knative-sandbox-eventing-kafka-broker-integration-tests/1295269378320764932) | `/test pull-knative-sandbox-eventing-kafka-broker-integration-tests`

[Full PR test history](https://gubernator.knative.dev/pr/knative-sandbox_eventing-kafka-broker/103). [Your PR dashboard](https://gubernator.knative.dev/pr/dependabot[bot]).

<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 -->
pierDipi: @dependabot rebase
slinkydeveloper: /approve
/lgtm
knative-prow-robot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/knative-sandbox/eventing-kafka-broker/pull/103#" title="Author self-approved">dependabot[bot]</a>*, *<a href="https://github.com/knative-sandbox/eventing-kafka-broker/pull/103#issuecomment-683637205" title="LGTM">slinkydeveloper</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/master/OWNERS)~~ [slinkydeveloper]

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":[]} -->

Patch:
diff --git a/control-plane/pkg/reconciler/broker/broker.go b/control-plane/pkg/reconciler/broker/broker.go
index b52eb15f2..0f03180d3 100644
--- a/control-plane/pkg/reconciler/broker/broker.go
+++ b/control-plane/pkg/reconciler/broker/broker.go
@@ -28,7 +28,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	corelisters "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/util/retry"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
 	"knative.dev/eventing/pkg/logging"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/reconciler"
diff --git a/control-plane/pkg/reconciler/broker/broker_lifecycle.go b/control-plane/pkg/reconciler/broker/broker_lifecycle.go
index 30ff86ed3..82c366451 100644
--- a/control-plane/pkg/reconciler/broker/broker_lifecycle.go
+++ b/control-plane/pkg/reconciler/broker/broker_lifecycle.go
@@ -21,7 +21,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
 	"knative.dev/eventing/pkg/reconciler/names"
 	"knative.dev/pkg/apis"
 	"knative.dev/pkg/reconciler"
diff --git a/control-plane/pkg/reconciler/broker/controller.go b/control-plane/pkg/reconciler/broker/controller.go
index 52c53166f..ca8e94253 100644
--- a/control-plane/pkg/reconciler/broker/controller.go
+++ b/control-plane/pkg/reconciler/broker/controller.go
@@ -24,15 +24,15 @@ import (
 	"go.uber.org/zap"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/cache"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
 	"knative.dev/eventing/pkg/logging"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
 	"knative.dev/pkg/configmap"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/resolver"
 
-	brokerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/broker"
-	brokerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/broker"
+	brokerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker"
+	brokerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/broker"
 	configmapinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/configmap"
 	podinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/pod"
 
diff --git a/control-plane/pkg/reconciler/broker/topic.go b/control-plane/pkg/reconciler/broker/topic.go
index da545d3cf..2a3438c18 100644
--- a/control-plane/pkg/reconciler/broker/topic.go
+++ b/control-plane/pkg/reconciler/broker/topic.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/Shopify/sarama"
 	"go.uber.org/zap"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
 )
 
 func (r *Reconciler) CreateTopic(logger *zap.Logger, topic string, config *Config) (string, error) {
diff --git a/control-plane/pkg/reconciler/kafka/broker_class.go b/control-plane/pkg/reconciler/kafka/broker_class.go
index 75c3ff665..312b9d700 100644
--- a/control-plane/pkg/reconciler/kafka/broker_class.go
+++ b/control-plane/pkg/reconciler/kafka/broker_class.go
@@ -19,7 +19,7 @@ package kafka
 import (
 	pkgreconciler "knative.dev/pkg/reconciler"
 
-	brokerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/broker"
+	brokerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/broker"
 )
 
 const (
diff --git a/control-plane/pkg/reconciler/trigger/controller.go b/control-plane/pkg/reconciler/trigger/controller.go
index 40be43baf..bbea60a80 100644
--- a/control-plane/pkg/reconciler/trigger/controller.go
+++ b/control-plane/pkg/reconciler/trigger/controller.go
@@ -30,12 +30,12 @@ import (
 	"knative.dev/pkg/resolver"
 
 	apiseventing "knative.dev/eventing/pkg/apis/eventing"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
 	eventingclient "knative.dev/eventing/pkg/client/injection/client"
-	brokerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/broker"
-	triggerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/trigger"
-	triggerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/trigger"
-	eventinglisters "knative.dev/eventing/pkg/client/listers/eventing/v1beta1"
+	brokerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker"
+	triggerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger"
+	triggerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger"
+	eventinglisters "knative.dev/eventing/pkg/client/listers/eventing/v1"
 
 	"knative.dev/eventing-kafka-broker/control-plane/pkg/reconciler/base"
 	"knative.dev/eventing-kafka-broker/control-plane/pkg/reconciler/broker"
diff --git a/control-plane/pkg/reconciler/trigger/trigger.go b/control-plane/pkg/reconciler/trigger/trigger.go
index e70adbc65..e1ea333c6 100644
--- a/control-plane/pkg/reconciler/trigger/trigger.go
+++ b/control-plane/pkg/reconciler/trigger/trigger.go
@@ -25,9 +25,9 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/util/retry"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
 	eventingclientset "knative.dev/eventing/pkg/client/clientset/versioned"
-	eventinglisters "knative.dev/eventing/pkg/client/listers/eventing/v1beta1"
+	eventinglisters "knative.dev/eventing/pkg/client/listers/eventing/v1"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/reconciler"
 	"knative.dev/pkg/resolver"
@@ -39,8 +39,6 @@ import (
 )
 
 const (
-	trigger = "Trigger"
-
 	noTrigger = brokerreconciler.NoBroker
 )
 
@@ -207,7 +205,7 @@ func (r *Reconciler) reconcileKind(ctx context.Context, trigger *eventing.Trigge
 	if apierrors.IsNotFound(err) {
 
 		// Actually check if the broker doesn't exist.
-		broker, err = r.EventingClient.EventingV1beta1(). // Note: do not introduce another `broker` variable with `:`
+		broker, err = r.EventingClient.EventingV1(). // Note: do not introduce another `broker` variable with `:`
 									Brokers(trigger.Namespace).
 									Get(trigger.Spec.Broker, metav1.GetOptions{})
 
diff --git a/control-plane/pkg/reconciler/trigger/trigger_lifecycle.go b/control-plane/pkg/reconciler/trigger/trigger_lifecycle.go
index 0ed40db45..9d9f96889 100644
--- a/control-plane/pkg/reconciler/trigger/trigger_lifecycle.go
+++ b/control-plane/pkg/reconciler/trigger/trigger_lifecycle.go
@@ -21,7 +21,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
 	"knative.dev/pkg/apis"
 	"knative.dev/pkg/reconciler"
 
diff --git a/data-plane/config/template/500-receiver.yaml b/data-plane/config/template/500-receiver.yaml
index 411eec468..349af00f0 100644
--- a/data-plane/config/template/500-receiver.yaml
+++ b/data-plane/config/template/500-receiver.yaml
@@ -126,5 +126,4 @@ spec:
       port: 80
       protocol: TCP
       targetPort: 8080
-  type: NodePort
 ---
diff --git a/data-plane/pom.xml b/data-plane/pom.xml
index 89eb41e51..1c0b6bb54 100644
--- a/data-plane/pom.xml
+++ b/data-plane/pom.xml
@@ -41,7 +41,7 @@
     <vertx.version>3.9.2</vertx.version>
     <cloudevents.sdk.version>2.0.0-milestone1</cloudevents.sdk.version>
     <assertj.version>3.16.1</assertj.version>
-    <protobuf.version>3.12.4</protobuf.version>
+    <protobuf.version>3.13.0</protobuf.version>
     <build.helper.maven.plugin.version>3.1.0</build.helper.maven.plugin.version>
     <ch.qos.logback.version>1.2.3</ch.qos.logback.version>
     <net.logstash.logback.encoder.version>6.4</net.logstash.logback.encoder.version>
diff --git a/vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/broker/fake/fake.go b/vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/fake/fake.go
similarity index 94%
rename from vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/broker/fake/fake.go
rename to vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/fake/fake.go
index 04658f7c8..5dc3b1c76 100644
--- a/vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/broker/fake/fake.go
+++ b/vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/fake/fake.go
@@ -21,7 +21,7 @@ package fake
 import (
 	context "context"
 
-	broker "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/broker"
+	broker "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker"
 	fake "knative.dev/eventing/pkg/client/injection/informers/factory/fake"
 	controller "knative.dev/pkg/controller"
 	injection "knative.dev/pkg/injection"
@@ -35,6 +35,6 @@ func init() {
 
 func withInformer(ctx context.Context) (context.Context, controller.Informer) {
 	f := fake.Get(ctx)
-	inf := f.Eventing().V1beta1().Brokers()
+	inf := f.Eventing().V1().Brokers()
 	return context.WithValue(ctx, broker.Key{}, inf), inf.Informer()
 }
diff --git a/vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/trigger/fake/fake.go b/vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger/fake/fake.go
similarity index 94%
rename from vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/trigger/fake/fake.go
rename to vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger/fake/fake.go
index b95e6822e..bf33f84f0 100644
--- a/vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/trigger/fake/fake.go
+++ b/vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger/fake/fake.go
@@ -21,7 +21,7 @@ package fake
 import (
 	context "context"
 
-	trigger "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/trigger"
+	trigger "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger"
 	fake "knative.dev/eventing/pkg/client/injection/informers/factory/fake"
 	controller "knative.dev/pkg/controller"
 	injection "knative.dev/pkg/injection"
@@ -35,6 +35,6 @@ func init() {
 
 func withInformer(ctx context.Context) (context.Context, controller.Informer) {
 	f := fake.Get(ctx)
-	inf := f.Eventing().V1beta1().Triggers()
+	inf := f.Eventing().V1().Triggers()
 	return context.WithValue(ctx, trigger.Key{}, inf), inf.Informer()
 }
diff --git a/vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/trigger/trigger.go b/vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger/trigger.go
similarity index 82%
rename from vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/trigger/trigger.go
rename to vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger/trigger.go
index 6d398de04..3bd2d81ed 100644
--- a/vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/trigger/trigger.go
+++ b/vendor/knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger/trigger.go
@@ -21,7 +21,7 @@ package trigger
 import (
 	context "context"
 
-	v1beta1 "knative.dev/eventing/pkg/client/informers/externalversions/eventing/v1beta1"
+	v1 "knative.dev/eventing/pkg/client/informers/externalversions/eventing/v1"
 	factory "knative.dev/eventing/pkg/client/injection/informers/factory"
 	controller "knative.dev/pkg/controller"
 	injection "knative.dev/pkg/injection"
@@ -37,16 +37,16 @@ type Key struct{}
 
 func withInformer(ctx context.Context) (context.Context, controller.Informer) {
 	f := factory.Get(ctx)
-	inf := f.Eventing().V1beta1().Triggers()
+	inf := f.Eventing().V1().Triggers()
 	return context.WithValue(ctx, Key{}, inf), inf.Informer()
 }
 
 // Get extracts the typed informer from the context.
-func Get(ctx context.Context) v1beta1.TriggerInformer {
+func Get(ctx context.Context) v1.TriggerInformer {
 	untyped := ctx.Value(Key{})
 	if untyped == nil {
 		logging.FromContext(ctx).Panic(
-			"Unable to fetch knative.dev/eventing/pkg/client/informers/externalversions/eventing/v1beta1.TriggerInformer from context.")
+			"Unable to fetch knative.dev/eventing/pkg/client/informers/externalversions/eventing/v1.TriggerInformer from context.")
 	}
-	return untyped.(v1beta1.TriggerInformer)
+	return untyped.(v1.TriggerInformer)
 }
diff --git a/vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/trigger/controller.go b/vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger/controller.go
similarity index 99%
rename from vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/trigger/controller.go
rename to vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger/controller.go
index 2a3379424..504a628cf 100644
--- a/vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/trigger/controller.go
+++ b/vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger/controller.go
@@ -33,7 +33,7 @@ import (
 	record "k8s.io/client-go/tools/record"
 	versionedscheme "knative.dev/eventing/pkg/client/clientset/versioned/scheme"
 	client "knative.dev/eventing/pkg/client/injection/client"
-	trigger "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/trigger"
+	trigger "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger"
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
 	controller "knative.dev/pkg/controller"
 	logging "knative.dev/pkg/logging"
diff --git a/vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/trigger/reconciler.go b/vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger/reconciler.go
similarity index 86%
rename from vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/trigger/reconciler.go
rename to vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger/reconciler.go
index 6d24e80a8..4876c7549 100644
--- a/vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/trigger/reconciler.go
+++ b/vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger/reconciler.go
@@ -25,7 +25,7 @@ import (
 	reflect "reflect"
 
 	zap "go.uber.org/zap"
-	v1 "k8s.io/api/core/v1"
+	corev1 "k8s.io/api/core/v1"
 	equality "k8s.io/apimachinery/pkg/api/equality"
 	errors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -33,9 +33,9 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	sets "k8s.io/apimachinery/pkg/util/sets"
 	record "k8s.io/client-go/tools/record"
-	v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	v1 "knative.dev/eventing/pkg/apis/eventing/v1"
 	versioned "knative.dev/eventing/pkg/client/clientset/versioned"
-	eventingv1beta1 "knative.dev/eventing/pkg/client/listers/eventing/v1beta1"
+	eventingv1 "knative.dev/eventing/pkg/client/listers/eventing/v1"
 	controller "knative.dev/pkg/controller"
 	kmp "knative.dev/pkg/kmp"
 	logging "knative.dev/pkg/logging"
@@ -43,50 +43,50 @@ import (
 )
 
 // Interface defines the strongly typed interfaces to be implemented by a
-// controller reconciling v1beta1.Trigger.
+// controller reconciling v1.Trigger.
 type Interface interface {
-	// ReconcileKind implements custom logic to reconcile v1beta1.Trigger. Any changes
+	// ReconcileKind implements custom logic to reconcile v1.Trigger. Any changes
 	// to the objects .Status or .Finalizers will be propagated to the stored
 	// object. It is recommended that implementors do not call any update calls
 	// for the Kind inside of ReconcileKind, it is the responsibility of the calling
 	// controller to propagate those properties. The resource passed to ReconcileKind
 	// will always have an empty deletion timestamp.
-	ReconcileKind(ctx context.Context, o *v1beta1.Trigger) reconciler.Event
+	ReconcileKind(ctx context.Context, o *v1.Trigger) reconciler.Event
 }
 
 // Finalizer defines the strongly typed interfaces to be implemented by a
-// controller finalizing v1beta1.Trigger.
+// controller finalizing v1.Trigger.
 type Finalizer interface {
-	// FinalizeKind implements custom logic to finalize v1beta1.Trigger. Any changes
+	// FinalizeKind implements custom logic to finalize v1.Trigger. Any changes
 	// to the objects .Status or .Finalizers will be ignored. Returning a nil or
 	// Normal type reconciler.Event will allow the finalizer to be deleted on
 	// the resource. The resource passed to FinalizeKind will always have a set
 	// deletion timestamp.
-	FinalizeKind(ctx context.Context, o *v1beta1.Trigger) reconciler.Event
+	FinalizeKind(ctx context.Context, o *v1.Trigger) reconciler.Event
 }
 
 // ReadOnlyInterface defines the strongly typed interfaces to be implemented by a
-// controller reconciling v1beta1.Trigger if they want to process resources for which
+// controller reconciling v1.Trigger if they want to process resources for which
 // they are not the leader.
 type ReadOnlyInterface interface {
-	// ObserveKind implements logic to observe v1beta1.Trigger.
+	// ObserveKind implements logic to observe v1.Trigger.
 	// This method should not write to the API.
-	ObserveKind(ctx context.Context, o *v1beta1.Trigger) reconciler.Event
+	ObserveKind(ctx context.Context, o *v1.Trigger) reconciler.Event
 }
 
 // ReadOnlyFinalizer defines the strongly typed interfaces to be implemented by a
-// controller finalizing v1beta1.Trigger if they want to process tombstoned resources
+// controller finalizing v1.Trigger if they want to process tombstoned resources
 // even when they are not the leader.  Due to the nature of how finalizers are handled
 // there are no guarantees that this will be called.
 type ReadOnlyFinalizer interface {
-	// ObserveFinalizeKind implements custom logic to observe the final state of v1beta1.Trigger.
+	// ObserveFinalizeKind implements custom logic to observe the final state of v1.Trigger.
 	// This method should not write to the API.
-	ObserveFinalizeKind(ctx context.Context, o *v1beta1.Trigger) reconciler.Event
+	ObserveFinalizeKind(ctx context.Context, o *v1.Trigger) reconciler.Event
 }
 
-type doReconcile func(ctx context.Context, o *v1beta1.Trigger) reconciler.Event
+type doReconcile func(ctx context.Context, o *v1.Trigger) reconciler.Event
 
-// reconcilerImpl implements controller.Reconciler for v1beta1.Trigger resources.
+// reconcilerImpl implements controller.Reconciler for v1.Trigger resources.
 type reconcilerImpl struct {
 	// LeaderAwareFuncs is inlined to help us implement reconciler.LeaderAware
 	reconciler.LeaderAwareFuncs
@@ -95,7 +95,7 @@ type reconcilerImpl struct {
 	Client versioned.Interface
 
 	// Listers index properties about resources
-	Lister eventingv1beta1.TriggerLister
+	Lister eventingv1.TriggerLister
 
 	// Recorder is an event recorder for recording Event resources to the
 	// Kubernetes API.
@@ -122,7 +122,7 @@ var _ controller.Reconciler = (*reconcilerImpl)(nil)
 // Check that our generated Reconciler is always LeaderAware.
 var _ reconciler.LeaderAware = (*reconcilerImpl)(nil)
 
-func NewReconciler(ctx context.Context, logger *zap.SugaredLogger, client versioned.Interface, lister eventingv1beta1.TriggerLister, recorder record.EventRecorder, r Interface, options ...controller.Options) controller.Reconciler {
+func NewReconciler(ctx context.Context, logger *zap.SugaredLogger, client versioned.Interface, lister eventingv1.TriggerLister, recorder record.EventRecorder, r Interface, options ...controller.Options) controller.Reconciler {
 	// Check the options function input. It should be 0 or 1.
 	if len(options) > 1 {
 		logger.Fatalf("up to one options struct is supported, found %d", len(options))
@@ -275,7 +275,7 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
 	default:
 		if err = r.updateStatus(ctx, original, resource); err != nil {
 			logger.Warnw("Failed to update resource status", zap.Error(err))
-			r.Recorder.Eventf(resource, v1.EventTypeWarning, "UpdateFailed",
+			r.Recorder.Eventf(resource, corev1.EventTypeWarning, "UpdateFailed",
 				"Failed to update status for %q: %v", resource.Name, err)
 			return err
 		}
@@ -296,20 +296,20 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
 		}
 
 		logger.Errorw("Returned an error", zap.Error(reconcileEvent))
-		r.Recorder.Event(resource, v1.EventTypeWarning, "InternalError", reconcileEvent.Error())
+		r.Recorder.Event(resource, corev1.EventTypeWarning, "InternalError", reconcileEvent.Error())
 		return reconcileEvent
 	}
 
 	return nil
 }
 
-func (r *reconcilerImpl) updateStatus(ctx context.Context, existing *v1beta1.Trigger, desired *v1beta1.Trigger) error {
+func (r *reconcilerImpl) updateStatus(ctx context.Context, existing *v1.Trigger, desired *v1.Trigger) error {
 	existing = existing.DeepCopy()
 	return reconciler.RetryUpdateConflicts(func(attempts int) (err error) {
 		// The first iteration tries to use the injectionInformer's state, subsequent attempts fetch the latest state via API.
 		if attempts > 0 {
 
-			getter := r.Client.EventingV1beta1().Triggers(desired.Namespace)
+			getter := r.Client.EventingV1().Triggers(desired.Namespace)
 
 			existing, err = getter.Get(desired.Name, metav1.GetOptions{})
 			if err != nil {
@@ -328,7 +328,7 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, existing *v1beta1.Tri
 
 		existing.Status = desired.Status
 
-		updater := r.Client.EventingV1beta1().Triggers(existing.Namespace)
+		updater := r.Client.EventingV1().Triggers(existing.Namespace)
 
 		_, err = updater.UpdateStatus(existing)
 		return err
@@ -338,7 +338,7 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, existing *v1beta1.Tri
 // updateFinalizersFiltered will update the Finalizers of the resource.
 // TODO: this method could be generic and sync all finalizers. For now it only
 // updates defaultFinalizerName or its override.
-func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.Trigger) (*v1beta1.Trigger, error) {
+func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.Trigger) (*v1.Trigger, error) {
 
 	getter := r.Lister.Triggers(resource.Namespace)
 
@@ -385,21 +385,21 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
 		return resource, err
 	}
 
-	patcher := r.Client.EventingV1beta1().Triggers(resource.Namespace)
+	patcher := r.Client.EventingV1().Triggers(resource.Namespace)
 
 	resourceName := resource.Name
 	resource, err = patcher.Patch(resourceName, types.MergePatchType, patch)
 	if err != nil {
-		r.Recorder.Eventf(resource, v1.EventTypeWarning, "FinalizerUpdateFailed",
+		r.Recorder.Eventf(resource, corev1.EventTypeWarning, "FinalizerUpdateFailed",
 			"Failed to update finalizers for %q: %v", resourceName, err)
 	} else {
-		r.Recorder.Eventf(resource, v1.EventTypeNormal, "FinalizerUpdate",
+		r.Recorder.Eventf(resource, corev1.EventTypeNormal, "FinalizerUpdate",
 			"Updated %q finalizers", resource.GetName())
 	}
 	return resource, err
 }
 
-func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *v1beta1.Trigger) (*v1beta1.Trigger, error) {
+func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *v1.Trigger) (*v1.Trigger, error) {
 	if _, ok := r.reconciler.(Finalizer); !ok {
 		return resource, nil
 	}
@@ -417,7 +417,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
 	return r.updateFinalizersFiltered(ctx, resource)
 }
 
-func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.Trigger, reconcileEvent reconciler.Event) (*v1beta1.Trigger, error) {
+func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Trigger, reconcileEvent reconciler.Event) (*v1.Trigger, error) {
 	if _, ok := r.reconciler.(Finalizer); !ok {
 		return resource, nil
 	}
@@ -430,7 +430,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.T
 	if reconcileEvent != nil {
 		var event *reconciler.ReconcilerEvent
 		if reconciler.EventAs(reconcileEvent, &event) {
-			if event.EventType == v1.EventTypeNormal {
+			if event.EventType == corev1.EventTypeNormal {
 				finalizers.Delete(r.finalizerName)
 			}
 		}
diff --git a/vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/trigger/state.go b/vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger/state.go
similarity index 95%
rename from vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/trigger/state.go
rename to vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger/state.go
index db3168cbc..89c3addda 100644
--- a/vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/trigger/state.go
+++ b/vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger/state.go
@@ -23,7 +23,7 @@ import (
 
 	types "k8s.io/apimachinery/pkg/types"
 	cache "k8s.io/client-go/tools/cache"
-	v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	v1 "knative.dev/eventing/pkg/apis/eventing/v1"
 	reconciler "knative.dev/pkg/reconciler"
 )
 
@@ -90,7 +90,7 @@ func (s *state) isNotLeaderNorObserver() bool {
 	return false
 }
 
-func (s *state) reconcileMethodFor(o *v1beta1.Trigger) (string, doReconcile) {
+func (s *state) reconcileMethodFor(o *v1.Trigger) (string, doReconcile) {
 	if o.GetDeletionTimestamp().IsZero() {
 		if s.isLeader {
 			return reconciler.DoReconcileKind, s.reconciler.ReconcileKind
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 2a4ee2cad..12ae54fef 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1113,15 +1113,15 @@ knative.dev/eventing/pkg/client/informers/externalversions/sources/v1beta1
 knative.dev/eventing/pkg/client/injection/client
 knative.dev/eventing/pkg/client/injection/client/fake
 knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker
+knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/fake
+knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger
+knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger/fake
 knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/broker
-knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/broker/fake
-knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/trigger
-knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/trigger/fake
 knative.dev/eventing/pkg/client/injection/informers/factory
 knative.dev/eventing/pkg/client/injection/informers/factory/fake
 knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/broker
+knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger
 knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/broker
-knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/trigger
 knative.dev/eventing/pkg/client/listers/configs/v1alpha1
 knative.dev/eventing/pkg/client/listers/eventing/v1
 knative.dev/eventing/pkg/client/listers/eventing/v1beta1


Test patch:
diff --git a/control-plane/pkg/reconciler/broker/broker_test.go b/control-plane/pkg/reconciler/broker/broker_test.go
index 4b85d443a..08d7949f3 100644
--- a/control-plane/pkg/reconciler/broker/broker_test.go
+++ b/control-plane/pkg/reconciler/broker/broker_test.go
@@ -31,7 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	clientgotesting "k8s.io/client-go/testing"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
 	"knative.dev/pkg/apis"
 	kubeclient "knative.dev/pkg/client/injection/kube/client/fake"
 	"knative.dev/pkg/controller"
@@ -39,10 +39,10 @@ import (
 	. "knative.dev/pkg/reconciler/testing"
 	"knative.dev/pkg/resolver"
 
-	eventingduck "knative.dev/eventing/pkg/apis/duck/v1beta1"
+	eventingduck "knative.dev/eventing/pkg/apis/duck/v1"
 	fakeeventingclient "knative.dev/eventing/pkg/client/injection/client/fake"
-	brokerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/broker"
-	reconcilertesting "knative.dev/eventing/pkg/reconciler/testing/v1beta1"
+	brokerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/broker"
+	reconcilertesting "knative.dev/eventing/pkg/reconciler/testing/v1"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 
 	coreconfig "knative.dev/eventing-kafka-broker/control-plane/pkg/core/config"
diff --git a/control-plane/pkg/reconciler/broker/controller_test.go b/control-plane/pkg/reconciler/broker/controller_test.go
index c72269d21..cd827ffbf 100644
--- a/control-plane/pkg/reconciler/broker/controller_test.go
+++ b/control-plane/pkg/reconciler/broker/controller_test.go
@@ -23,8 +23,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	fakekubeclientset "k8s.io/client-go/kubernetes/fake"
-	_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/broker/fake"
-	_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/trigger/fake"
+	_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/fake"
+	_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger/fake"
 	_ "knative.dev/pkg/client/injection/ducks/duck/v1/addressable/fake"
 	fakekubeclient "knative.dev/pkg/client/injection/kube/client/fake"
 	_ "knative.dev/pkg/client/injection/kube/informers/core/v1/configmap/fake"
diff --git a/control-plane/pkg/reconciler/broker/topic_test.go b/control-plane/pkg/reconciler/broker/topic_test.go
index c1e8d969b..51eea319e 100644
--- a/control-plane/pkg/reconciler/broker/topic_test.go
+++ b/control-plane/pkg/reconciler/broker/topic_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
 
 	"knative.dev/eventing-kafka-broker/control-plane/pkg/reconciler/broker"
 	reconcilertesting "knative.dev/eventing-kafka-broker/control-plane/pkg/reconciler/testing"
diff --git a/control-plane/pkg/reconciler/kafka/broker_class_test.go b/control-plane/pkg/reconciler/kafka/broker_class_test.go
index 013f387f5..d37da06d4 100644
--- a/control-plane/pkg/reconciler/kafka/broker_class_test.go
+++ b/control-plane/pkg/reconciler/kafka/broker_class_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
 )
 
 func TestBrokerClassFilter(t *testing.T) {
diff --git a/control-plane/pkg/reconciler/testing/listers.go b/control-plane/pkg/reconciler/testing/listers.go
index 94ea00187..e8e617c3b 100644
--- a/control-plane/pkg/reconciler/testing/listers.go
+++ b/control-plane/pkg/reconciler/testing/listers.go
@@ -23,9 +23,9 @@ import (
 	fakekubeclientset "k8s.io/client-go/kubernetes/fake"
 	corelisters "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
 	fakeeventingclientset "knative.dev/eventing/pkg/client/clientset/versioned/fake"
-	eventinglisters "knative.dev/eventing/pkg/client/listers/eventing/v1beta1"
+	eventinglisters "knative.dev/eventing/pkg/client/listers/eventing/v1"
 	"knative.dev/pkg/reconciler/testing"
 )
 
diff --git a/control-plane/pkg/reconciler/testing/objects.go b/control-plane/pkg/reconciler/testing/objects.go
index 5ff062372..8eb064bc1 100644
--- a/control-plane/pkg/reconciler/testing/objects.go
+++ b/control-plane/pkg/reconciler/testing/objects.go
@@ -27,10 +27,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	clientgotesting "k8s.io/client-go/testing"
-	eventingduck "knative.dev/eventing/pkg/apis/duck/v1beta1"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventingduck "knative.dev/eventing/pkg/apis/duck/v1"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
 	"knative.dev/eventing/pkg/reconciler/names"
-	reconcilertesting "knative.dev/eventing/pkg/reconciler/testing/v1beta1"
+	reconcilertesting "knative.dev/eventing/pkg/reconciler/testing/v1"
 	"knative.dev/pkg/apis"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 
@@ -121,14 +121,16 @@ func ReceiverPodUpdate(namespace string, annotations map[string]string) clientgo
 }
 
 func NewService() *corev1.Service {
-	return reconcilertesting.NewService(
-		serviceName,
-		serviceNamespace,
-		func(service *corev1.Service) {
-			service.APIVersion = "v1"
-			service.Kind = "Service"
+	return &corev1.Service{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Service",
+			APIVersion: "v1",
 		},
-	)
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      serviceName,
+			Namespace: serviceNamespace,
+		},
+	}
 }
 
 func NewConfigMap(configs *Configs, data []byte) runtime.Object {
diff --git a/control-plane/pkg/reconciler/trigger/controller_test.go b/control-plane/pkg/reconciler/trigger/controller_test.go
index bf5443f71..3c3c1f901 100644
--- a/control-plane/pkg/reconciler/trigger/controller_test.go
+++ b/control-plane/pkg/reconciler/trigger/controller_test.go
@@ -20,14 +20,14 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
-	brokerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/broker"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
+	brokerinformer "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker"
 	"knative.dev/pkg/configmap"
 
 	reconcilertesting "knative.dev/pkg/reconciler/testing"
 
-	_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/broker/fake"
-	_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1beta1/trigger/fake"
+	_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/broker/fake"
+	_ "knative.dev/eventing/pkg/client/injection/informers/eventing/v1/trigger/fake"
 	_ "knative.dev/pkg/client/injection/ducks/duck/v1/addressable/fake"
 	_ "knative.dev/pkg/client/injection/kube/informers/core/v1/pod/fake"
 
diff --git a/control-plane/pkg/reconciler/trigger/trigger_test.go b/control-plane/pkg/reconciler/trigger/trigger_test.go
index 2db2ec320..7953b4b8a 100644
--- a/control-plane/pkg/reconciler/trigger/trigger_test.go
+++ b/control-plane/pkg/reconciler/trigger/trigger_test.go
@@ -26,12 +26,12 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	clientgotesting "k8s.io/client-go/testing"
-	eventing "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+	eventing "knative.dev/eventing/pkg/apis/eventing/v1"
 	eventingclient "knative.dev/eventing/pkg/client/injection/client/fake"
 	fakeeventingclient "knative.dev/eventing/pkg/client/injection/client/fake"
-	triggerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/trigger"
+	triggerreconciler "knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/trigger"
 	"knative.dev/eventing/pkg/logging"
-	reconcilertesting "knative.dev/eventing/pkg/reconciler/testing/v1beta1"
+	reconcilertesting "knative.dev/eventing/pkg/reconciler/testing/v1"
 	"knative.dev/pkg/apis"
 	kubeclient "knative.dev/pkg/client/injection/kube/client/fake"
 	"knative.dev/pkg/controller"
diff --git a/test/e2e/broker_trigger_test.go b/test/e2e/broker_trigger_test.go
index 47ca71e6e..85a769e62 100644
--- a/test/e2e/broker_trigger_test.go
+++ b/test/e2e/broker_trigger_test.go
@@ -67,9 +67,9 @@ func TestBrokerTrigger(t *testing.T) {
 		nonMatchingEventId := uuid.New().String()
 		eventId := uuid.New().String()
 
-		br := client.CreateBrokerV1Beta1OrFail(
+		br := client.CreateBrokerV1OrFail(
 			brokerName,
-			resources.WithBrokerClassForBrokerV1Beta1(kafka.BrokerClass),
+			resources.WithBrokerClassForBrokerV1(kafka.BrokerClass),
 		)
 
 		eventTracker, _ := recordevents.StartEventRecordOrFail(client, subscriber)
@@ -189,10 +189,10 @@ func TestBrokerWithConfig(t *testing.T) {
 			broker.BootstrapServersConfigMapKey:              bootstrapServers,
 		})
 
-		br := client.CreateBrokerV1Beta1OrFail(
+		br := client.CreateBrokerV1OrFail(
 			brokerName,
-			resources.WithBrokerClassForBrokerV1Beta1(kafka.BrokerClass),
-			resources.WithConfigForBrokerV1Beta1(&duckv1.KReference{
+			resources.WithBrokerClassForBrokerV1(kafka.BrokerClass),
+			resources.WithConfigForBrokerV1(&duckv1.KReference{
 				Kind:       "ConfigMap",
 				Namespace:  cm.Namespace,
 				Name:       cm.Name,