Skip to content
This repository has been archived by the owner on Sep 2, 2024. It is now read-only.

Allow consolidated channel to use distributed-style secret format #680

Merged

Conversation

eric-sap
Copy link
Contributor

@eric-sap eric-sap commented Jun 1, 2021

Fixes #679

Proposed Changes

  • 🐛 The consolidated channel can now use the distributed-channel-style secret format (in addition to the TLS/SASL information that is in the common configmap). The old secret format is also still supported for now.
  • 🧽 The consolidated channel now pays attention to the sarama.enableLogging field in the configmap

Release Note

Consolidated channel TLS/SASL secret format has changed.  No action necessary at this time (old format will continue to work).

@knative-prow-robot knative-prow-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 1, 2021
@google-cla google-cla bot added the cla: yes Indicates the PR's author has signed the CLA. label Jun 1, 2021
@codecov
Copy link

codecov bot commented Jun 1, 2021

Codecov Report

Merging #680 (f8489d2) into main (504c3be) will decrease coverage by 0.02%.
The diff coverage is 97.61%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #680      +/-   ##
==========================================
- Coverage   75.33%   75.30%   -0.03%     
==========================================
  Files         132      132              
  Lines        5782     5775       -7     
==========================================
- Hits         4356     4349       -7     
  Misses       1206     1206              
  Partials      220      220              
Impacted Files Coverage Δ
...consolidated/reconciler/controller/kafkachannel.go 49.03% <0.00%> (ø)
pkg/channel/consolidated/utils/util.go 100.00% <100.00%> (ø)
pkg/common/config/util.go 100.00% <100.00%> (ø)
pkg/common/kafka/sarama/sarama.go 98.33% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 504c3be...f8489d2. Read the comment docs.

@matzew
Copy link
Contributor

matzew commented Jun 2, 2021

/assign @aliok
Let's be careful about this, so that we do not break existing users

@aliok
Copy link
Member

aliok commented Jun 2, 2021

/test pull-knative-sandbox-eventing-kafka-integration-test-channel-consolidated-sasl

@aliok
Copy link
Member

aliok commented Jun 2, 2021

LGTM

I can have another look when the failing test got fixed.

Thanks for adding the backwards compatibility. We should remember to deprecate the old format in a few releases.

@eric-sap
Copy link
Contributor Author

eric-sap commented Jun 2, 2021

/hold
Would like to leave this at least overnight for comments since it's cross-channel-type again

@knative-prow-robot knative-prow-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 2, 2021
Copy link
Contributor

@travis-minke-sap travis-minke-sap left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good - couple minor nits... I'll leave it to the consolidated channel experts to merge since it's mostly adjusting their implementation.

pkg/common/config/util.go Show resolved Hide resolved
pkg/common/config/util.go Show resolved Hide resolved
@matzew
Copy link
Contributor

matzew commented Jun 2, 2021 via email

@matzew
Copy link
Contributor

matzew commented Jun 4, 2021

/test all

@matzew
Copy link
Contributor

matzew commented Jun 4, 2021

@travis-minke-sap @eric-sap we need to change the docs repo with this too .

I am not holding the PR for that. But please let's get some update there

Copy link
Contributor

@matzew matzew left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

/test all

@knative-prow-robot knative-prow-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 4, 2021
@knative-prow-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eric-sap, matzew

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@knative-prow-robot knative-prow-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 4, 2021
@knative-metrics-robot
Copy link

The following is the coverage report on the affected files.
Say /test pull-knative-sandbox-eventing-kafka-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/common/kafka/sarama/sarama.go 98.7% 98.7% -0.0

@eric-sap
Copy link
Contributor Author

eric-sap commented Jun 4, 2021

/unhold

@knative-prow-robot knative-prow-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 4, 2021
@knative-prow-robot knative-prow-robot merged commit b516810 into knative-extensions:main Jun 4, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cla: yes Indicates the PR's author has signed the CLA. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Consolidated and Distributed channel should use the same secret format
6 participants