From 6a6d9574ccb05531008aa6dee8b0da0af7aac333 Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Mon, 20 Oct 2025 10:45:59 +0200
Subject: [PATCH 1/2] tests: raise timeouts for kraft operations

---
 tests/templates/kuttl/operations-kraft/20-assert.yaml.j2 | 4 ++--
 tests/templates/kuttl/operations-kraft/30-assert.yaml.j2 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/templates/kuttl/operations-kraft/20-assert.yaml.j2 b/tests/templates/kuttl/operations-kraft/20-assert.yaml.j2
index 6ac28598..fd724ccd 100644
--- a/tests/templates/kuttl/operations-kraft/20-assert.yaml.j2
+++ b/tests/templates/kuttl/operations-kraft/20-assert.yaml.j2
@@ -1,9 +1,9 @@
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 300
+timeout: 600
 commands:
-  - script: kubectl -n $NAMESPACE wait --for=condition=available kafkaclusters.kafka.stackable.tech/test-kafka --timeout 301s
+  - script: kubectl -n $NAMESPACE wait --for=condition=available kafkaclusters.kafka.stackable.tech/test-kafka --timeout 601s
 ---
 apiVersion: apps/v1
 kind: StatefulSet
diff --git a/tests/templates/kuttl/operations-kraft/30-assert.yaml.j2 b/tests/templates/kuttl/operations-kraft/30-assert.yaml.j2
index eba45c7c..c7a90a43 100644
--- a/tests/templates/kuttl/operations-kraft/30-assert.yaml.j2
+++ b/tests/templates/kuttl/operations-kraft/30-assert.yaml.j2
@@ -1,9 +1,9 @@
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 300
+timeout: 600
 commands:
-  - script: kubectl -n $NAMESPACE wait --for=condition=stopped kafkaclusters.kafka.stackable.tech/test-kafka --timeout 301s
+  - script: kubectl -n $NAMESPACE wait --for=condition=stopped kafkaclusters.kafka.stackable.tech/test-kafka --timeout 601s
 ---
 apiVersion: apps/v1
 kind: StatefulSet

From 6b421ba8b9daf36b01af0809f6c031950f0a7f46 Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Mon, 20 Oct 2025 11:49:09 +0200
Subject: [PATCH 2/2] raise pre stop controller seconds to 10

---
 rust/operator-binary/src/resource/statefulset.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/operator-binary/src/resource/statefulset.rs b/rust/operator-binary/src/resource/statefulset.rs
index 182c1839..0acf2719 100644
--- a/rust/operator-binary/src/resource/statefulset.rs
+++ b/rust/operator-binary/src/resource/statefulset.rs
@@ -650,7 +650,7 @@ pub fn build_controller_rolegroup_statefulset(
             kafka_security,
             &resolved_product_image.product_version,
         )])
-        .add_env_var("PRE_STOP_CONTROLLER_SLEEP_SECONDS", "5")
+        .add_env_var("PRE_STOP_CONTROLLER_SLEEP_SECONDS", "10")
         .add_env_var(
             "EXTRA_ARGS",
             kafka_role