Repository: knative-sandbox/eventing-kafka-broker
Pull request #2453 (2022-08-02 08:36:46)

Add TODO for max pool size override
Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

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

This pull-request has been approved by: *<a href="https://github.com/knative-sandbox/eventing-kafka-broker/pull/2453#" title="Author self-approved">pierDipi</a>*

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

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

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

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

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
pierDipi: /cherry-pick release-v1.6
knative-prow-robot: @pierDipi: once the present PR merges, I will cherry-pick it on top of release-v1.6 in a new PR and assign it to you.

<details>

In response to [this](https://github.com/knative-sandbox/eventing-kafka-broker/pull/2453#issuecomment-1202195343):

>/cherry-pick release-v1.6


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: /cherry-pick release-1.6
knative-prow-robot: @pierDipi: once the present PR merges, I will cherry-pick it on top of release-1.6 in a new PR and assign it to you.

<details>

In response to [this](https://github.com/knative-sandbox/eventing-kafka-broker/pull/2453#issuecomment-1202195436):

>/cherry-pick release-1.6


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>
codecov[bot]: # [Codecov](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox) Report
> Merging [#2453](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox) (b24b3a2) into [main](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/commit/89b4bb7ac22a1baa62eab29ed03286de0404ccbe?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox) (89b4bb7) will **increase** coverage by `16.81%`.
> The diff coverage is `n/a`.

```diff
@@              Coverage Diff              @@
##               main    #2453       +/-   ##
=============================================
+ Coverage     64.59%   81.40%   +16.81%     
  Complexity      709      709               
=============================================
  Files           146       72       -74     
  Lines          9806     2463     -7343     
  Branches        224      223        -1     
=============================================
- Hits           6334     2005     -4329     
+ Misses         3039      331     -2708     
+ Partials        433      127      -306     
```

| Flag | Coverage Δ | |
|---|---|---|
| java-unittests | `81.40% <ø> (+0.09%)` | :arrow_up: |

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

| [Impacted Files](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox) | Coverage Δ | |
|---|---|---|
| [...r/dispatcher/main/ConsumerVerticleFactoryImpl.java](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-ZGF0YS1wbGFuZS9kaXNwYXRjaGVyL3NyYy9tYWluL2phdmEvZGV2L2tuYXRpdmUvZXZlbnRpbmcva2Fma2EvYnJva2VyL2Rpc3BhdGNoZXIvbWFpbi9Db25zdW1lclZlcnRpY2xlRmFjdG9yeUltcGwuamF2YQ==) | `80.85% <ø> (+1.68%)` | :arrow_up: |
| [...ol-plane/pkg/reconciler/channel/v2/controllerv2.go](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-Y29udHJvbC1wbGFuZS9wa2cvcmVjb25jaWxlci9jaGFubmVsL3YyL2NvbnRyb2xsZXJ2Mi5nbw==) | | |
| [...rnals/kafka/eventing/v1alpha1/consumer\_defaults.go](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-Y29udHJvbC1wbGFuZS9wa2cvYXBpcy9pbnRlcm5hbHMva2Fma2EvZXZlbnRpbmcvdjFhbHBoYTEvY29uc3VtZXJfZGVmYXVsdHMuZ28=) | | |
| [...ol-plane/pkg/reconciler/consumer/secret\_locator.go](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-Y29udHJvbC1wbGFuZS9wa2cvcmVjb25jaWxlci9jb25zdW1lci9zZWNyZXRfbG9jYXRvci5nbw==) | | |
| [...als/kafka/eventing/v1alpha1/consumer\_validation.go](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-Y29udHJvbC1wbGFuZS9wa2cvYXBpcy9pbnRlcm5hbHMva2Fma2EvZXZlbnRpbmcvdjFhbHBoYTEvY29uc3VtZXJfdmFsaWRhdGlvbi5nbw==) | | |
| [...plane/pkg/reconciler/trigger/namespaced\_trigger.go](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-Y29udHJvbC1wbGFuZS9wa2cvcmVjb25jaWxlci90cmlnZ2VyL25hbWVzcGFjZWRfdHJpZ2dlci5nbw==) | | |
| [...lane/pkg/reconciler/base/receiver\_condition\_set.go](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-Y29udHJvbC1wbGFuZS9wa2cvcmVjb25jaWxlci9iYXNlL3JlY2VpdmVyX2NvbmRpdGlvbl9zZXQuZ28=) | | |
| [control-plane/pkg/kafka/topic.go](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-Y29udHJvbC1wbGFuZS9wa2cva2Fma2EvdG9waWMuZ28=) | | |
| [...ane/pkg/apis/eventing/v1alpha1/kafka\_sink\_types.go](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-Y29udHJvbC1wbGFuZS9wa2cvYXBpcy9ldmVudGluZy92MWFscGhhMS9rYWZrYV9zaW5rX3R5cGVzLmdv) | | |
| [.../pkg/apis/eventing/v1alpha1/kafka\_sink\_defaults.go](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox#diff-Y29udHJvbC1wbGFuZS9wa2cvYXBpcy9ldmVudGluZy92MWFscGhhMS9rYWZrYV9zaW5rX2RlZmF1bHRzLmdv) | | |
| ... and [65 more](https://codecov.io/gh/knative-sandbox/eventing-kafka-broker/pull/2453/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox) | |

Help us with your feedback. Take ten seconds to tell us [how you rate us](https://about.codecov.io/nps?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=knative-sandbox).

knative-prow[bot]: @pierDipi: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
integration-tests_eventing-kafka-broker_main | b24b3a2f006a9e072b9914f7dc13a43eeb1e5a38 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka-broker/2453/integration-tests_eventing-kafka-broker_main/1554385713141649408) | true | `/test integration-tests_eventing-kafka-broker_main`

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

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
pierDipi: /test integration-tests_eventing-kafka-broker_main
knative-prow[bot]: @pierDipi: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
integration-tests_eventing-kafka-broker_main | b24b3a2f006a9e072b9914f7dc13a43eeb1e5a38 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka-broker/2453/integration-tests_eventing-kafka-broker_main/1554385713141649408) | true | `/test integration-tests_eventing-kafka-broker_main`
reconciler-tests_eventing-kafka-broker_main | b24b3a2f006a9e072b9914f7dc13a43eeb1e5a38 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka-broker/2453/reconciler-tests_eventing-kafka-broker_main/1554385713288450048) | true | `/test reconciler-tests_eventing-kafka-broker_main`

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

<details>

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

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
reconciler-tests_eventing-kafka-broker_main | b24b3a2f006a9e072b9914f7dc13a43eeb1e5a38 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka-broker/2453/reconciler-tests_eventing-kafka-broker_main/1554385713288450048) | true | `/test reconciler-tests_eventing-kafka-broker_main`
integration-tests_eventing-kafka-broker_main | b24b3a2f006a9e072b9914f7dc13a43eeb1e5a38 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka-broker/2453/integration-tests_eventing-kafka-broker_main/1554398481676767232) | true | `/test integration-tests_eventing-kafka-broker_main`

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

<details>

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

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
integration-tests_eventing-kafka-broker_main | b24b3a2f006a9e072b9914f7dc13a43eeb1e5a38 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka-broker/2453/integration-tests_eventing-kafka-broker_main/1554398481676767232) | true | `/test integration-tests_eventing-kafka-broker_main`
reconciler-tests_eventing-kafka-broker_main | b24b3a2f006a9e072b9914f7dc13a43eeb1e5a38 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka-broker/2453/reconciler-tests_eventing-kafka-broker_main/1554410024648839168) | true | `/test reconciler-tests_eventing-kafka-broker_main`

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

<details>

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

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
reconciler-tests_eventing-kafka-broker_main | b24b3a2f006a9e072b9914f7dc13a43eeb1e5a38 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka-broker/2453/reconciler-tests_eventing-kafka-broker_main/1554410024648839168) | true | `/test reconciler-tests_eventing-kafka-broker_main`
integration-tests_eventing-kafka-broker_main | b24b3a2f006a9e072b9914f7dc13a43eeb1e5a38 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka-broker/2453/integration-tests_eventing-kafka-broker_main/1554410024590118912) | true | `/test integration-tests_eventing-kafka-broker_main`

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

<details>

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

Patch:
diff --git a/control-plane/pkg/reconciler/source/source.go b/control-plane/pkg/reconciler/source/source.go
index 2e3a7b2d3..c3536ce35 100644
--- a/control-plane/pkg/reconciler/source/source.go
+++ b/control-plane/pkg/reconciler/source/source.go
@@ -126,7 +126,7 @@ func (r Reconciler) reconcileConsumerGroup(ctx context.Context, ks *sources.Kafk
 						DeliverySpec: &eventingduck.DeliverySpec{
 							Retry:         pointer.Int32(10),
 							BackoffPolicy: &backoffPolicy,
-							BackoffDelay:  pointer.String("PT10S"),
+							BackoffDelay:  pointer.String("PT0.3S"),
 							Timeout:       pointer.String("PT600S"),
 						},
 						Ordering: DefaultDeliveryOrder,
diff --git a/data-plane/config/broker/100-config-kafka-broker-data-plane.yaml b/data-plane/config/broker/100-config-kafka-broker-data-plane.yaml
index 37ffd90c1..f3cbd9989 100644
--- a/data-plane/config/broker/100-config-kafka-broker-data-plane.yaml
+++ b/data-plane/config/broker/100-config-kafka-broker-data-plane.yaml
@@ -115,7 +115,7 @@ data:
     value.deserializer=io.cloudevents.kafka.CloudEventDeserializer
     fetch.min.bytes=1
     heartbeat.interval.ms=3000
-    max.partition.fetch.bytes=1048576
+    max.partition.fetch.bytes=65536
     session.timeout.ms=10000
     # ssl.key.password=
     # ssl.keystore.location=
@@ -132,7 +132,7 @@ data:
     fetch.max.bytes=52428800
     isolation.level=read_uncommitted
     max.poll.interval.ms=300000
-    max.poll.records=500
+    max.poll.records=50
     partition.assignment.strategy=org.apache.kafka.clients.consumer.StickyAssignor
     receive.buffer.bytes=65536
     request.timeout.ms=2000
diff --git a/data-plane/config/channel/100-config-kafka-channel-data-plane.yaml b/data-plane/config/channel/100-config-kafka-channel-data-plane.yaml
index 112ae2ced..1216f2b20 100644
--- a/data-plane/config/channel/100-config-kafka-channel-data-plane.yaml
+++ b/data-plane/config/channel/100-config-kafka-channel-data-plane.yaml
@@ -115,7 +115,7 @@ data:
     value.deserializer=io.cloudevents.kafka.CloudEventDeserializer
     fetch.min.bytes=1
     heartbeat.interval.ms=3000
-    max.partition.fetch.bytes=1048576
+    max.partition.fetch.bytes=65536
     session.timeout.ms=10000
     # ssl.key.password=
     # ssl.keystore.location=
@@ -131,7 +131,7 @@ data:
     fetch.max.bytes=52428800
     isolation.level=read_uncommitted
     max.poll.interval.ms=300000
-    max.poll.records=500
+    max.poll.records=50
     partition.assignment.strategy=org.apache.kafka.clients.consumer.StickyAssignor
     receive.buffer.bytes=65536
     request.timeout.ms=2000
diff --git a/data-plane/config/source/100-config-kafka-source-data-plane.yaml b/data-plane/config/source/100-config-kafka-source-data-plane.yaml
index 810f75a06..27a4f8ef1 100644
--- a/data-plane/config/source/100-config-kafka-source-data-plane.yaml
+++ b/data-plane/config/source/100-config-kafka-source-data-plane.yaml
@@ -97,7 +97,7 @@ data:
     value.deserializer=io.cloudevents.kafka.CloudEventDeserializer
     fetch.min.bytes=1
     heartbeat.interval.ms=3000
-    max.partition.fetch.bytes=1048576
+    max.partition.fetch.bytes=65536
     session.timeout.ms=10000
     # ssl.key.password=
     # ssl.keystore.location=
@@ -114,7 +114,7 @@ data:
     fetch.max.bytes=52428800
     isolation.level=read_uncommitted
     max.poll.interval.ms=300000
-    max.poll.records=500
+    max.poll.records=50
     partition.assignment.strategy=org.apache.kafka.clients.consumer.StickyAssignor
     receive.buffer.bytes=65536
     request.timeout.ms=2000
diff --git a/data-plane/dispatcher/src/main/java/dev/knative/eventing/kafka/broker/dispatcher/main/ConsumerVerticleFactoryImpl.java b/data-plane/dispatcher/src/main/java/dev/knative/eventing/kafka/broker/dispatcher/main/ConsumerVerticleFactoryImpl.java
index af406db39..0bcc355c6 100644
--- a/data-plane/dispatcher/src/main/java/dev/knative/eventing/kafka/broker/dispatcher/main/ConsumerVerticleFactoryImpl.java
+++ b/data-plane/dispatcher/src/main/java/dev/knative/eventing/kafka/broker/dispatcher/main/ConsumerVerticleFactoryImpl.java
@@ -340,10 +340,11 @@ public class ConsumerVerticleFactoryImpl implements ConsumerVerticleFactory {
                                                       final EgressConfig egressConfig,
                                                       final DataPlaneContract.Egress egress) {
     var webClientOptions = this.webClientOptions;
-    if (egress.getVReplicas() > 0) {
-      webClientOptions = new WebClientOptions(this.webClientOptions);
-      webClientOptions.setMaxPoolSize(egress.getVReplicas());
-    }
+    // TODO use numPartitions for ordered delivery or max.poll.records for unordered delivery
+    // if (egress.getVReplicas() > 0) {
+    //   webClientOptions = new WebClientOptions(this.webClientOptions);
+    //   webClientOptions.setMaxPoolSize(egress.getVReplicas());
+    // }
     return new WebClientCloudEventSender(vertx, WebClient.create(vertx, webClientOptions), target, egressConfig);
   }
 


Test patch:
diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml
index f94a87295..71fd44d20 100644
--- a/.github/workflows/kind-e2e.yaml
+++ b/.github/workflows/kind-e2e.yaml
@@ -24,12 +24,6 @@ jobs:
         eventing-config:
           - "./third_party/eventing-latest/"
 
-        channel-auth-scenario:
-          - ""
-          - "SSL"
-          - "SASL_SSL"
-          - "SASL_PLAIN"
-
         broker-class:
           - Kafka
 
@@ -56,50 +50,6 @@ jobs:
           - test-suite: ./test/e2e_channel
             extra-test-flags: -channels=messaging.knative.dev/v1beta1:KafkaChannel
 
-        # don't run e2e for tests other than KafkaChannel when channel-auth-scenario is set
-        exclude:
-          - test-suite: ./test/e2e
-            channel-auth-scenario: "SSL"
-          - test-suite: ./test/e2e
-            channel-auth-scenario: "SASL_SSL"
-          - test-suite: ./test/e2e
-            channel-auth-scenario: "SASL_PLAIN"
-
-          - test-suite: ./test/e2e_broker
-            channel-auth-scenario: "SSL"
-          - test-suite: ./test/e2e_broker
-            channel-auth-scenario: "SASL_SSL"
-          - test-suite: ./test/e2e_broker
-            channel-auth-scenario: "SASL_PLAIN"
-
-          - test-suite: ./test/e2e_sink
-            channel-auth-scenario: "SSL"
-          - test-suite: ./test/e2e_sink
-            channel-auth-scenario: "SASL_SSL"
-          - test-suite: ./test/e2e_sink
-            channel-auth-scenario: "SASL_PLAIN"
-
-          - test-suite: ./test/e2e_source
-            channel-auth-scenario: "SSL"
-          - test-suite: ./test/e2e_source
-            channel-auth-scenario: "SASL_SSL"
-          - test-suite: ./test/e2e_source
-            channel-auth-scenario: "SASL_PLAIN"
-
-          - test-suite: ./test/e2e_new
-            channel-auth-scenario: "SSL"
-          - test-suite: ./test/e2e_new
-            channel-auth-scenario: "SASL_SSL"
-          - test-suite: ./test/e2e_new
-            channel-auth-scenario: "SASL_PLAIN"
-
-          - test-suite: ./test/experimental
-            channel-auth-scenario: "SSL"
-          - test-suite: ./test/experimental
-            channel-auth-scenario: "SASL_SSL"
-          - test-suite: ./test/experimental
-            channel-auth-scenario: "SASL_PLAIN"
-
     env:
       GOPATH: ${{ github.workspace }}
       KO_DOCKER_REPO: localhost:5001
@@ -115,7 +65,6 @@ jobs:
       NODE_VERSION: ${{ matrix.k8s-version }}
       NODE_SHA: ${{ matrix.kind-image-sha }}
 
-      EVENTING_KAFKA_BROKER_CHANNEL_AUTH_SCENARIO: ${{ matrix.channel-auth-scenario }}
       BROKER_CLASS: ${{ matrix.broker-class }}
 
     steps:
diff --git a/control-plane/pkg/reconciler/source/source_test.go b/control-plane/pkg/reconciler/source/source_test.go
index 09d333442..2ace88d4a 100644
--- a/control-plane/pkg/reconciler/source/source_test.go
+++ b/control-plane/pkg/reconciler/source/source_test.go
@@ -112,7 +112,7 @@ func TestReconcileKind(t *testing.T) {
 								internals.Ordered,
 								NewConsumerTimeout("PT600S"),
 								NewConsumerRetry(10),
-								NewConsumerBackoffDelay("PT10S"),
+								NewConsumerBackoffDelay("PT0.3S"),
 								NewConsumerBackoffPolicy(eventingduck.BackoffPolicyExponential),
 							),
 						),
@@ -158,7 +158,7 @@ func TestReconcileKind(t *testing.T) {
 								internals.Ordered,
 								NewConsumerTimeout("PT600S"),
 								NewConsumerRetry(10),
-								NewConsumerBackoffDelay("PT10S"),
+								NewConsumerBackoffDelay("PT0.3S"),
 								NewConsumerBackoffPolicy(eventingduck.BackoffPolicyExponential),
 							),
 						),
@@ -286,7 +286,7 @@ func TestReconcileKind(t *testing.T) {
 								internals.Ordered,
 								NewConsumerTimeout("PT600S"),
 								NewConsumerRetry(10),
-								NewConsumerBackoffDelay("PT10S"),
+								NewConsumerBackoffDelay("PT0.3S"),
 								NewConsumerBackoffPolicy(eventingduck.BackoffPolicyExponential),
 							),
 						),
@@ -398,7 +398,7 @@ func TestReconcileKind(t *testing.T) {
 								internals.Ordered,
 								NewConsumerTimeout("PT600S"),
 								NewConsumerRetry(10),
-								NewConsumerBackoffDelay("PT10S"),
+								NewConsumerBackoffDelay("PT0.3S"),
 								NewConsumerBackoffPolicy(eventingduck.BackoffPolicyExponential),
 							),
 						),
@@ -447,7 +447,7 @@ func TestReconcileKind(t *testing.T) {
 								internals.Ordered,
 								NewConsumerTimeout("PT600S"),
 								NewConsumerRetry(10),
-								NewConsumerBackoffDelay("PT10S"),
+								NewConsumerBackoffDelay("PT0.3S"),
 								NewConsumerBackoffPolicy(eventingduck.BackoffPolicyExponential),
 							),
 						),
@@ -495,7 +495,7 @@ func TestReconcileKind(t *testing.T) {
 								internals.Ordered,
 								NewConsumerTimeout("PT600S"),
 								NewConsumerRetry(10),
-								NewConsumerBackoffDelay("PT10S"),
+								NewConsumerBackoffDelay("PT0.3S"),
 								NewConsumerBackoffPolicy(eventingduck.BackoffPolicyExponential),
 							),
 						),
@@ -527,7 +527,7 @@ func TestReconcileKind(t *testing.T) {
 									internals.Ordered,
 									NewConsumerTimeout("PT600S"),
 									NewConsumerRetry(10),
-									NewConsumerBackoffDelay("PT10S"),
+									NewConsumerBackoffDelay("PT0.3S"),
 									NewConsumerBackoffPolicy(eventingduck.BackoffPolicyExponential),
 								),
 							),
@@ -585,7 +585,7 @@ func TestReconcileKind(t *testing.T) {
 									internals.Ordered,
 									NewConsumerTimeout("PT600S"),
 									NewConsumerRetry(10),
-									NewConsumerBackoffDelay("PT10S"),
+									NewConsumerBackoffDelay("PT0.3S"),
 									NewConsumerBackoffPolicy(eventingduck.BackoffPolicyExponential),
 								),
 							),
@@ -642,7 +642,7 @@ func TestReconcileKind(t *testing.T) {
 									internals.Ordered,
 									NewConsumerTimeout("PT600S"),
 									NewConsumerRetry(10),
-									NewConsumerBackoffDelay("PT10S"),
+									NewConsumerBackoffDelay("PT0.3S"),
 									NewConsumerBackoffPolicy(eventingduck.BackoffPolicyExponential),
 								),
 							),
@@ -685,7 +685,7 @@ func TestReconcileKind(t *testing.T) {
 								internals.Ordered,
 								NewConsumerTimeout("PT600S"),
 								NewConsumerRetry(10),
-								NewConsumerBackoffDelay("PT10S"),
+								NewConsumerBackoffDelay("PT0.3S"),
 								NewConsumerBackoffPolicy(eventingduck.BackoffPolicyExponential),
 							),
 						),
@@ -729,7 +729,7 @@ func TestReconcileKind(t *testing.T) {
 								internals.Ordered,
 								NewConsumerTimeout("PT600S"),
 								NewConsumerRetry(10),
-								NewConsumerBackoffDelay("PT10S"),
+								NewConsumerBackoffDelay("PT0.3S"),
 								NewConsumerBackoffPolicy(eventingduck.BackoffPolicyExponential),
 							),
 						),
@@ -773,7 +773,7 @@ func TestReconcileKind(t *testing.T) {
 								internals.Ordered,
 								NewConsumerTimeout("PT600S"),
 								NewConsumerRetry(10),
-								NewConsumerBackoffDelay("PT10S"),
+								NewConsumerBackoffDelay("PT0.3S"),
 								NewConsumerBackoffPolicy(eventingduck.BackoffPolicyExponential),
 							),
 						),
@@ -818,7 +818,7 @@ func TestReconcileKind(t *testing.T) {
 								internals.Ordered,
 								NewConsumerTimeout("PT600S"),
 								NewConsumerRetry(10),
-								NewConsumerBackoffDelay("PT10S"),
+								NewConsumerBackoffDelay("PT0.3S"),
 								NewConsumerBackoffPolicy(eventingduck.BackoffPolicyExponential),
 							),
 						),