Repository: knative-sandbox/eventing-kafka-broker
Pull request #1346 (2021-10-19 11:05:11)

[Automated] Update eventing-kafka-broker-eventing nightly
/assign @knative/delivery-wg-leads
/cc @knative/delivery-wg-leads

Produced via:
```shell
for x in eventing-crds.yaml eventing-core.yaml; do
  curl https://storage.googleapis.com/knative-nightly/eventing/latest/$x > ${GITHUB_WORKSPACE}/./third_party/eventing-latest/$x
done
```

Details:
```

```


Patch:
diff --git a/control-plane/pkg/reconciler/base/reconciler.go b/control-plane/pkg/reconciler/base/reconciler.go
index 397c925a2..7b9e4ba42 100644
--- a/control-plane/pkg/reconciler/base/reconciler.go
+++ b/control-plane/pkg/reconciler/base/reconciler.go
@@ -28,11 +28,13 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
 	corelisters "k8s.io/client-go/listers/core/v1"
 	"knative.dev/pkg/tracker"
 
 	"knative.dev/eventing-kafka-broker/control-plane/pkg/contract"
+	coreconfig "knative.dev/eventing-kafka-broker/control-plane/pkg/core/config"
 	"knative.dev/eventing-kafka-broker/control-plane/pkg/security"
 )
 
@@ -308,3 +310,22 @@ func (r *Reconciler) OnDeleteObserver(obj interface{}) {
 		r.SecretTracker.OnDeletedObserver(obj)
 	}
 }
+
+func (r *Reconciler) DeleteResource(ctx context.Context, logger *zap.Logger, uuid types.UID, ct *contract.Contract, contractConfigMap *corev1.ConfigMap) error {
+	resourceIndex := coreconfig.FindResource(ct, uuid)
+	if resourceIndex != coreconfig.NoResource {
+		coreconfig.DeleteResource(ct, resourceIndex)
+
+		logger.Debug("Resource deleted", zap.Int("index", resourceIndex))
+
+		// Resource changed, increment contract generation.
+		coreconfig.IncrementContractGeneration(ct)
+
+		// Update the configuration map with the new contract data.
+		if err := r.UpdateDataPlaneConfigMap(ctx, ct, contractConfigMap); err != nil {
+			return err
+		}
+		logger.Debug("Contract config map updated")
+	}
+	return nil
+}
diff --git a/control-plane/pkg/reconciler/broker/broker.go b/control-plane/pkg/reconciler/broker/broker.go
index 645ccab6a..7886d6c50 100644
--- a/control-plane/pkg/reconciler/broker/broker.go
+++ b/control-plane/pkg/reconciler/broker/broker.go
@@ -239,20 +239,8 @@ func (r *Reconciler) finalizeKind(ctx context.Context, broker *eventing.Broker)
 
 	logger.Debug("Got contract data from config map", zap.Any(base.ContractLogKey, ct))
 
-	brokerIndex := coreconfig.FindResource(ct, broker.UID)
-	if brokerIndex != coreconfig.NoResource {
-		coreconfig.DeleteResource(ct, brokerIndex)
-
-		logger.Debug("Broker deleted", zap.Int("index", brokerIndex))
-
-		// Resource changed, increment contract generation.
-		coreconfig.IncrementContractGeneration(ct)
-
-		// Update the configuration map with the new contract data.
-		if err := r.UpdateDataPlaneConfigMap(ctx, ct, contractConfigMap); err != nil {
-			return err
-		}
-		logger.Debug("Contract config map updated")
+	if err := r.DeleteResource(ctx, logger, broker.GetUID(), ct, contractConfigMap); err != nil {
+		return err
 	}
 
 	// We update receiver and dispatcher pods annotation regardless of our contract changed or not due to the fact
diff --git a/control-plane/pkg/reconciler/sink/kafka_sink.go b/control-plane/pkg/reconciler/sink/kafka_sink.go
index 49b4a2a0c..c9a5cecb0 100644
--- a/control-plane/pkg/reconciler/sink/kafka_sink.go
+++ b/control-plane/pkg/reconciler/sink/kafka_sink.go
@@ -238,21 +238,8 @@ func (r *Reconciler) finalizeKind(ctx context.Context, ks *eventing.KafkaSink) e
 		zap.Any("contract", ct),
 	)
 
-	sinkIndex := coreconfig.FindResource(ct, ks.UID)
-	if sinkIndex != coreconfig.NoResource {
-		coreconfig.DeleteResource(ct, sinkIndex)
-
-		logger.Debug("Sink deleted", zap.Int("index", sinkIndex))
-
-		// Resource changed, increment contract generation.
-		coreconfig.IncrementContractGeneration(ct)
-
-		// Update the configuration map with the new contract data.
-		if err := r.UpdateDataPlaneConfigMap(ctx, ct, contractConfigMap); err != nil {
-			return err
-		}
-
-		logger.Debug("Sinks config map updated")
+	if err := r.DeleteResource(ctx, logger, ks.GetUID(), ct, contractConfigMap); err != nil {
+		return err
 	}
 
 	// We update receiver pods annotation regardless of our contract changed or not due to the fact  that in a previous
diff --git a/control-plane/pkg/reconciler/source/source.go b/control-plane/pkg/reconciler/source/source.go
index 3e53775b8..520127feb 100644
--- a/control-plane/pkg/reconciler/source/source.go
+++ b/control-plane/pkg/reconciler/source/source.go
@@ -24,6 +24,7 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/proto"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/client-go/util/retry"
 	sources "knative.dev/eventing-kafka/pkg/apis/sources/v1beta1"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/reconciler"
@@ -63,6 +64,12 @@ type Reconciler struct {
 }
 
 func (r *Reconciler) ReconcileKind(ctx context.Context, ks *sources.KafkaSource) reconciler.Event {
+	return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
+		return r.reconcileKind(ctx, ks)
+	})
+}
+
+func (r *Reconciler) reconcileKind(ctx context.Context, ks *sources.KafkaSource) reconciler.Event {
 
 	logger := kafkalogging.CreateReconcileMethodLogger(ctx, ks)
 
@@ -170,6 +177,48 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ks *sources.KafkaSource)
 	return statusConditionManager.Reconciled()
 }
 
+func (r *Reconciler) FinalizeKind(ctx context.Context, ks *sources.KafkaSource) reconciler.Event {
+	return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
+		return r.finalizeKind(ctx, ks)
+	})
+}
+
+func (r *Reconciler) finalizeKind(ctx context.Context, ks *sources.KafkaSource) reconciler.Event {
+	logger := kafkalogging.CreateFinalizeMethodLogger(ctx, ks)
+
+	// Get contract config map.
+	contractConfigMap, err := r.GetOrCreateDataPlaneConfigMap(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get contract config map %s: %w", r.Env.DataPlaneConfigMapAsString(), err)
+	}
+
+	logger.Debug("Got contract config map")
+
+	// Get contract data.
+	ct, err := r.GetDataPlaneConfigMapData(logger, contractConfigMap)
+	if err != nil {
+		return fmt.Errorf("failed to get contract: %w", err)
+	}
+
+	logger.Debug("Got contract data from config map", zap.Any(base.ContractLogKey, ct))
+
+	if err := r.DeleteResource(ctx, logger, ks.GetUID(), ct, contractConfigMap); err != nil {
+		return err
+	}
+
+	// We update dispatcher pods annotation regardless of our contract changed or not due to the fact
+	// that in a previous reconciliation we might have failed to update one of our data plane pod annotation, so we want
+	// to update anyway remaining annotations with the contract generation that was saved in the CM.
+	// Note: if there aren't changes to be done at the pod annotation level, we just skip the update.
+
+	// Update volume generation annotation of dispatcher pods
+	if err := r.UpdateDispatcherPodsAnnotation(ctx, logger, ct.Generation); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (r *Reconciler) reconcileKafkaSourceResource(ctx context.Context, ks *sources.KafkaSource, secret *corev1.Secret) (*contract.Resource, error) {
 	destination, err := r.Resolver.URIFromDestinationV1(ctx, ks.Spec.Sink, ks)
 	if err != nil {
diff --git a/data-plane/THIRD-PARTY.txt b/data-plane/THIRD-PARTY.txt
index 05c6106a3..2b8fd536a 100644
--- a/data-plane/THIRD-PARTY.txt
+++ b/data-plane/THIRD-PARTY.txt
@@ -43,46 +43,46 @@ Lists of 153 third-party dependencies.
      (The Apache Software License, Version 2.0) cloudevents-sql (io.cloudevents:cloudevents-sql:2.2.0 - https://cloudevents.github.io/sdk-java/cloudevents-sql/)
      (Apache Software License 2.0) Debezium API (io.debezium:debezium-api:1.7.0.Final - https://debezium.io/debezium-parent/debezium-api)
      (Apache Software License 2.0) Debezium Core (io.debezium:debezium-core:1.7.0.Final - https://debezium.io/debezium-parent/debezium-core)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes :: Java Client (io.fabric8:kubernetes-client:5.7.3 - http://fabric8.io/kubernetes-client/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Admission Registration, Authentication and Authorization (io.fabric8:kubernetes-model-admissionregistration:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-admissionregistration/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: API Extensions (io.fabric8:kubernetes-model-apiextensions:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-apiextensions/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Apps (io.fabric8:kubernetes-model-apps:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-apps/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Autoscaling (io.fabric8:kubernetes-model-autoscaling:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-autoscaling/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Batch (io.fabric8:kubernetes-model-batch:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-batch/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Certificates (io.fabric8:kubernetes-model-certificates:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-certificates/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Common (io.fabric8:kubernetes-model-common:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-common/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Coordination (io.fabric8:kubernetes-model-coordination:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-coordination/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Core (io.fabric8:kubernetes-model-core:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-core/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Discovery (io.fabric8:kubernetes-model-discovery:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-discovery/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Events (io.fabric8:kubernetes-model-events:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-events/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Extensions (io.fabric8:kubernetes-model-extensions:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-extensions/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: FlowControl (io.fabric8:kubernetes-model-flowcontrol:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-flowcontrol/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Metrics (io.fabric8:kubernetes-model-metrics:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-metrics/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Networking (io.fabric8:kubernetes-model-networking:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-networking/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Node (io.fabric8:kubernetes-model-node:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-node/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Policy (io.fabric8:kubernetes-model-policy:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-policy/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: RBAC (io.fabric8:kubernetes-model-rbac:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-rbac/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Scheduling (io.fabric8:kubernetes-model-scheduling:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-scheduling/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Storage Class (io.fabric8:kubernetes-model-storageclass:5.7.3 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-storageclass/)
-     (Apache License, Version 2.0) Fabric8 :: Kubernetes :: Server Mock (io.fabric8:kubernetes-server-mock:5.7.3 - http://fabric8.io/kubernetes-server-mock/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes :: Java Client (io.fabric8:kubernetes-client:5.9.0 - http://fabric8.io/kubernetes-client/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Admission Registration, Authentication and Authorization (io.fabric8:kubernetes-model-admissionregistration:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-admissionregistration/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: API Extensions (io.fabric8:kubernetes-model-apiextensions:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-apiextensions/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Apps (io.fabric8:kubernetes-model-apps:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-apps/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Autoscaling (io.fabric8:kubernetes-model-autoscaling:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-autoscaling/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Batch (io.fabric8:kubernetes-model-batch:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-batch/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Certificates (io.fabric8:kubernetes-model-certificates:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-certificates/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Common (io.fabric8:kubernetes-model-common:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-common/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Coordination (io.fabric8:kubernetes-model-coordination:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-coordination/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Core (io.fabric8:kubernetes-model-core:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-core/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Discovery (io.fabric8:kubernetes-model-discovery:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-discovery/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Events (io.fabric8:kubernetes-model-events:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-events/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Extensions (io.fabric8:kubernetes-model-extensions:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-extensions/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: FlowControl (io.fabric8:kubernetes-model-flowcontrol:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-flowcontrol/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Metrics (io.fabric8:kubernetes-model-metrics:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-metrics/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Networking (io.fabric8:kubernetes-model-networking:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-networking/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Node (io.fabric8:kubernetes-model-node:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-node/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Policy (io.fabric8:kubernetes-model-policy:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-policy/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: RBAC (io.fabric8:kubernetes-model-rbac:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-rbac/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Scheduling (io.fabric8:kubernetes-model-scheduling:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-scheduling/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Storage Class (io.fabric8:kubernetes-model-storageclass:5.9.0 - http://fabric8.io/kubernetes-model-generator/kubernetes-model-storageclass/)
+     (Apache License, Version 2.0) Fabric8 :: Kubernetes :: Server Mock (io.fabric8:kubernetes-server-mock:5.9.0 - http://fabric8.io/kubernetes-server-mock/)
      (Apache License, Version 2.0) Fabric8 :: Mock Web Server (io.fabric8:mockwebserver:0.1.8 - 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.7.5 - https://github.com/micrometer-metrics/micrometer)
      (The Apache Software License, Version 2.0) micrometer-registry-prometheus (io.micrometer:micrometer-registry-prometheus:1.7.5 - https://github.com/micrometer-metrics/micrometer)
-     (Apache License, Version 2.0) Netty/Buffer (io.netty:netty-buffer:4.1.67.Final - https://netty.io/netty-buffer/)
-     (Apache License, Version 2.0) Netty/Codec (io.netty:netty-codec:4.1.67.Final - https://netty.io/netty-codec/)
-     (Apache License, Version 2.0) Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.67.Final - https://netty.io/netty-codec-dns/)
-     (Apache License, Version 2.0) Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.67.Final - https://netty.io/netty-codec-http/)
-     (Apache License, Version 2.0) Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.67.Final - https://netty.io/netty-codec-http2/)
-     (Apache License, Version 2.0) Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.67.Final - https://netty.io/netty-codec-socks/)
-     (Apache License, Version 2.0) Netty/Common (io.netty:netty-common:4.1.67.Final - https://netty.io/netty-common/)
-     (Apache License, Version 2.0) Netty/Handler (io.netty:netty-handler:4.1.67.Final - https://netty.io/netty-handler/)
-     (Apache License, Version 2.0) Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.67.Final - https://netty.io/netty-handler-proxy/)
-     (Apache License, Version 2.0) Netty/Resolver (io.netty:netty-resolver:4.1.67.Final - https://netty.io/netty-resolver/)
-     (Apache License, Version 2.0) Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.67.Final - https://netty.io/netty-resolver-dns/)
-     (Apache License, Version 2.0) Netty/Transport (io.netty:netty-transport:4.1.67.Final - https://netty.io/netty-transport/)
-     (Apache License, Version 2.0) Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.67.Final - https://netty.io/netty-transport-native-epoll/)
-     (Apache License, Version 2.0) Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.67.Final - https://netty.io/netty-transport-native-unix-common/)
+     (Apache License, Version 2.0) Netty/Buffer (io.netty:netty-buffer:4.1.68.Final - https://netty.io/netty-buffer/)
+     (Apache License, Version 2.0) Netty/Codec (io.netty:netty-codec:4.1.68.Final - https://netty.io/netty-codec/)
+     (Apache License, Version 2.0) Netty/Codec/DNS (io.netty:netty-codec-dns:4.1.68.Final - https://netty.io/netty-codec-dns/)
+     (Apache License, Version 2.0) Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.68.Final - https://netty.io/netty-codec-http/)
+     (Apache License, Version 2.0) Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.68.Final - https://netty.io/netty-codec-http2/)
+     (Apache License, Version 2.0) Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.68.Final - https://netty.io/netty-codec-socks/)
+     (Apache License, Version 2.0) Netty/Common (io.netty:netty-common:4.1.68.Final - https://netty.io/netty-common/)
+     (Apache License, Version 2.0) Netty/Handler (io.netty:netty-handler:4.1.68.Final - https://netty.io/netty-handler/)
+     (Apache License, Version 2.0) Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.68.Final - https://netty.io/netty-handler-proxy/)
+     (Apache License, Version 2.0) Netty/Resolver (io.netty:netty-resolver:4.1.68.Final - https://netty.io/netty-resolver/)
+     (Apache License, Version 2.0) Netty/Resolver/DNS (io.netty:netty-resolver-dns:4.1.68.Final - https://netty.io/netty-resolver-dns/)
+     (Apache License, Version 2.0) Netty/Transport (io.netty:netty-transport:4.1.68.Final - https://netty.io/netty-transport/)
+     (Apache License, Version 2.0) Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.68.Final - https://netty.io/netty-transport-native-epoll/)
+     (Apache License, Version 2.0) Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.68.Final - https://netty.io/netty-transport-native-unix-common/)
      (The Apache License, Version 2.0) OpenTelemetry Java (io.opentelemetry:opentelemetry-api:1.7.0 - https://github.com/open-telemetry/opentelemetry-java)
      (The Apache License, Version 2.0) OpenTelemetry Java (io.opentelemetry:opentelemetry-api-metrics:1.7.0-alpha - https://github.com/open-telemetry/opentelemetry-java)
      (The Apache License, Version 2.0) OpenTelemetry Java (io.opentelemetry:opentelemetry-context:1.7.0 - https://github.com/open-telemetry/opentelemetry-java)
@@ -96,15 +96,15 @@ Lists of 153 third-party dependencies.
      (The Apache License, Version 2.0) OpenTelemetry Java (io.opentelemetry:opentelemetry-semconv:1.7.0-alpha - https://github.com/open-telemetry/opentelemetry-java)
      (The Apache Software License, Version 2.0) Prometheus Java Simpleclient (io.prometheus:simpleclient:0.10.0 - http://github.com/prometheus/client_java/simpleclient)
      (The Apache Software License, Version 2.0) Prometheus Java Simpleclient Common (io.prometheus:simpleclient_common:0.10.0 - http://github.com/prometheus/client_java/simpleclient_common)
-     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) vertx-auth-common (io.vertx:vertx-auth-common:4.1.4 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-auth/vertx-auth-common)
-     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) vertx-circuit-breaker (io.vertx:vertx-circuit-breaker:4.1.4 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-circuit-breaker)
-     (Eclipse Public License - v 2.0) (The Apache Software License, Version 2.0) Vert.x Core (io.vertx:vertx-core:4.1.4 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-core)
-     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) Vert.x JUnit 5 support :: Core (io.vertx:vertx-junit5:4.1.4 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-junit5)
-     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) Vert.x Kafka Client (io.vertx:vertx-kafka-client:4.1.4 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-kafka-client)
-     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) Vert.x metrics implementation for Micrometer.io (io.vertx:vertx-micrometer-metrics:4.1.4 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-micrometer-metrics)
-     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) Vert.x OpenTelemetry (io.vertx:vertx-opentelemetry:4.1.4 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-tracing-parent/vertx-opentelemetry)
-     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) vertx-web-client (io.vertx:vertx-web-client:4.1.4 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-web-parent/vertx-web-client)
-     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) vertx-web-common (io.vertx:vertx-web-common:4.1.4 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-web-parent/vertx-web-common)
+     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) vertx-auth-common (io.vertx:vertx-auth-common:4.1.5 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-auth/vertx-auth-common)
+     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) vertx-circuit-breaker (io.vertx:vertx-circuit-breaker:4.1.5 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-circuit-breaker)
+     (Eclipse Public License - v 2.0) (The Apache Software License, Version 2.0) Vert.x Core (io.vertx:vertx-core:4.1.5 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-core)
+     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) Vert.x JUnit 5 support :: Core (io.vertx:vertx-junit5:4.1.5 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-junit5)
+     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) Vert.x Kafka Client (io.vertx:vertx-kafka-client:4.1.5 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-kafka-client)
+     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) Vert.x metrics implementation for Micrometer.io (io.vertx:vertx-micrometer-metrics:4.1.5 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-micrometer-metrics)
+     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) Vert.x OpenTelemetry (io.vertx:vertx-opentelemetry:4.1.5 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-tracing-parent/vertx-opentelemetry)
+     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) vertx-web-client (io.vertx:vertx-web-client:4.1.5 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-web-parent/vertx-web-client)
+     (Eclipse Public License - v 1.0) (The Apache Software License, Version 2.0) vertx-web-common (io.vertx:vertx-web-common:4.1.5 - http://nexus.sonatype.org/oss-repository-hosting.html/vertx-parent/vertx-ext/vertx-ext-parent/vertx-web-parent/vertx-web-common)
      (The Apache Software License, Version 2.0) Zipkin Reporter: Core (io.zipkin.reporter2:zipkin-reporter:2.16.3 - https://github.com/openzipkin/zipkin-reporter-java/zipkin-reporter)
      (The Apache Software License, Version 2.0) Zipkin Sender: OkHttp 3 (io.zipkin.reporter2:zipkin-sender-okhttp3:2.16.3 - https://github.com/openzipkin/zipkin-reporter-java/zipkin-sender-okhttp3)
      (The Apache Software License, Version 2.0) Zipkin Core Library (io.zipkin.zipkin2:zipkin:2.23.2 - https://github.com/openzipkin/zipkin/zipkin)
@@ -124,19 +124,19 @@ Lists of 153 third-party dependencies.
      (Apache License, Version 2.0) Apache Yetus - Audience Annotations (org.apache.yetus:audience-annotations:0.5.0 - https://yetus.apache.org/audience-annotations)
      (Apache License, Version 2.0) Apache ZooKeeper - Server (org.apache.zookeeper:zookeeper:3.5.9 - http://zookeeper.apache.org/zookeeper)
      (Apache License, Version 2.0) Apache ZooKeeper - Jute (org.apache.zookeeper:zookeeper-jute:3.5.9 - http://zookeeper.apache.org/zookeeper-jute)
-     (The Apache License, Version 2.0) org.apiguardian:apiguardian-api (org.apiguardian:apiguardian-api:1.1.0 - https://github.com/apiguardian-team/apiguardian)
+     (The Apache License, Version 2.0) org.apiguardian:apiguardian-api (org.apiguardian:apiguardian-api:1.1.2 - https://github.com/apiguardian-team/apiguardian)
      (Apache License, Version 2.0) AssertJ fluent assertions (org.assertj:assertj-core:3.21.0 - https://assertj.github.io/doc/assertj-core/)
      (Apache 2.0) Awaitility (org.awaitility:awaitility:4.1.0 - http://awaitility.org)
      (GNU General Public License, version 2 (GPL2), with the classpath exception) (The MIT License) Checker Qual (org.checkerframework:checker-compat-qual:2.5.5 - https://checkerframework.org)
      (BSD Licence 3) Hamcrest (org.hamcrest:hamcrest:2.1 - http://hamcrest.org/JavaHamcrest/)
      (New BSD License) Hamcrest Core (org.hamcrest:hamcrest-core:1.3 - https://github.com/hamcrest/JavaHamcrest/hamcrest-core)
      (BSD-2-Clause) (Public Domain, per Creative Commons CC0) HdrHistogram (org.hdrhistogram:HdrHistogram:2.1.12 - http://hdrhistogram.github.io/HdrHistogram/)
-     (Eclipse Public License v2.0) JUnit Jupiter (Aggregator) (org.junit.jupiter:junit-jupiter:5.7.2 - https://junit.org/junit5/)
-     (Eclipse Public License v2.0) JUnit Jupiter API (org.junit.jupiter:junit-jupiter-api:5.7.2 - https://junit.org/junit5/)
-     (Eclipse Public License v2.0) JUnit Jupiter Engine (org.junit.jupiter:junit-jupiter-engine:5.7.2 - https://junit.org/junit5/)
-     (Eclipse Public License v2.0) JUnit Jupiter Params (org.junit.jupiter:junit-jupiter-params:5.7.2 - https://junit.org/junit5/)
-     (Eclipse Public License v2.0) JUnit Platform Commons (org.junit.platform:junit-platform-commons:1.7.2 - https://junit.org/junit5/)
-     (Eclipse Public License v2.0) JUnit Platform Engine API (org.junit.platform:junit-platform-engine:1.7.2 - https://junit.org/junit5/)
+     (Eclipse Public License v2.0) JUnit Jupiter (Aggregator) (org.junit.jupiter:junit-jupiter:5.8.1 - https://junit.org/junit5/)
+     (Eclipse Public License v2.0) JUnit Jupiter API (org.junit.jupiter:junit-jupiter-api:5.8.1 - https://junit.org/junit5/)
+     (Eclipse Public License v2.0) JUnit Jupiter Engine (org.junit.jupiter:junit-jupiter-engine:5.8.1 - https://junit.org/junit5/)
+     (Eclipse Public License v2.0) JUnit Jupiter Params (org.junit.jupiter:junit-jupiter-params:5.8.1 - https://junit.org/junit5/)
+     (Eclipse Public License v2.0) JUnit Platform Commons (org.junit.platform:junit-platform-commons:1.8.1 - https://junit.org/junit5/)
+     (Eclipse Public License v2.0) JUnit Platform Engine API (org.junit.platform:junit-platform-engine:1.8.1 - https://junit.org/junit5/)
      (Public Domain, per Creative Commons CC0) LatencyUtils (org.latencyutils:LatencyUtils:2.0.3 - http://latencyutils.github.io/LatencyUtils/)
      (The Apache Software License, Version 2.0) LZ4 and xxHash (org.lz4:lz4-java:1.7.1 - https://github.com/lz4/lz4-java)
      (The MIT License) mockito-core (org.mockito:mockito-core:4.0.0 - https://github.com/mockito/mockito)
diff --git a/data-plane/pom.xml b/data-plane/pom.xml
index e9060a704..97773baed 100644
--- a/data-plane/pom.xml
+++ b/data-plane/pom.xml
@@ -32,7 +32,7 @@
 
     <!-- Maven plugins -->
     <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
-    <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
+    <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
     <maven.shade.plugin.version>3.2.4</maven.shade.plugin.version>
     <maven.editorconfig.plugin.version>0.1.1</maven.editorconfig.plugin.version>
     <maven.jacoco.plugin.version>0.8.7</maven.jacoco.plugin.version>
@@ -41,7 +41,7 @@
     <mycila.license.plugin.version>4.1</mycila.license.plugin.version>
 
     <!-- dependencies version -->
-    <vertx.version>4.1.4</vertx.version>
+    <vertx.version>4.1.5</vertx.version>
     <cloudevents.sdk.version>2.2.0</cloudevents.sdk.version>
     <micrometer.version>1.7.5</micrometer.version>
     <opentelemetry.version>1.7.0</opentelemetry.version>
@@ -52,9 +52,9 @@
     <net.logstash.logback.encoder.version>6.6</net.logstash.logback.encoder.version>
     <assertj.version>3.21.0</assertj.version>
     <awaitility.version>4.1.0</awaitility.version>
-    <junit.jupiter.version>5.7.2</junit.jupiter.version>
+    <junit.jupiter.version>5.8.1</junit.jupiter.version>
     <mokito.junit.jupiter.version>4.0.0</mokito.junit.jupiter.version>
-    <fabric8.kubernetes.version>5.7.3</fabric8.kubernetes.version>
+    <fabric8.kubernetes.version>5.9.0</fabric8.kubernetes.version>
     <kafka.version>2.8.1</kafka.version>
     <debezium.version>1.7.0.Final</debezium.version>
   </properties>


Test patch:
diff --git a/control-plane/pkg/reconciler/source/source_test.go b/control-plane/pkg/reconciler/source/source_test.go
index a6299d14e..1301d5839 100644
--- a/control-plane/pkg/reconciler/source/source_test.go
+++ b/control-plane/pkg/reconciler/source/source_test.go
@@ -22,6 +22,7 @@ import (
 	"testing"
 
 	"github.com/Shopify/sarama"
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
@@ -46,6 +47,18 @@ import (
 	. "knative.dev/eventing-kafka-broker/control-plane/pkg/reconciler/testing"
 )
 
+const (
+	finalizerName = "kafkasources.sources.knative.dev"
+)
+
+var (
+	finalizerUpdatedEvent = Eventf(
+		corev1.EventTypeNormal,
+		"FinalizerUpdate",
+		fmt.Sprintf(`Updated %q finalizers`, SourceName),
+	)
+)
+
 func TestReconcileKind(t *testing.T) {
 
 	sources.RegisterAlternateKafkaConditionSet(base.EgressConditionSet)
@@ -103,6 +116,12 @@ func TestReconcileKind(t *testing.T) {
 					),
 				},
 			},
+			WantPatches: []clientgotesting.PatchActionImpl{
+				patchFinalizers(),
+			},
+			WantEvents: []string{
+				finalizerUpdatedEvent,
+			},
 		},
 		{
 			Name: "Reconciled normal - key type string",
@@ -155,6 +174,12 @@ func TestReconcileKind(t *testing.T) {
 					),
 				},
 			},
+			WantPatches: []clientgotesting.PatchActionImpl{
+				patchFinalizers(),
+			},
+			WantEvents: []string{
+				finalizerUpdatedEvent,
+			},
 		},
 		{
 			Name: "Reconciled normal - key type int",
@@ -207,6 +232,12 @@ func TestReconcileKind(t *testing.T) {
 					),
 				},
 			},
+			WantPatches: []clientgotesting.PatchActionImpl{
+				patchFinalizers(),
+			},
+			WantEvents: []string{
+				finalizerUpdatedEvent,
+			},
 		},
 		{
 			Name: "Reconciled normal - key type byte-array",
@@ -259,6 +290,12 @@ func TestReconcileKind(t *testing.T) {
 					),
 				},
 			},
+			WantPatches: []clientgotesting.PatchActionImpl{
+				patchFinalizers(),
+			},
+			WantEvents: []string{
+				finalizerUpdatedEvent,
+			},
 		},
 		{
 			Name: "Reconciled normal - key type float",
@@ -311,9 +348,19 @@ func TestReconcileKind(t *testing.T) {
 					),
 				},
 			},
+			WantPatches: []clientgotesting.PatchActionImpl{
+				patchFinalizers(),
+			},
+			WantEvents: []string{
+				finalizerUpdatedEvent,
+			},
 		},
 	}
 
+	useTable(t, table, configs)
+}
+
+func useTable(t *testing.T, table TableTest, configs broker.Configs) {
 	table.Test(t, NewFactory(&configs, func(ctx context.Context, listers *Listers, configs *broker.Configs, row *TableRow) controller.Reconciler {
 
 		reconciler := &Reconciler{
@@ -361,6 +408,50 @@ func TestReconcileKind(t *testing.T) {
 	}))
 }
 
+func TestFinalizeKind(t *testing.T) {
+
+	sources.RegisterAlternateKafkaConditionSet(base.EgressConditionSet)
+
+	configs := *DefaultConfigs
+	testKey := fmt.Sprintf("%s/%s", SourceNamespace, SourceName)
+
+	table := TableTest{
+		{
+			Name: "Finalize normal - no auth",
+			Objects: []runtime.Object{
+				NewDeletedSource(),
+				NewConfigMapFromContract(&contract.Contract{
+					Generation: 1,
+					Resources: []*contract.Resource{
+						{
+							Uid:              SourceUUID,
+							Topics:           SourceTopics,
+							BootstrapServers: SourceBootstrapServers,
+						},
+					},
+				}, &configs),
+				SourceDispatcherPod(configs.SystemNamespace, map[string]string{
+					"annotation_to_preserve": "value_to_preserve",
+				}),
+			},
+			Key: testKey,
+			WantUpdates: []clientgotesting.UpdateActionImpl{
+				ConfigMapUpdate(&configs, &contract.Contract{
+					Generation: 2,
+					Resources:  []*contract.Resource{},
+				}),
+				SourceDispatcherPodUpdate(configs.SystemNamespace, map[string]string{
+					"annotation_to_preserve":           "value_to_preserve",
+					base.VolumeGenerationAnnotationKey: "2",
+				}),
+			},
+			SkipNamespaceValidation: true, // WantCreates compare the source namespace with configmap namespace, so skip it
+		},
+	}
+
+	useTable(t, table, configs)
+}
+
 func SourceDispatcherPodUpdate(namespace string, annotations map[string]string) clientgotesting.UpdateActionImpl {
 	return clientgotesting.NewUpdateAction(
 		schema.GroupVersionResource{
@@ -372,3 +463,12 @@ func SourceDispatcherPodUpdate(namespace string, annotations map[string]string)
 		SourceDispatcherPod(namespace, annotations),
 	)
 }
+
+func patchFinalizers() clientgotesting.PatchActionImpl {
+	action := clientgotesting.PatchActionImpl{}
+	action.Name = SourceName
+	action.Namespace = SourceNamespace
+	patch := `{"metadata":{"finalizers":["` + finalizerName + `"],"resourceVersion":""}}`
+	action.Patch = []byte(patch)
+	return action
+}
diff --git a/control-plane/pkg/reconciler/testing/objects_source.go b/control-plane/pkg/reconciler/testing/objects_source.go
index ccd132251..8d43a0361 100644
--- a/control-plane/pkg/reconciler/testing/objects_source.go
+++ b/control-plane/pkg/reconciler/testing/objects_source.go
@@ -19,6 +19,7 @@ package testing
 import (
 	"fmt"
 	"strings"
+	"time"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -70,6 +71,17 @@ func NewSource(options ...SourceOption) *sources.KafkaSource {
 	return s
 }
 
+func NewDeletedSource(options ...SourceOption) runtime.Object {
+	return NewSource(
+		append(
+			options,
+			func(source *sources.KafkaSource) {
+				source.DeletionTimestamp = &metav1.Time{Time: time.Now()}
+			},
+		)...,
+	)
+}
+
 func WithKeyType(keyType string) SourceOption {
 	return func(ks *sources.KafkaSource) {
 		if ks.Labels == nil {
diff --git a/third_party/eventing-latest/eventing-core.yaml b/third_party/eventing-latest/eventing-core.yaml
index a4aebfaaa..5f898db53 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: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 
 ---
@@ -41,8 +41,8 @@ metadata:
   name: eventing-controller
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -50,8 +50,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-controller
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -67,8 +67,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-controller-resolver
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -84,8 +84,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-controller-source-observer
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -101,8 +101,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-controller-sources-controller
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -118,8 +118,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-controller-manipulator
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -151,8 +151,8 @@ metadata:
   name: pingsource-mt-adapter
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: 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: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -193,8 +193,8 @@ metadata:
   name: eventing-webhook
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -202,8 +202,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-webhook
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -220,8 +220,8 @@ metadata:
   namespace: knative-eventing
   name: eventing-webhook
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -237,8 +237,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-webhook-resolver
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -254,8 +254,8 @@ kind: ClusterRoleBinding
 metadata:
   name: eventing-webhook-podspecable-binding
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 subjects:
   - kind: ServiceAccount
@@ -287,8 +287,8 @@ metadata:
   name: config-br-default-channel
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 data:
   channelTemplateSpec: |
@@ -316,8 +316,8 @@ metadata:
   name: config-br-defaults
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 data:
   # Configures the default for any Broker that does not specify a spec.config or Broker class.
@@ -350,8 +350,8 @@ metadata:
   name: default-ch-webhook
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 data:
   # Configuration for defaulting channels that do not specify CRD implementations.
@@ -385,10 +385,10 @@ metadata:
   name: config-ping-defaults
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
   annotations:
     knative.dev/example-checksum: "f8e5a744"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 data:
   _example: |
@@ -432,10 +432,10 @@ metadata:
   name: config-features
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/config-propagation: original
     knative.dev/config-category: eventing
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 data:
   # ALPHA feature: The kreference-group allows you to use the Group field in KReferences.
@@ -472,7 +472,7 @@ metadata:
   name: config-kreference-mapping
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/config-propagation: original
     knative.dev/config-category: eventing
   annotations:
@@ -521,8 +521,8 @@ metadata:
   name: config-leader-election
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
   annotations:
     knative.dev/example-checksum: "96896b00"
@@ -583,10 +583,10 @@ metadata:
   name: config-logging
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/config-propagation: original
     knative.dev/config-category: eventing
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 data:
   # Common configuration for all Knative codebase
@@ -637,10 +637,10 @@ metadata:
   name: config-observability
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/config-propagation: original
     knative.dev/config-category: eventing
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
   annotations:
     knative.dev/example-checksum: "f46cf09d"
@@ -714,10 +714,10 @@ metadata:
   name: config-tracing
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/config-propagation: original
     knative.dev/config-category: eventing
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
   annotations:
     knative.dev/example-checksum: "4002b4c2"
@@ -777,10 +777,10 @@ metadata:
   name: eventing-controller
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/high-availability: "true"
     app.kubernetes.io/name: eventing-controller
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   selector:
@@ -790,9 +790,9 @@ spec:
     metadata:
       labels:
         app: eventing-controller
-        eventing.knative.dev/release: "v20211014-a6a819dc7"
+        eventing.knative.dev/release: "v20211018-5f69768e8"
         app.kubernetes.io/name: eventing-autoscaler
-        app.kubernetes.io/version: "20211014-a6a819dc7"
+        app.kubernetes.io/version: "20211018-5f69768e8"
         app.kubernetes.io/part-of: knative-eventing
     spec:
       # To avoid node becoming SPOF, spread our replicas to different nodes.
@@ -810,7 +810,7 @@ spec:
       containers:
         - name: eventing-controller
           terminationMessagePolicy: FallbackToLogsOnError
-          image: gcr.io/knative-nightly/knative.dev/eventing/cmd/controller@sha256:008f2409894454229646ab065546a3b52d65f9feec077f8070d25cc89ca981e7
+          image: gcr.io/knative-nightly/knative.dev/eventing/cmd/controller@sha256:bc67d963d85bdf67d178b948ac868bbe272ddae32ec503c4f7731434870cf9bd
           resources:
             requests:
               cpu: 100m
@@ -828,7 +828,7 @@ spec:
               value: knative.dev/eventing
             # APIServerSource
             - name: APISERVER_RA_IMAGE
-              value: gcr.io/knative-nightly/knative.dev/eventing/cmd/apiserver_receive_adapter@sha256:e4c35b8eb3918588b7fb2fb2bb11089aea24fdd218ee477f1cccfd14e32e86c8
+              value: gcr.io/knative-nightly/knative.dev/eventing/cmd/apiserver_receive_adapter@sha256:8b5f84faa57091ffa139f4925cdd6493e4f42de4e26059a93a8d91bb9927cc86
             - name: POD_NAME
               valueFrom:
                 fieldRef:
@@ -872,9 +872,9 @@ metadata:
   name: pingsource-mt-adapter
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     app.kubernetes.io/name: pingsource-mt-adapter
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   # when set to 0 (and only 0) will be set to 1 when the first PingSource is created.
@@ -887,9 +887,9 @@ spec:
     metadata:
       labels:
         !!merge <<: *labels
-        eventing.knative.dev/release: "v20211014-a6a819dc7"
+        eventing.knative.dev/release: "v20211018-5f69768e8"
         app.kubernetes.io/name: pingsource-mt-adapter
-        app.kubernetes.io/version: "20211014-a6a819dc7"
+        app.kubernetes.io/version: "20211018-5f69768e8"
         app.kubernetes.io/part-of: knative-eventing
     spec:
       affinity:
@@ -903,7 +903,7 @@ spec:
       enableServiceLinks: false
       containers:
         - name: dispatcher
-          image: gcr.io/knative-nightly/knative.dev/eventing/cmd/mtping@sha256:acd2b6cf565bcb39a0a3867bc895131eaf4c208c5e943da7000eefbb6442ad81
+          image: gcr.io/knative-nightly/knative.dev/eventing/cmd/mtping@sha256:77263e64aed5fb944b6fc6bbaf677543126947d2bf634bcc61b91a462d6572e1
           env:
             - name: SYSTEM_NAMESPACE
               value: ''
@@ -961,9 +961,9 @@ metadata:
   name: eventing-webhook
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     app.kubernetes.io/name: eventing-webhook
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   scaleTargetRef:
@@ -987,9 +987,9 @@ metadata:
   name: eventing-webhook
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     app.kubernetes.io/name: eventing-webhook
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   minAvailable: 80%
@@ -1018,9 +1018,9 @@ metadata:
   name: eventing-webhook
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     app.kubernetes.io/name: eventing-webhook
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   selector:
@@ -1031,9 +1031,9 @@ spec:
     metadata:
       labels:
         !!merge <<: *labels
-        eventing.knative.dev/release: "v20211014-a6a819dc7"
+        eventing.knative.dev/release: "v20211018-5f69768e8"
         app.kubernetes.io/name: eventing-webhook
-        app.kubernetes.io/version: "20211014-a6a819dc7"
+        app.kubernetes.io/version: "20211018-5f69768e8"
         app.kubernetes.io/part-of: knative-eventing
     spec:
       # To avoid node becoming SPOF, spread our replicas to different nodes.
@@ -1053,7 +1053,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:e76404f7eae9cd1f47e806b73745d9d56eb8c34d67bde7adbb58233a58a75c39
+          image: gcr.io/knative-nightly/knative.dev/eventing/cmd/webhook@sha256:ce1b62180001ada49960b211871b4757f7c14ac691ee0e53cbad8706606da2d2
           resources:
             requests:
               # taken from serving.
@@ -1117,10 +1117,10 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     role: eventing-webhook
     app.kubernetes.io/name: eventing-webhook
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
   name: eventing-webhook
   namespace: knative-eventing
@@ -1152,11 +1152,11 @@ kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
   annotations:
     # TODO add schemas and descriptions
@@ -1368,10 +1368,10 @@ kind: CustomResourceDefinition
 metadata:
   name: brokers.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: eventing.knative.dev
@@ -1532,11 +1532,11 @@ kind: CustomResourceDefinition
 metadata:
   name: channels.messaging.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
     messaging.knative.dev/subscribable: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: messaging.knative.dev
@@ -1804,11 +1804,11 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
   name: containersources.sources.knative.dev
 spec:
@@ -1958,9 +1958,9 @@ kind: CustomResourceDefinition
 metadata:
   name: eventtypes.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: eventing.knative.dev
@@ -2087,10 +2087,10 @@ kind: CustomResourceDefinition
 metadata:
   name: parallels.flows.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: flows.knative.dev
@@ -2342,11 +2342,11 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
   annotations:
     # TODO add schemas and descriptions
@@ -2533,10 +2533,10 @@ kind: CustomResourceDefinition
 metadata:
   name: sequences.flows.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: flows.knative.dev
@@ -2854,12 +2854,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     duck.knative.dev/binding: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
   name: sinkbindings.sources.knative.dev
 spec:
@@ -3046,9 +3046,9 @@ kind: CustomResourceDefinition
 metadata:
   name: subscriptions.messaging.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: messaging.knative.dev
@@ -3258,9 +3258,9 @@ kind: CustomResourceDefinition
 metadata:
   name: triggers.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: eventing.knative.dev
@@ -3443,8 +3443,8 @@ kind: ClusterRole
 metadata:
   name: addressable-resolver
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 aggregationRule:
   clusterRoleSelectors:
@@ -3457,9 +3457,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: service-addressable-resolver
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 # Do not use this role directly. These rules will be added to the "addressable-resolver" role.
 rules:
@@ -3477,9 +3477,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: serving-addressable-resolver
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 # Do not use this role directly. These rules will be added to the "addressable-resolver" role.
 rules:
@@ -3500,9 +3500,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: channel-addressable-resolver
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 # Do not use this role directly. These rules will be added to the "addressable-resolver" role.
 rules:
@@ -3527,9 +3527,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: broker-addressable-resolver
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 # Do not use this role directly. These rules will be added to the "addressable-resolver" role.
 rules:
@@ -3548,9 +3548,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: messaging-addressable-resolver
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 # Do not use this role directly. These rules will be added to the "addressable-resolver" role.
 rules:
@@ -3571,9 +3571,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: flows-addressable-resolver
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 # Do not use this role directly. These rules will be added to the "addressable-resolver" role.
 rules:
@@ -3609,8 +3609,8 @@ kind: ClusterRole
 metadata:
   name: eventing-broker-filter
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   - apiGroups:
@@ -3636,8 +3636,8 @@ kind: ClusterRole
 metadata:
   name: eventing-broker-ingress
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   - apiGroups:
@@ -3654,8 +3654,8 @@ kind: ClusterRole
 metadata:
   name: eventing-config-reader
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   - apiGroups:
@@ -3688,8 +3688,8 @@ kind: ClusterRole
 metadata:
   name: channelable-manipulator
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 aggregationRule:
   clusterRoleSelectors:
@@ -3702,9 +3702,9 @@ kind: ClusterRole
 metadata:
   name: meta-channelable-manipulator
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     duck.knative.dev/channelable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 # Do not use this role directly. These rules will be added to the "channelable-manipulator" role.
 rules:
@@ -3742,9 +3742,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: knative-eventing-namespaced-admin
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   - apiGroups: ["eventing.knative.dev"]
@@ -3756,9 +3756,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: knative-messaging-namespaced-admin
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   - apiGroups: ["messaging.knative.dev"]
@@ -3770,9 +3770,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: knative-flows-namespaced-admin
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   - apiGroups: ["flows.knative.dev"]
@@ -3784,9 +3784,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: knative-sources-namespaced-admin
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   - apiGroups: ["sources.knative.dev"]
@@ -3798,9 +3798,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: knative-bindings-namespaced-admin
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   - apiGroups: ["bindings.knative.dev"]
@@ -3813,8 +3813,8 @@ metadata:
   name: knative-eventing-namespaced-edit
   labels:
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   - apiGroups: ["eventing.knative.dev", "messaging.knative.dev", "sources.knative.dev", "flows.knative.dev", "bindings.knative.dev"]
@@ -3827,8 +3827,8 @@ metadata:
   name: knative-eventing-namespaced-view
   labels:
     rbac.authorization.k8s.io/aggregate-to-view: "true"
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   - apiGroups: ["eventing.knative.dev", "messaging.knative.dev", "sources.knative.dev", "flows.knative.dev", "bindings.knative.dev"]
@@ -3855,8 +3855,8 @@ kind: ClusterRole
 metadata:
   name: knative-eventing-controller
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   - apiGroups:
@@ -3991,8 +3991,8 @@ kind: ClusterRole
 metadata:
   name: knative-eventing-pingsource-mt-adapter
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   - apiGroups:
@@ -4059,8 +4059,8 @@ kind: ClusterRole
 metadata:
   name: podspecable-binding
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 aggregationRule:
   clusterRoleSelectors:
@@ -4073,9 +4073,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: builtin-podspecable-binding
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     duck.knative.dev/podspecable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 # Do not use this role directly. These rules will be added to the "podspecable-binding role.
 rules:
@@ -4121,8 +4121,8 @@ kind: ClusterRole
 metadata:
   name: source-observer
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 aggregationRule:
   clusterRoleSelectors:
@@ -4135,9 +4135,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: eventing-sources-source-observer
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     duck.knative.dev/source: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 # Do not use this role directly. These rules will be added to the "source-observer" role.
 rules:
@@ -4173,8 +4173,8 @@ kind: ClusterRole
 metadata:
   name: knative-eventing-sources-controller
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   - apiGroups:
@@ -4260,8 +4260,8 @@ kind: ClusterRole
 metadata:
   name: knative-eventing-webhook
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   # For watching logging configuration and getting certs.
@@ -4360,8 +4360,8 @@ metadata:
   namespace: knative-eventing
   name: knative-eventing-webhook
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 rules:
   # For manipulating certs into secrets.
@@ -4397,8 +4397,8 @@ kind: ValidatingWebhookConfiguration
 metadata:
   name: config.webhook.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 webhooks:
   - admissionReviewVersions: ["v1", "v1beta1"]
@@ -4435,8 +4435,8 @@ kind: MutatingWebhookConfiguration
 metadata:
   name: webhook.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 webhooks:
   - admissionReviewVersions: ["v1", "v1beta1"]
@@ -4469,8 +4469,8 @@ kind: ValidatingWebhookConfiguration
 metadata:
   name: validation.webhook.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 webhooks:
   - admissionReviewVersions: ["v1", "v1beta1"]
@@ -4504,8 +4504,8 @@ metadata:
   name: eventing-webhook-certs
   namespace: knative-eventing
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 # The data is populated at install time.
 
@@ -4529,8 +4529,8 @@ kind: MutatingWebhookConfiguration
 metadata:
   name: sinkbindings.webhook.sources.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: 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 2646fff17..3bc104752 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: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: 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: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: eventing.knative.dev
@@ -397,11 +397,11 @@ kind: CustomResourceDefinition
 metadata:
   name: channels.messaging.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
     messaging.knative.dev/subscribable: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: messaging.knative.dev
@@ -669,11 +669,11 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
   name: containersources.sources.knative.dev
 spec:
@@ -823,9 +823,9 @@ kind: CustomResourceDefinition
 metadata:
   name: eventtypes.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: eventing.knative.dev
@@ -952,10 +952,10 @@ kind: CustomResourceDefinition
 metadata:
   name: parallels.flows.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: flows.knative.dev
@@ -1207,11 +1207,11 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
   annotations:
     # TODO add schemas and descriptions
@@ -1398,10 +1398,10 @@ kind: CustomResourceDefinition
 metadata:
   name: sequences.flows.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
     duck.knative.dev/addressable: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: flows.knative.dev
@@ -1719,12 +1719,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     eventing.knative.dev/source: "true"
     duck.knative.dev/source: "true"
     duck.knative.dev/binding: "true"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
   name: sinkbindings.sources.knative.dev
 spec:
@@ -1911,9 +1911,9 @@ kind: CustomResourceDefinition
 metadata:
   name: subscriptions.messaging.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: messaging.knative.dev
@@ -2123,9 +2123,9 @@ kind: CustomResourceDefinition
 metadata:
   name: triggers.eventing.knative.dev
   labels:
-    eventing.knative.dev/release: "v20211014-a6a819dc7"
+    eventing.knative.dev/release: "v20211018-5f69768e8"
     knative.dev/crd-install: "true"
-    app.kubernetes.io/version: "20211014-a6a819dc7"
+    app.kubernetes.io/version: "20211018-5f69768e8"
     app.kubernetes.io/part-of: knative-eventing
 spec:
   group: eventing.knative.dev