Add version field to KafkaConnector and KafkaMirrorMaker2 CR #12002

katheris · 2025-10-09T14:18:19Z

Type of change

Select the type of your PR

Enhancement / new feature

Description

Add version field to KafkaConnector and KafkaMirrorMaker2 CR. This implements proposal #118

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

katheris · 2025-10-09T14:21:06Z

...in/java/io/strimzi/operator/cluster/operator/assembly/KafkaMirrorMaker2AssemblyOperator.java

                .onComplete(reconciliationResult -> {
+                    // Extract warning conditions from reconciliation
+                    List<Condition> warningConditions = kafkaMirrorMaker2Status.getConditions();
                    StatusUtils.setStatusConditionAndObservedGeneration(kafkaMirrorMaker2, kafkaMirrorMaker2Status, reconciliationResult.cause());


Here the call to setStatusConditionAndObservedGeneration overwrites any of the conditions set in the status previously. Since in a future release the connector.plugin.version will be added to the forbidden list I decided not to add an additional method to StatusUtils to add the status condition and observed generation. Instead storing and adding the warning afterwards means we can more easily remove this new code when it is no longer needed.

We could of course change this behaviour to properly handle any status that has been set, but that is out of scope for this particular issue.

Signed-off-by: Kate Stanley <[email protected]>

codecov · 2025-10-09T17:14:09Z

Codecov Report

❌ Patch coverage is 93.75000% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 74.94%. Comparing base (089ecbb) to head (6b0d909).
⚠️ Report is 19 commits behind head on main.

Files with missing lines	Patch %	Lines
...ter/operator/assembly/AbstractConnectOperator.java	91.66%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #12002      +/-   ##
============================================
+ Coverage     74.90%   74.94%   +0.03%     
- Complexity     6441     6448       +7     
============================================
  Files           343      343              
  Lines         24324    24337      +13     
  Branches       3196     3200       +4     
============================================
+ Hits          18221    18239      +18     
+ Misses         4829     4826       -3     
+ Partials       1274     1272       -2

Files with missing lines	Coverage Δ
...tor/cluster/model/KafkaMirrorMaker2Connectors.java	`90.71% <100.00%> (+0.06%)`	⬆️
...or/assembly/KafkaMirrorMaker2AssemblyOperator.java	`86.09% <100.00%> (+0.22%)`	⬆️
...ter/operator/assembly/AbstractConnectOperator.java	`85.35% <91.66%> (+0.08%)`	⬆️

... and 4 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

katheris · 2025-10-09T18:52:57Z

/azp run regression

azure-pipelines · 2025-10-09T18:55:46Z

Azure Pipelines successfully started running 1 pipeline(s).

scholzj

Some nits. LGTM otherwise.

CHANGELOG.md

scholzj · 2025-10-12T19:49:56Z

CHANGELOG.md

 * The `.spec.build.output.additionalKanikoOptions` field in the `KafkaConnect` custom resource is deprecated and will be removed in the future. 
  * Use `.spec.build.output.additionalBuildOptions` field instead.
 * Kafka nodes are now configured with PEM certificates instead of P12/JKS for keystore and truststore.
+* Configuring `connector.plugin.version` under `spec.config` in the `KafkaConnector` custom resource, and under `spec.mirrors[].sourceConnector.config`, `spec.mirrors[].checkpointConnector.config`, and `spec.mirrors[].heartbeatConnector.config` in the `KafkaMirrorMaker2` custom resource is deprecated and will be forbidden in the future.


Should you say right away that it will be forbidden from Strimzi 0.50 on?

Yeah good point, I'll update it

scholzj · 2025-10-12T19:50:15Z

CHANGELOG.md

  * Use `.spec.build.output.additionalBuildOptions` field instead.
 * Kafka nodes are now configured with PEM certificates instead of P12/JKS for keystore and truststore.
+* Configuring `connector.plugin.version` under `spec.config` in the `KafkaConnector` custom resource, and under `spec.mirrors[].sourceConnector.config`, `spec.mirrors[].checkpointConnector.config`, and `spec.mirrors[].heartbeatConnector.config` in the `KafkaMirrorMaker2` custom resource is deprecated and will be forbidden in the future.
+  * Use `spec.version` in the `KafkaConnecter` custom resource, and `spec.mirrors[].sourceConnector.version`, `spec.mirrors[].checkpointConnector.version`, and `spec.mirrors[].heartbeatConnector.version` in the `KafkaMirrorMaker2` custom resource.


Would it be more readable as a single bullet point?

Suggested change

* Use `spec.version` in the `KafkaConnecter` custom resource, and `spec.mirrors[].sourceConnector.version`, `spec.mirrors[].checkpointConnector.version`, and `spec.mirrors[].heartbeatConnector.version` in the `KafkaMirrorMaker2` custom resource.

Use `spec.version` in the `KafkaConnecter` custom resource, and `spec.mirrors[].sourceConnector.version`, `spec.mirrors[].checkpointConnector.version`, and `spec.mirrors[].heartbeatConnector.version` in the `KafkaMirrorMaker2` custom resource.

I'm not sure, it's quite a wall of text so the bullet point helps to distinguish the part that's deprecated from the new advice. Do you think we need to have the full description of the new fields? Does this make it more readable:

Suggested change

* Use `spec.version` in the `KafkaConnecter` custom resource, and `spec.mirrors[].sourceConnector.version`, `spec.mirrors[].checkpointConnector.version`, and `spec.mirrors[].heartbeatConnector.version` in the `KafkaMirrorMaker2` custom resource.

* Use `spec.version` in the `KafkaConnecter` custom resource, and the connector specific `version` fields in the `KafkaMirrorMaker2` custom resource.

TBH, I think too much formatting in the CHANGELOG makes it much harder to read as it makes it harder to process what the different changes are and what is part of the same change. Especially when you see it as raw markdown. That is why I see the second-level bullet point as a distraction rather than something that helps the readability.

I think the shorter description is fine over the long one. I understand that adding the version field to the MM2 connectors makes sense in the long term for symmetry with KafkaConnector. But we do not expect today any environments with different versions of the MM2 connectors, as they are built-in. So I think the MM2 part of this is mostly irrelevant and can be reduced to minimal text like this.

I was viewing in preview rather than raw markdown, but regardless I'm happy with removing the bullet point with the shorter text, so I've updated it. Take a look and see if that looks better

...tor/src/main/java/io/strimzi/operator/cluster/operator/assembly/AbstractConnectOperator.java

Signed-off-by: Kate Stanley <[email protected]>

The version fields are not expected to be used much in the KafkaMirrorMaker2 CR since the connectors are part of the Connect image already. Also the heartbeat connector is being removed from the KafkaMirrorMaker2 CR. As a result it seems unnecessary to fully list the new fields for KafkaMirrorMaker2 CR. Signed-off-by: Kate Stanley <[email protected]>

scholzj

LGTM. Thanks.

katheris commented Oct 9, 2025

View reviewed changes

katheris force-pushed the 11009-multiple-connector-versions branch from 0f47387 to 9895074 Compare October 9, 2025 14:22

Add version field to KafkaConnector and KafkaMirrorMaker2 CR

3fc343d

Signed-off-by: Kate Stanley <[email protected]>

katheris force-pushed the 11009-multiple-connector-versions branch from 9895074 to 3fc343d Compare October 9, 2025 16:30

katheris added this to the 0.49.0 milestone Oct 9, 2025

scholzj reviewed Oct 12, 2025

View reviewed changes

scholzj added this to Roadmap Oct 12, 2025

scholzj moved this to 0.49.0 (Work in Progress) in Roadmap Oct 12, 2025

ppatierno approved these changes Oct 13, 2025

View reviewed changes

katheris mentioned this pull request Oct 13, 2025

[Enhancement]: Add connector.plugin.version to forbidden list #12027

Open

katheris added 2 commits October 13, 2025 11:19

Address scholzj review comments

512e403

Signed-off-by: Kate Stanley <[email protected]>

scholzj approved these changes Oct 13, 2025

View reviewed changes

katheris merged commit cce6139 into strimzi:main Oct 13, 2025
22 checks passed

	* Use `spec.version` in the `KafkaConnecter` custom resource, and `spec.mirrors[].sourceConnector.version`, `spec.mirrors[].checkpointConnector.version`, and `spec.mirrors[].heartbeatConnector.version` in the `KafkaMirrorMaker2` custom resource.
	Use `spec.version` in the `KafkaConnecter` custom resource, and `spec.mirrors[].sourceConnector.version`, `spec.mirrors[].checkpointConnector.version`, and `spec.mirrors[].heartbeatConnector.version` in the `KafkaMirrorMaker2` custom resource.

Add version field to KafkaConnector and KafkaMirrorMaker2 CR #12002

Add version field to KafkaConnector and KafkaMirrorMaker2 CR #12002

Uh oh!

Conversation

katheris commented Oct 9, 2025

Type of change

Description

Checklist

Uh oh!

katheris Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

katheris commented Oct 9, 2025

Uh oh!

azure-pipelines bot commented Oct 9, 2025

Uh oh!

scholzj left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

scholzj Oct 12, 2025

Choose a reason for hiding this comment

Uh oh!

katheris Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

scholzj Oct 12, 2025

Choose a reason for hiding this comment

Uh oh!

katheris Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

scholzj Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

katheris Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

scholzj left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

katheris Oct 9, 2025 •

edited

Loading

codecov bot commented Oct 9, 2025 •

edited

Loading