Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump sarama to v1.41.2 #3348

Merged
merged 2 commits into from
Sep 22, 2023
Merged

Conversation

dnwe
Copy link
Contributor

@dnwe dnwe commented Sep 19, 2023

Proposed Changes

chore(deps): bump sarama to v1.41.2

Note: the module path has changed to github.com/IBM/sarama since ownership transitioned away from Shopify

Additionally use sarama.DefaultVersion as the default config (rather than sarama.MaxVersion) if the user hasn't specified an explicit sarama.config.Version in their config-kafka ConfigMap

Release Note

Migrate to github.com/IBM/sarama and use the latest version for improved protocol support and adherence.
If your target Kafka cluster version is older than 2.1.0 then ensure you set a matching sarama.config.Version in your config-kafka ConfigMap.

@knative-prow
Copy link

knative-prow bot commented Sep 19, 2023

Welcome @dnwe! It looks like this is your first PR to knative-extensions/eventing-kafka-broker 🎉

@knative-prow knative-prow bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 19, 2023
@knative-prow
Copy link

knative-prow bot commented Sep 19, 2023

Hi @dnwe. Thanks for your PR.

I'm waiting for a knative-extensions member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@knative-prow knative-prow bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Sep 19, 2023
@pierDipi
Copy link
Member

/ok-to-test

@knative-prow knative-prow bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 19, 2023
@pierDipi
Copy link
Member

Thank you

@codecov
Copy link

codecov bot commented Sep 19, 2023

Codecov Report

Merging #3348 (ec0769b) into main (e7f53ae) will increase coverage by 0.04%.
Report is 1 commits behind head on main.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##               main    #3348      +/-   ##
============================================
+ Coverage     61.61%   61.66%   +0.04%     
- Complexity      768      769       +1     
============================================
  Files           182      182              
  Lines         12331    12331              
  Branches        268      268              
============================================
+ Hits           7598     7604       +6     
+ Misses         4136     4132       -4     
+ Partials        597      595       -2     
Flag Coverage Δ
java-unittests 71.01% <ø> (+0.09%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
control-plane/pkg/kafka/client.go 13.04% <0.00%> (ø)
control-plane/pkg/kafka/consumer_group.go 58.62% <ø> (ø)
control-plane/pkg/kafka/consumer_group_lag.go 62.59% <ø> (ø)
control-plane/pkg/kafka/topic.go 80.80% <ø> (ø)
control-plane/pkg/reconciler/broker/controller.go 73.68% <ø> (ø)
...ane/pkg/reconciler/broker/namespaced_controller.go 0.00% <ø> (ø)
control-plane/pkg/reconciler/channel/channel.go 69.10% <ø> (ø)
control-plane/pkg/reconciler/channel/controller.go 90.42% <ø> (ø)
...ntrol-plane/pkg/reconciler/channel/v2/channelv2.go 70.96% <ø> (ø)
...ol-plane/pkg/reconciler/channel/v2/controllerv2.go 92.10% <ø> (ø)
... and 8 more

... and 1 file with indirect coverage changes

@dnwe dnwe force-pushed the sarama branch 3 times, most recently from 894266e to 3c6faa1 Compare September 19, 2023 12:34
@dnwe
Copy link
Contributor Author

dnwe commented Sep 19, 2023

Hmmm looking over these test results:

Error from server (BadRequest): error when creating "test/config/sacura-sink-source/resources/100-source.yaml": admission webhook "validation.webhook.kafka.eventing.knative.dev" denied the request: validation failed: invalid value: : spec.initialOffset

switch kss.InitialOffset {
case OffsetEarliest, OffsetLatest:
default:
errs = errs.Also(apis.ErrInvalidValue(kss.InitialOffset, "initialOffset"))
}

Not quite sure why this is failing the validation with an empty value, as the defaults func should have initialised it to OffsetLatest

if k.Spec.InitialOffset == "" {
k.Spec.InitialOffset = OffsetLatest
}

@dnwe
Copy link
Contributor Author

dnwe commented Sep 19, 2023

In the other tests, strimzi seems to be struggling:

Error from server (InternalError): error when retrieving current configuration of:
Resource: "rbac.authorization.k8s.io/v1, Resource=rolebindings", GroupVersionKind: "rbac.authorization.k8s.io/v1, Kind=RoleBinding"
Name: "strimzi-cluster-operator", Namespace: "kafka"
from server for: "STDIN": an error on the server ("Internal Server Error: "/apis/rbac.authorization.k8s.io/v1/namespaces/kafka/rolebindings/strimzi-cluster-operator": the server is currently unable to handle the request") has prevented the request from succeeding (get rolebindings.rbac.authorization.k8s.io strimzi-cluster-operator)

@dnwe
Copy link
Contributor Author

dnwe commented Sep 19, 2023

/retest

@Cali0707
Copy link
Member

@dnwe could you run hack/update-codegen.sh? That should fix the build tests

Note: the module path has changed to github.com/IBM/sarama since ownership transitioned away from Shopify

Signed-off-by: Dominic Evans <dominic.evans@uk.ibm.com>
If the user hasn't specified an explicit sarama.config.Version in their
config-kafka ConfigMap then use sarama's DefaultVersion rather than
setting MaxVersion (which is rarely what the user will want).

Signed-off-by: Dominic Evans <dominic.evans@uk.ibm.com>
@dnwe
Copy link
Contributor Author

dnwe commented Sep 20, 2023

/retest-required

2 similar comments
@dnwe
Copy link
Contributor Author

dnwe commented Sep 20, 2023

/retest-required

@dnwe
Copy link
Contributor Author

dnwe commented Sep 21, 2023

/retest-required

@matzew
Copy link
Contributor

matzew commented Sep 21, 2023

/retest

1 similar comment
@matzew
Copy link
Contributor

matzew commented Sep 22, 2023

/retest

@@ -56,7 +56,7 @@ type NewClientFunc func(addrs []string, config *sarama.Config) (sarama.Client, e
// GetSaramaConfig returns Kafka Client configuration with the given options applied.
func GetSaramaConfig(configOptions ...ConfigOption) (*sarama.Config, error) {
config := sarama.NewConfig()
config.Version = sarama.MaxVersion
config.Version = sarama.DefaultVersion
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this due to newer version?

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

/retest

@knative-prow knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label Sep 22, 2023
@knative-prow
Copy link

knative-prow bot commented Sep 22, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dnwe, 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 knative-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 22, 2023
@matzew
Copy link
Contributor

matzew commented Sep 22, 2023

/test channel-integration-tests-sasl-plain

1 similar comment
@matzew
Copy link
Contributor

matzew commented Sep 22, 2023

/test channel-integration-tests-sasl-plain

@knative-prow
Copy link

knative-prow bot commented Sep 22, 2023

@dnwe: 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-keda_eventing-kafka-broker_main ec0769b link false /test reconciler-tests-keda
reconciler-tests-loom_eventing-kafka-broker_main ec0769b link false /test reconciler-tests-loom
reconciler-tests-namespaced-broker-loom_eventing-kafka-broker_main ec0769b link false /test reconciler-tests-namespaced-broker-loom

Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@matzew
Copy link
Contributor

matzew commented Sep 22, 2023

/test channel-integration-tests-sasl-plain

@knative-prow knative-prow bot merged commit 5c4461d into knative-extensions:main Sep 22, 2023
@matzew
Copy link
Contributor

matzew commented Sep 22, 2023

@dnwe thanks for the help!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane area/data-plane area/test lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants