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.

Sign up for GitHub

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

Jump to bottom

#8732 Enhance KafkaBridge resource with consumer inactivity timeout and HTTP consumer/producer parts enablement #9820

Merged
merged 36 commits into from
May 15, 2024
Merged

#8732 Enhance KafkaBridge resource with consumer inactivity timeout and HTTP consumer/producer parts enablement #9820

merged 36 commits into from
May 15, 2024

Conversation

steffen-karlsson
Copy link
Contributor

@steffen-karlsson steffen-karlsson commented Mar 12, 2024 •
edited

Type of change

Description

Adding CRD Kubernetes API support for following KafkaBridge properties:
http.consumer.timeoutSeconds - for deleting inactive consumers after a timeout (disabled by default)
http.consumer.enabled - to enable/disable the HTTP consumer part (enabled by default)
http.producer.enabled - to enable/disable the HTTP producer part (enabled by default)

Checklist

Please go through this checklist and make sure all applicable tasks have been done

  • Write tests
  • Make sure all tests pass
  • Update documentation
  • Check RBAC rights for Kubernetes / OpenShift roles
  • Try your changes from Pod inside your Kubernetes and OpenShift cluster, not just locally
  • Reference relevant issue(s) and close them after merging
  • Update CHANGELOG.md
  • Supply screenshots for visual changes, such as Grafana dashboards

@steffen-karlsson steffen-karlsson mentioned this pull request Mar 12, 2024
Merged
@steffen-karlsson
Copy link
Contributor Author

Missing last part of documentation, will do when discussion in issue is settled: #8732

@steffen-karlsson steffen-karlsson force-pushed the 8732-enhance-kafkabridge branch 2 times, most recently from 129ac78 to b5a884f Compare March 12, 2024 19:44
@scholzj scholzj added this to the 0.41.0 milestone Mar 12, 2024
@scholzj scholzj requested a review from ppatierno March 12, 2024 22:41
scholzj
scholzj reviewed Mar 12, 2024
View reviewed changes
Copy link
Member

@scholzj scholzj left a comment

Choose a reason for hiding this comment

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

I left some comments. I the CI failed because of spotbugs. It would also fail because the CRD files are not copied to all the places. You can use make crd_install for that.

api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeHttpConfig.java Outdated Show resolved Hide resolved
api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeHttpConfig.java Outdated Show resolved Hide resolved
api/src/main/java/io/strimzi/api/kafka/model/common/ClientTls.java Outdated Show resolved Hide resolved
@steffen-karlsson steffen-karlsson force-pushed the 8732-enhance-kafkabridge branch 3 times, most recently from 92bcc15 to 2233def Compare March 13, 2024 17:36
@steffen-karlsson
Improved reusability by moving into separate function to use in Kafka…
0fb606b 
…Connect and KafkaBridge

Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Adding objects to include into http for enabling consumer and `pr…
211d1f1 
…oducer`

Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Adding timeoutSeconds , consumer and producer to http config
bfb4299 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Rewriting env generation to reduce cognitive complexity
695b5da 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Adding tests for timeoutSeconds , consumer and producer
59678c4 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Updating HttpConfig with timeoutSeconds
144151a 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Fixing bugs by pipeline
ae65e04 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Removing host again as per suggestion
2da7d13 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Adding bridge CRD
452d181 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Moving to cluster operator to ModelUtils
6300db7 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Unused imports
8ee9489 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson steffen-karlsson mentioned this pull request Mar 14, 2024
Merged
@steffen-karlsson steffen-karlsson marked this pull request as ready for review May 7, 2024 07:10
@steffen-karlsson
Updating crd and docs to new names
a55454d 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Fixing spotbug: KafkaBridgeCluster.http not initialized in constructo…
a6dc90c 
…r and dereferenced in io.strimzi.operator.cluster.model.KafkaBridgeCluster.addCorsEnvVars(List) [io.strimzi.operator.cluster.model.KafkaBridgeCluster] At KafkaBridgeCluster.java:[line 453] UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR

Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Revert logic back to main, too much commit
2bb1287 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@scholzj scholzj modified the milestones: 0.41.0, 0.42.0 May 7, 2024
@steffen-karlsson
Moving and to and instead of
d9f0402 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Updating documentation
d726cac 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Update derived resources
07be48d 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Fixing IT test for KafkaBridge
eba352a 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Consumer and Producer should always be initated otherwise enabled is …
8d07b18 
…not true by default

Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
scholzj
scholzj reviewed May 9, 2024
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeConsumerSpec.java Show resolved Hide resolved
api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeConsumerSpec.java Show resolved Hide resolved
api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeProducerSpec.java Show resolved Hide resolved
cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaBridgeCluster.java Show resolved Hide resolved
cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaBridgeCluster.java Show resolved Hide resolved
cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaBridgeCluster.java Outdated Show resolved Hide resolved
cluster-operator/src/test/java/io/strimzi/operator/cluster/model/KafkaBridgeClusterTest.java Outdated Show resolved Hide resolved
documentation/api/io.strimzi.api.kafka.model.bridge.KafkaBridgeConsumerSpec.adoc Outdated Show resolved Hide resolved
steffen-karlsson and others added 8 commits May 10, 2024 08:49
@steffen-karlsson
Extending documentation as per request
26928f7 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Review comment
9759bfc 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Moved to Release 0.42.0
f148dda 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Adding JsonInclude.Include.NON_DEFAULT
72b3083 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson @scholzj
Update documentation/api/io.strimzi.api.kafka.model.bridge.KafkaBridg…
38b1faa 
…eConsumerSpec.adoc

Co-authored-by: Jakub Scholz <www@scholzj.com>
Signed-off-by: Steffen Wirenfeldt Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Merge branch 'main' into 8732-enhance-kafkabridge
c21af96 
Signed-off-by: Steffen Wirenfeldt Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Updating CRDs
9acb682 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Remove default initialisation
2aef28e 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Update derived resources
3663890 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
@steffen-karlsson
Removed because of review comments
9e7e000 
Signed-off-by: Steffen Karlsson <steffen.karlsson@maersk.com>
scholzj
scholzj approved these changes May 15, 2024
View reviewed changes
Copy link
Member

@scholzj scholzj left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks.

ppatierno
ppatierno approved these changes May 15, 2024
View reviewed changes
Copy link
Member

@ppatierno ppatierno left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@scholzj
Copy link
Member

scholzj commented May 15, 2024

/azp run regression

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@scholzj scholzj linked an issue May 15, 2024 that may be closed by this pull request
Enhance KafkaBridge resource with consumer inactivity timeout and HTTP consumer/producer parts enablement #8732
Closed
@scholzj
Copy link
Member

scholzj commented May 15, 2024

Thanks for the PR.

@scholzj scholzj merged commit 2bf2be1 into strimzi:main May 15, 2024
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scholzj scholzj scholzj approved these changes

@ppatierno ppatierno ppatierno approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.42.0
Development

Successfully merging this pull request may close these issues.

Enhance KafkaBridge resource with consumer inactivity timeout and HTTP consumer/producer parts enablement
3 participants
@steffen-karlsson @scholzj @ppatierno