extend the EntityOperator, CruiseControl and KafkaExporter to support PDB by KyriosGN0 · Pull Request #11699 · strimzi/strimzi-kafka-operator

KyriosGN0 · 2025-07-26T13:28:53Z

Type of change

Select the type of your PR

Enhancement / new feature

Description

This PR adds PDB for EntityOperator, CruiseControl and KafkaExporter deployment
fixes #11402

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

KyriosGN0 · 2025-07-26T21:57:05Z

i tested locally and all of the tests did pass, also i deployed it locally to a kind cluster and saw that a PDB was created for each with allowedDisturption=1

scholzj

Thanks for the PR. I left some comments, but it looks mostly good. 👍

scholzj · 2025-07-27T10:39:06Z

/azp run regression

azure-pipelines · 2025-07-27T10:39:17Z

Azure Pipelines successfully started running 1 pipeline(s).

KyriosGN0 · 2025-07-30T07:10:20Z

@scholzj updated the PR to support CC as well,
about the whitespace in Changelog, its my vscode that has this config, if its really problematic i will go and change the changelog file manually to revert the whitespace changes, Let me know.

scholzj

Few more nits. But LGTM otherwise. Thanks.

scholzj · 2025-07-30T18:47:38Z

/azp run regression

azure-pipelines · 2025-07-30T18:47:51Z

Azure Pipelines successfully started running 1 pipeline(s).

scholzj

Great, thanks a lot.

scholzj · 2025-08-13T20:21:59Z

@katheris Any chance you can have a look at this please?

katheris

Thanks for the PR @KyriosGN0. I found a couple of JavaDoc nits, but also it looks like the step to create the Pod Disruption Budget is in the wrong place for Cruise Control reconciler.

Finally I wanted to confirm my understanding of the change with regards to Cruise Control. The Cruise Control template already supports Pod Disruption Budget, so is that just being ignored in the main branch today?

katheris · 2025-08-18T09:44:33Z

                result.templateService = template.getApiService();
                result.templateServiceAccount = template.getServiceAccount();
                result.templateContainer = template.getCruiseControlContainer();
+                result.templatePodDisruptionBudget = template.getPodDisruptionBudget();


The getPodDisruptionBudget() method is already present in Cruise Control, so is the current state that Cruise Control had it as part of the template, but we were ignoring it? @kyguy can you confirm whether PodDisruptionBudget is already supported for Cruise Control?

The getPodDisruptionBudget() method is already present in Cruise Control, so is the current state that Cruise Control had it as part of the template, but we were ignoring it?

Yes, we were ignoring it. It looks like I added the template years ago but never added the spec or reconciliation bits.

can you confirm whether PodDisruptionBudget is already supported for Cruise Control?

I can confirm it is not currently supported for Cruise Control.

katheris · 2025-08-18T10:03:13Z

  The `strimzi.io/node-pools` and `strimzi.io/kraft` annotations are not required anymore and will be ignored if set.
 * Make properties `broker.session.timeout.ms`, `broker.heartbeat.interval.ms` and `controller.socket.timeout.ms` configurable
 * Add monitoring of custom resources using [kubernetes-state-metrics (KSM)](https://github.com/kubernetes/kube-state-metrics) (see [Strimzi proposal 087](https://github.com/strimzi/proposals/blob/main/087-monitoring-of-custom-resources.md))
+* Extend the EntityOperator, Cruise Control and KafkaExporter deployment to support PDB.


I think this could be a little clearer, e.g. Extend the EntityOperator, Cruise Control and KafkaExporter deployment to support PDB via the template section in the CR spec.

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

KyriosGN0 · 2025-08-18T17:51:23Z

@katheris Thanks for the review, i addressed your comments, and yes, i think that up until now the PDB of CC was in the CRD but it was ignored, but i never tried it so i cannot confirm 100%

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

katheris

Thanks @KyriosGN0 I'm happy with these changes. I've asked @kyguy to take a look at the Cruise Control parts so will hold off merging until he's reviewed

kyguy

@katheris The Cruise Control parts look good! Nice work @KyriosGN0

kyguy · 2025-08-20T23:48:21Z

                result.templateService = template.getApiService();
                result.templateServiceAccount = template.getServiceAccount();
                result.templateContainer = template.getCruiseControlContainer();
+                result.templatePodDisruptionBudget = template.getPodDisruptionBudget();


The getPodDisruptionBudget() method is already present in Cruise Control, so is the current state that Cruise Control had it as part of the template, but we were ignoring it?

Yes, we were ignoring it. It looks like I added the template years ago but never added the spec or reconciliation bits.

can you confirm whether PodDisruptionBudget is already supported for Cruise Control?

I can confirm it is not currently supported for Cruise Control.

katheris · 2025-08-21T09:00:59Z

Thanks for the PR @KyriosGN0

… PDB (strimzi#11699) Signed-off-by: AvivGuiser <avivguiser@gmail.com>

KyriosGN0 force-pushed the crd-pdb branch from ce12005 to 806625b Compare July 26, 2025 13:31

KyriosGN0 marked this pull request as ready for review July 26, 2025 21:56

scholzj added this to the 0.48.0 milestone Jul 27, 2025

scholzj reviewed Jul 27, 2025

View reviewed changes

scholzj requested a review from katheris July 27, 2025 09:30

KyriosGN0 changed the title ~~extend the EntityOperator and KafkaExporter to support PDB~~ extend the EntityOperator, CruiseControl and KafkaExporter to support PDB Jul 30, 2025

scholzj reviewed Jul 30, 2025

View reviewed changes

Comment thread CHANGELOG.md Outdated

Comment thread cluster-operator/src/test/java/io/strimzi/operator/cluster/model/CruiseControlTest.java

KyriosGN0 requested a review from scholzj August 1, 2025 08:44

scholzj approved these changes Aug 1, 2025

View reviewed changes

katheris reviewed Aug 18, 2025

View reviewed changes

KyriosGN0 added 10 commits August 18, 2025 20:24

extend the EntityOperator and KafkaExporter to support PDB

799c185

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

update docs

e96c39e

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

Update derived resources

181aab6

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

extend the EntityOperator and KafkaExporter to support PDB

348be52

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

Fix tests

fe24555

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

Fix tests

fe3c7ba

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

add PDB for CruiseControl and andress PR review comments

31801ff

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

add tests to CC about PDB and fix changelog

5984b19

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

add CC PDB note to docs

f17daf5

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

address PR comments

b0e6b47

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

KyriosGN0 force-pushed the crd-pdb branch from 6d17198 to b0e6b47 Compare August 18, 2025 17:48

address PR comments

35a3a53

Signed-off-by: AvivGuiser <avivguiser@gmail.com>

katheris approved these changes Aug 20, 2025

View reviewed changes

kyguy approved these changes Aug 20, 2025

View reviewed changes

katheris merged commit 7cd6fc5 into strimzi:main Aug 21, 2025
13 checks passed

KyriosGN0 deleted the crd-pdb branch August 21, 2025 09:59

scholzj added this to Roadmap Aug 23, 2025

scholzj moved this to 0.48.0 (Work in Progress) in Roadmap Aug 23, 2025

see-quick pushed a commit to see-quick/strimzi-kafka-operator that referenced this pull request Sep 4, 2025

Extend the EntityOperator, CruiseControl and KafkaExporter to support…

e47640f

… PDB (strimzi#11699) Signed-off-by: AvivGuiser <avivguiser@gmail.com>

Conversation

KyriosGN0 commented Jul 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Type of change

Description

Checklist

Uh oh!

KyriosGN0 commented Jul 26, 2025

Uh oh!

scholzj left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

scholzj commented Jul 27, 2025

Uh oh!

azure-pipelines bot commented Jul 27, 2025

Uh oh!

KyriosGN0 commented Jul 30, 2025

Uh oh!

scholzj left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

scholzj commented Jul 30, 2025

Uh oh!

azure-pipelines bot commented Jul 30, 2025

Uh oh!

scholzj left a comment

Choose a reason for hiding this comment

Uh oh!

scholzj commented Aug 13, 2025

Uh oh!

katheris left a comment

Choose a reason for hiding this comment

Uh oh!

katheris Aug 18, 2025

Choose a reason for hiding this comment

Uh oh!

kyguy Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

katheris Aug 18, 2025

Choose a reason for hiding this comment

Uh oh!

KyriosGN0 Aug 18, 2025

Choose a reason for hiding this comment

Uh oh!

KyriosGN0 commented Aug 18, 2025

Uh oh!

katheris left a comment

Choose a reason for hiding this comment

Uh oh!

kyguy left a comment • 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!

kyguy Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

katheris commented Aug 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

KyriosGN0 commented Jul 26, 2025 •

edited

Loading

kyguy left a comment •

edited

Loading