Repository: knative-sandbox/eventing-kafka
Pull request #207 (2020-11-20 01:14:41)

[Automated] Update actions
Produced via:
```shell
# meta: knative-sandbox/.github
# main: knative-sandbox/eventing-kafka
cp $(find "${GITHUB_WORKSPACE}/meta/workflow-templates" -type f -name '*.yaml') \
  "${GITHUB_WORKSPACE}/main/.github/workflows/"
```
Cron. -knative-prow-robot
/cc knative-sandbox/channel-wg-leads
/assign knative-sandbox/channel-wg-leads

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

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

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

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

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

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":["travis-minke-sap"]} -->
codecov[bot]: # [Codecov](https://codecov.io/gh/knative-sandbox/eventing-kafka/pull/207?src=pr&el=h1) Report
> Merging [#207](https://codecov.io/gh/knative-sandbox/eventing-kafka/pull/207?src=pr&el=desc) (0fc11ea) into [master](https://codecov.io/gh/knative-sandbox/eventing-kafka/commit/016b121f17a34c55e0a7528e9dd7849ca59b8868?el=desc) (016b121) will **not change** coverage.
> The diff coverage is `n/a`.

[![Impacted file tree graph](https://codecov.io/gh/knative-sandbox/eventing-kafka/pull/207/graphs/tree.svg?width=650&height=150&src=pr&token=W765CT93QC)](https://codecov.io/gh/knative-sandbox/eventing-kafka/pull/207?src=pr&el=tree)

```diff
@@           Coverage Diff           @@
##           master     #207   +/-   ##
=======================================
  Coverage   76.04%   76.04%           
=======================================
  Files         112      112           
  Lines        4275     4275           
=======================================
  Hits         3251     3251           
  Misses        829      829           
  Partials      195      195           
```



------

[Continue to review full report at Codecov](https://codecov.io/gh/knative-sandbox/eventing-kafka/pull/207?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/knative-sandbox/eventing-kafka/pull/207?src=pr&el=footer). Last update [016b121...8588489](https://codecov.io/gh/knative-sandbox/eventing-kafka/pull/207?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).

knative-prow-robot: @knative-automation: The following test **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-sandbox-eventing-kafka-unit-tests | 8588489dd4e2ccf0d6f07db36a7cba0cb58a89f4 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/207/pull-knative-sandbox-eventing-kafka-unit-tests/1329593992764985344) | `/test pull-knative-sandbox-eventing-kafka-unit-tests`

[Full PR test history](https://gubernator.knative.dev/pr/knative-sandbox_eventing-kafka/207). [Your PR dashboard](https://gubernator.knative.dev/pr/knative-automation).

<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-robot: @knative-automation: The following tests **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-sandbox-eventing-kafka-unit-tests | 8588489dd4e2ccf0d6f07db36a7cba0cb58a89f4 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/207/pull-knative-sandbox-eventing-kafka-unit-tests/1329593992764985344) | `/test pull-knative-sandbox-eventing-kafka-unit-tests`
pull-knative-sandbox-eventing-kafka-integration-test-channel-consolidated-sasl | 8588489dd4e2ccf0d6f07db36a7cba0cb58a89f4 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/207/pull-knative-sandbox-eventing-kafka-integration-test-channel-consolidated-sasl/1329630343585599488) | `/test pull-knative-sandbox-eventing-kafka-integration-test-channel-consolidated-sasl`

[Full PR test history](https://gubernator.knative.dev/pr/knative-sandbox_eventing-kafka/207). [Your PR dashboard](https://gubernator.knative.dev/pr/knative-automation).

<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-robot: @knative-automation: The following tests **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-sandbox-eventing-kafka-unit-tests | 8588489dd4e2ccf0d6f07db36a7cba0cb58a89f4 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/207/pull-knative-sandbox-eventing-kafka-unit-tests/1329593992764985344) | `/test pull-knative-sandbox-eventing-kafka-unit-tests`
pull-knative-sandbox-eventing-kafka-integration-test-channel-consolidated-sasl | 8588489dd4e2ccf0d6f07db36a7cba0cb58a89f4 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/207/pull-knative-sandbox-eventing-kafka-integration-test-channel-consolidated-sasl/1329630343585599488) | `/test pull-knative-sandbox-eventing-kafka-integration-test-channel-consolidated-sasl`
pull-knative-sandbox-eventing-kafka-integration-test-channel-consolidated-tls | 8588489dd4e2ccf0d6f07db36a7cba0cb58a89f4 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative-sandbox_eventing-kafka/207/pull-knative-sandbox-eventing-kafka-integration-test-channel-consolidated-tls/1329630343518490624) | `/test pull-knative-sandbox-eventing-kafka-integration-test-channel-consolidated-tls`

[Full PR test history](https://gubernator.knative.dev/pr/knative-sandbox_eventing-kafka/207). [Your PR dashboard](https://gubernator.knative.dev/pr/knative-automation).

<details>

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

Patch:
diff --git a/.github/workflows/knative-releasability.yaml b/.github/workflows/knative-releasability.yaml
index f13cc479a..ca0820a6e 100644
--- a/.github/workflows/knative-releasability.yaml
+++ b/.github/workflows/knative-releasability.yaml
@@ -142,7 +142,7 @@ jobs:
           echo 'SLACK_TITLE=Releasability for ${{ github.repository }} @ ${{ env.RELEASE }} is NO-GO!' >> $GITHUB_ENV
 
       - name: Post status to Slack
-        if: steps.exists.outputs.release-branch == 'false'
+        if: ${{ secrets.SLACK_WEBHOOK != '' && steps.exists.outputs.release-branch == 'false' }}
         uses: rtCamp/action-slack-notify@v2.1.0
         env:
           SLACK_ICON: http://github.com/knative.png?size=48
diff --git a/go.mod b/go.mod
index cca62145b..503292acb 100644
--- a/go.mod
+++ b/go.mod
@@ -32,9 +32,9 @@ require (
 	k8s.io/apimachinery v0.18.12
 	k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
 	k8s.io/utils v0.0.0-20200603063816-c1c6865ac451
-	knative.dev/eventing v0.19.1-0.20201119072951-6fdccfa3e477
-	knative.dev/hack v0.0.0-20201119025252-d3cb354f49ff
-	knative.dev/pkg v0.0.0-20201119021551-260026d54739
+	knative.dev/eventing v0.19.1-0.20201119214452-c3e71f547063
+	knative.dev/hack v0.0.0-20201119155951-11aa26c8eaf6
+	knative.dev/pkg v0.0.0-20201119170152-e5e30edc364a
 )
 
 replace (
diff --git a/go.sum b/go.sum
index cefbfa2a6..4466d261a 100644
--- a/go.sum
+++ b/go.sum
@@ -596,6 +596,8 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.10.2 h1:aY/nuoWlKJud2J6U0E3NWsjlg+0GtwXxgEqthRdzlcs=
+github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
@@ -1027,6 +1029,7 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
 golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
+golang.org/x/tools v0.0.0-20200918201133-e94ab7288189/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
 golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9 h1:sEvmEcJVKBNUvgCUClbUQeHOAa9U0I2Ce1BooMvVCY4=
 golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1225,18 +1228,23 @@ k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29/go.mod h1:F+5wygcW0wmRTnM
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 h1:v8ud2Up6QK1lNOKFgiIVrZdMg7MpmSnvtrOieolJKoE=
 k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-knative.dev/eventing v0.19.1-0.20201119072951-6fdccfa3e477 h1:hqWQj6MMlAT3iGs55XSmeJnegDCqkMYPP6zPr8NKuE0=
-knative.dev/eventing v0.19.1-0.20201119072951-6fdccfa3e477/go.mod h1:ro9hDXeomK6eC5Ad+E9Ilx/0DerP357El+8qUHhEfEg=
+knative.dev/eventing v0.19.1-0.20201119214452-c3e71f547063 h1:VlO1Cwgg4ZfsxD+oeaUCUSwjUs3OWSy8i5Z2LtCvarw=
+knative.dev/eventing v0.19.1-0.20201119214452-c3e71f547063/go.mod h1:bhzNpRkhTAWqFNIZwsZOujyn/DrI9BLtarOAmrJYmSg=
 knative.dev/hack v0.0.0-20201112185459-01a34c573bd8 h1:RNbZsAjhswBPtl4C5C5gEFX5/GfWIOZQxfYD9DhkHdY=
 knative.dev/hack v0.0.0-20201112185459-01a34c573bd8/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
 knative.dev/hack v0.0.0-20201118155651-b31d3bb6bff9 h1:OgYL1cATsWTS6kztSOuQqhmYfcn6ZdpPAQQ6TKCx00I=
 knative.dev/hack v0.0.0-20201118155651-b31d3bb6bff9/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
 knative.dev/hack v0.0.0-20201119025252-d3cb354f49ff h1:+bdPPtgog4EAuibiiW1uMdWX2DVij0+elXSh+Yfey78=
 knative.dev/hack v0.0.0-20201119025252-d3cb354f49ff/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
+knative.dev/hack v0.0.0-20201119155951-11aa26c8eaf6 h1:axQj+uBstWcD2KmgTvN0i4Jl4bs2LF2LJTANe1utmFc=
+knative.dev/hack v0.0.0-20201119155951-11aa26c8eaf6/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
 knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed h1:4LNEFhvD2Ya4WgCD3SC1WGXz81bjEvQgbcpe5XACI3I=
 knative.dev/pkg v0.0.0-20201117221452-0fccc54273ed/go.mod h1:nxlh3CUvx6WBPr1WKD96AHxFZPD2UKRDo9RUp8ILTyQ=
 knative.dev/pkg v0.0.0-20201119021551-260026d54739 h1:23XBvGmbprZ86TY9HJQmO7ZKp/te3LzJdKeVX7o9TAw=
 knative.dev/pkg v0.0.0-20201119021551-260026d54739/go.mod h1:3Udj7GogdjFg0M05MJm+aJjHx1BK/tyQarl5RB2k0Xo=
+knative.dev/pkg v0.0.0-20201119170152-e5e30edc364a h1:vQfKmiY+OS1v6/3kuH4FxdJVnpYG31GddIh+4lao+/M=
+knative.dev/pkg v0.0.0-20201119170152-e5e30edc364a/go.mod h1:qv0lAVIPd4AmEsLyOOU6hzaN++wfBG+skRqtdcg0h7M=
+knative.dev/reconciler-test v0.0.0-20201119161052-83e399255464/go.mod h1:YSs1y1rgnjs8w39/drLIOQbWvZUQwqApvd+EizO8UsA=
 pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
diff --git a/pkg/source/client.go b/pkg/source/client.go
index c4b275fc3..3056e7f9a 100644
--- a/pkg/source/client.go
+++ b/pkg/source/client.go
@@ -158,9 +158,7 @@ func UpdateSaramaConfigWithKafkaAuthConfig(saramaConf *sarama.Config, kafkaAuthC
 			saramaConf.Net.SASL.Handshake = true
 
 			// if SaslType is not provided we are defaulting to PLAIN
-			if kafkaAuthCfg.SASL.SaslType == "" {
-				kafkaAuthCfg.SASL.SaslType = sarama.SASLTypePlaintext
-			}
+			saramaConf.Net.SASL.Mechanism = sarama.SASLTypePlaintext
 
 			if kafkaAuthCfg.SASL.SaslType == sarama.SASLTypeSCRAMSHA256 {
 				saramaConf.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { return &XDGSCRAMClient{HashGeneratorFcn: SHA256} }
diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh
index c2f9081ef..9b90b0025 100644
--- a/vendor/knative.dev/hack/library.sh
+++ b/vendor/knative.dev/hack/library.sh
@@ -410,28 +410,26 @@ function start_latest_knative_serving() {
 }
 
 # Install Knative Eventing in the current cluster.
-# Parameters: $1 - Knative Eventing crds manifest.
-#             $2 - Knative Eventing core manifest.
+# Parameters: $1 - Knative Eventing manifest.
 function start_knative_eventing() {
   header "Starting Knative Eventing"
   subheader "Installing Knative Eventing"
   echo "Installing Eventing CRDs from $1"
+  kubectl apply --selector knative.dev/crd-install=true -f "$1"
+  echo "Installing the rest of eventing components from $1"
   kubectl apply -f "$1"
-  echo "Installing Eventing core components from $2"
-  kubectl apply -f "$2"
   wait_until_pods_running knative-eventing || return 1
 }
 
 # Install the stable release Knative/eventing in the current cluster.
 # Parameters: $1 - Knative Eventing version number, e.g. 0.6.0.
 function start_release_knative_eventing() {
-  start_knative_eventing "https://storage.googleapis.com/knative-releases/eventing/previous/v$1/eventing-crds.yaml" \
-    "https://storage.googleapis.com/knative-releases/eventing/previous/v$1/eventing-core.yaml"
+  start_knative_eventing "https://storage.googleapis.com/knative-releases/eventing/previous/v$1/eventing.yaml"
 }
 
 # Install the latest stable Knative Eventing in the current cluster.
 function start_latest_knative_eventing() {
-  start_knative_eventing "${KNATIVE_EVENTING_RELEASE_CRDS}" "${KNATIVE_EVENTING_RELEASE_CORE}"
+  start_knative_eventing "${KNATIVE_EVENTING_RELEASE}"
 }
 
 # Install Knative Eventing extension in the current cluster.
@@ -764,6 +762,5 @@ readonly REPO_NAME_FORMATTED="Knative $(capitalize "${REPO_NAME//-/ }")"
 readonly KNATIVE_SERVING_RELEASE_CRDS="$(get_latest_knative_yaml_source "serving" "serving-crds")"
 readonly KNATIVE_SERVING_RELEASE_CORE="$(get_latest_knative_yaml_source "serving" "serving-core")"
 readonly KNATIVE_NET_ISTIO_RELEASE="$(get_latest_knative_yaml_source "net-istio" "net-istio")"
-readonly KNATIVE_EVENTING_RELEASE_CRDS="$(get_latest_knative_yaml_source "eventing" "eventing-crds")"
-readonly KNATIVE_EVENTING_RELEASE_CORE="$(get_latest_knative_yaml_source "eventing" "eventing-core")"
+readonly KNATIVE_EVENTING_RELEASE="$(get_latest_knative_yaml_source "eventing" "eventing")"
 readonly KNATIVE_EVENTING_SUGAR_CONTROLLER_RELEASE="$(get_latest_knative_yaml_source "eventing" "eventing-sugar-controller")"
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 31e4d2b81..f83c554d7 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1072,7 +1072,7 @@ k8s.io/utils/buffer
 k8s.io/utils/integer
 k8s.io/utils/pointer
 k8s.io/utils/trace
-# knative.dev/eventing v0.19.1-0.20201119072951-6fdccfa3e477
+# knative.dev/eventing v0.19.1-0.20201119214452-c3e71f547063
 ## explicit
 knative.dev/eventing/pkg/adapter/v2
 knative.dev/eventing/pkg/adapter/v2/util/crstatusevent
@@ -1204,10 +1204,10 @@ knative.dev/eventing/test/test_images/heartbeats
 knative.dev/eventing/test/test_images/performance
 knative.dev/eventing/test/test_images/print
 knative.dev/eventing/test/test_images/recordevents
-# knative.dev/hack v0.0.0-20201119025252-d3cb354f49ff
+# knative.dev/hack v0.0.0-20201119155951-11aa26c8eaf6
 ## explicit
 knative.dev/hack
-# knative.dev/pkg v0.0.0-20201119021551-260026d54739
+# knative.dev/pkg v0.0.0-20201119170152-e5e30edc364a
 ## explicit
 knative.dev/pkg/apis
 knative.dev/pkg/apis/duck


Test patch:
diff --git a/pkg/source/client_test.go b/pkg/source/client_test.go
index 4ca06ef07..d2faeb968 100644
--- a/pkg/source/client_test.go
+++ b/pkg/source/client_test.go
@@ -55,35 +55,47 @@ func TestUpdateSaramaConfigWithKafkaAuthConfig(t *testing.T) {
 				SASL: &utils.KafkaSaslConfig{
 					User:     "my-user",
 					Password: "super-secret",
+					SaslType: sarama.SASLTypePlaintext,
 				},
 			},
 			enabledTLS:    false,
 			enabledSASL:   true,
-			salsMechanism: "",
+			salsMechanism: sarama.SASLTypePlaintext,
+		},
+		"Only SASL-PLAIN Auth (not specified, defaulted)": {
+			kafkaAuthCfg: &utils.KafkaAuthConfig{
+				SASL: &utils.KafkaSaslConfig{
+					User:     "my-user",
+					Password: "super-secret",
+				},
+			},
+			enabledTLS:    false,
+			enabledSASL:   true,
+			salsMechanism: sarama.SASLTypePlaintext,
 		},
 		"Only SASL-SCRAM-SHA-256 Auth": {
 			kafkaAuthCfg: &utils.KafkaAuthConfig{
 				SASL: &utils.KafkaSaslConfig{
 					User:     "my-user",
 					Password: "super-secret",
-					SaslType: "SCRAM-SHA-256",
+					SaslType: sarama.SASLTypeSCRAMSHA256,
 				},
 			},
 			enabledTLS:    false,
 			enabledSASL:   true,
-			salsMechanism: "SCRAM-SHA-256",
+			salsMechanism: sarama.SASLTypeSCRAMSHA256,
 		},
 		"Only SASL-SCRAM-SHA-512 Auth": {
 			kafkaAuthCfg: &utils.KafkaAuthConfig{
 				SASL: &utils.KafkaSaslConfig{
 					User:     "my-user",
 					Password: "super-secret",
-					SaslType: "SCRAM-SHA-512",
+					SaslType: sarama.SASLTypeSCRAMSHA512,
 				},
 			},
 			enabledTLS:    false,
 			enabledSASL:   true,
-			salsMechanism: "SCRAM-SHA-512",
+			salsMechanism: sarama.SASLTypeSCRAMSHA512,
 		},
 		"Only TLS Auth": {
 			kafkaAuthCfg: &utils.KafkaAuthConfig{
@@ -101,7 +113,7 @@ func TestUpdateSaramaConfigWithKafkaAuthConfig(t *testing.T) {
 				SASL: &utils.KafkaSaslConfig{
 					User:     "my-user",
 					Password: "super-secret",
-					SaslType: "SCRAM-SHA-512",
+					SaslType: sarama.SASLTypeSCRAMSHA512,
 				},
 				TLS: &utils.KafkaTlsConfig{
 					Cacert:   cert,
@@ -111,7 +123,7 @@ func TestUpdateSaramaConfigWithKafkaAuthConfig(t *testing.T) {
 			},
 			enabledTLS:    true,
 			enabledSASL:   true,
-			salsMechanism: "SCRAM-SHA-512",
+			salsMechanism: sarama.SASLTypeSCRAMSHA512,
 		},
 	}
 
@@ -128,7 +140,7 @@ func TestUpdateSaramaConfigWithKafkaAuthConfig(t *testing.T) {
 			}
 			if saslEnabled {
 				if tc.salsMechanism != string(config.Net.SASL.Mechanism) {
-					t.Errorf("SASL Mechanism is wrong")
+					t.Errorf("SASL Mechanism is wrong, want: %s vs got %s", tc.salsMechanism, string(config.Net.SASL.Mechanism))
 				}
 			}
 
diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
index ba2a54491..695921c58 100755
--- a/test/e2e-tests.sh
+++ b/test/e2e-tests.sh
@@ -349,17 +349,22 @@ function kafka_teardown() {
   kubectl delete namespace "${STRIMZI_KAFKA_NAMESPACE}"
 }
 
-function create_auth_secrets() {
+function create_tls_secrets() {
   echo "Creating TLS Kafka secret"
   STRIMZI_CRT=$(kubectl -n kafka get secret my-cluster-cluster-ca-cert --template='{{index .data "ca.crt"}}' | base64 --decode )
   TLSUSER_CRT=$(kubectl -n kafka get secret my-tls-user --template='{{index .data "user.crt"}}' | base64 --decode )
   TLSUSER_KEY=$(kubectl -n kafka get secret my-tls-user --template='{{index .data "user.key"}}' | base64 --decode )
-  SASL_PASSWD=$(kubectl -n kafka get secret my-sasl-user --template='{{index .data "password"}}' | base64 --decode )
 
   kubectl create secret --namespace knative-eventing generic strimzi-tls-secret \
     --from-literal=ca.crt="$STRIMZI_CRT" \
     --from-literal=user.crt="$TLSUSER_CRT" \
     --from-literal=user.key="$TLSUSER_KEY"
+}
+
+function create_sasl_secrets() {
+  echo "Creating SASL Kafka secret"
+  STRIMZI_CRT=$(kubectl -n kafka get secret my-cluster-cluster-ca-cert --template='{{index .data "ca.crt"}}' | base64 --decode )
+  SASL_PASSWD=$(kubectl -n kafka get secret my-sasl-user --template='{{index .data "password"}}' | base64 --decode )
 
   kubectl create secret --namespace knative-eventing generic strimzi-sasl-secret \
     --from-literal=ca.crt="$STRIMZI_CRT" \
@@ -437,12 +442,22 @@ function parse_flags() {
       TEST_CONSOLIDATED_CHANNEL=1
       return 1
       ;;
+    --consolidated-tls)
+      TEST_CONSOLIDATED_CHANNEL_TLS=1
+      return 1
+      ;;
+    --consolidated-sasl)
+      TEST_CONSOLIDATED_CHANNEL_SASL=1
+      return 1
+      ;;
   esac
   return 0
 }
 
 TEST_CONSOLIDATED_CHANNEL=${TEST_CONSOLIDATED_CHANNEL:-0}
 TEST_DISTRIBUTED_CHANNEL=${TEST_DISTRIBUTED_CHANNEL:-0}
+TEST_CONSOLIDATED_CHANNEL_TLS=${TEST_CONSOLIDATED_CHANNEL_TLS:-0}
+TEST_CONSOLIDATED_CHANNEL_SASL=${TEST_CONSOLIDATED_CHANNEL_SASL:-0}
 
 echo "e2e-tests.sh command line: $@"
 
@@ -453,6 +468,8 @@ initialize $@ --skip-istio-addon
 echo "e2e-tests.sh environment:"
 echo "TEST_CONSOLIDATED_CHANNEL: ${TEST_CONSOLIDATED_CHANNEL}"
 echo "TEST_DISTRIBUTED_CHANNEL: ${TEST_DISTRIBUTED_CHANNEL}"
+echo "TEST_CONSOLIDATED_CHANNEL_TLS: ${TEST_CONSOLIDATED_CHANNEL_TLS}"
+echo "TEST_CONSOLIDATED_CHANNEL_SASL: ${TEST_CONSOLIDATED_CHANNEL_SASL}"
 
 # If neither test was specified, run both
 if [[ $TEST_CONSOLIDATED_CHANNEL != 1 ]] && [[ $TEST_DISTRIBUTED_CHANNEL != 1 ]]; then
@@ -464,8 +481,15 @@ export SYSTEM_NAMESPACE
 
 if [[ $TEST_CONSOLIDATED_CHANNEL == 1 ]]; then
   test_consolidated_channel_plain || exit 1
-  create_auth_secrets
+fi
+
+if [[ $TEST_CONSOLIDATED_CHANNEL_TLS == 1 ]]; then
+  create_tls_secrets
   test_consolidated_channel_tls || exit 1
+fi
+
+if [[ $TEST_CONSOLIDATED_CHANNEL_SASL == 1 ]]; then
+  create_sasl_secrets
   test_consolidated_channel_sasl || exit 1
 fi
 
diff --git a/vendor/knative.dev/eventing/test/e2e-common.sh b/vendor/knative.dev/eventing/test/e2e-common.sh
index 12c476350..f36607eb5 100644
--- a/vendor/knative.dev/eventing/test/e2e-common.sh
+++ b/vendor/knative.dev/eventing/test/e2e-common.sh
@@ -65,14 +65,6 @@ export SYSTEM_NAMESPACE
 SYSTEM_NAMESPACE="${SYSTEM_NAMESPACE:-"knative-eventing-"$(cat /dev/urandom \
   | tr -dc 'a-z0-9' | fold -w 10 | head -n 1)}"
 
-latest_version() {
-  local semver=$(git describe --match "v[0-9]*" --abbrev=0)
-  local major_minor=$(echo "$semver" | cut -d. -f1-2)
-
-  # Get the latest patch release for the major minor
-  git tag -l "${major_minor}*" | sort -r --version-sort | head -n1
-}
-
 # Latest release. If user does not supply this as a flag, the latest
 # tagged release on the current branch will be used.
 readonly LATEST_RELEASE_VERSION=$(latest_version)
diff --git a/vendor/knative.dev/eventing/test/e2e-tests.sh b/vendor/knative.dev/eventing/test/e2e-tests.sh
index b5a47cebe..81be13bb8 100644
--- a/vendor/knative.dev/eventing/test/e2e-tests.sh
+++ b/vendor/knative.dev/eventing/test/e2e-tests.sh
@@ -32,6 +32,9 @@ source "$(dirname "$0")/e2e-common.sh"
 
 initialize $@ --skip-istio-addon
 
+echo "Running E2E Reconciler Tests"
+go_test_e2e -timeout=30m -parallel=12 ./test/rekt || fail_test
+
 echo "Running E2E tests for: Multi Tenant Channel Based Broker, Channel (v1beta1, v1), InMemoryChannel (v1beta1, v1) , ApiServerSource (v1beta1, v1), ContainerSource (v1alpha2, v1) and PingSource (v1beta1, v1beta2)"
 go_test_e2e -timeout=30m -parallel=12 ./test/e2e \
   -brokerclass=MTChannelBasedBroker \