From 4c7fb8ad8e53149bb41bc6390c471133cbe81ff0 Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Sun, 15 Dec 2024 17:03:50 +0100
Subject: [PATCH 1/2] reintroduce the CONTAINERDEBUG_LOG_DIRECTORY env var

---
 rust/operator-binary/src/druid_controller.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rust/operator-binary/src/druid_controller.rs b/rust/operator-binary/src/druid_controller.rs
index f7401236..e37fbaa7 100644
--- a/rust/operator-binary/src/druid_controller.rs
+++ b/rust/operator-binary/src/druid_controller.rs
@@ -1066,6 +1066,13 @@ fn build_rolegroup_statefulset(
         rest_env.extend(auth_config.get_env_var_mounts(druid, role))
     }
 
+    // Needed for the `containerdebug` process to log it's tracing information to.
+    rest_env.push(EnvVar {
+        name: "CONTAINERDEBUG_LOG_DIRECTORY".to_string(),
+        value: Some(format!("{STACKABLE_LOG_DIR}/containerdebug")),
+        value_from: None,
+    });
+
     main_container_commands.push(role.main_container_start_command());
     cb_druid
         .image_from_product_image(resolved_product_image)

From 6cfa3f81b916a834c2d2b17ad8a818120163f301 Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Tue, 17 Dec 2024 12:00:27 +0100
Subject: [PATCH 2/2] factor out ctnrdebug test

---
 tests/templates/kuttl/smoke/50-assert.yaml | 11 -----------
 tests/templates/kuttl/smoke/51-assert.yaml | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 tests/templates/kuttl/smoke/51-assert.yaml

diff --git a/tests/templates/kuttl/smoke/50-assert.yaml b/tests/templates/kuttl/smoke/50-assert.yaml
index 32ae0af1..a63f3bfa 100644
--- a/tests/templates/kuttl/smoke/50-assert.yaml
+++ b/tests/templates/kuttl/smoke/50-assert.yaml
@@ -135,14 +135,3 @@ status:
   expectedPods: 1
   currentHealthy: 1
   disruptionsAllowed: 1
----
-# This test checks if the containerdebug-state.json file is present and valid
-apiVersion: kuttl.dev/v1beta1
-kind: TestAssert
-timeout: 600
-commands:
-  - script: kubectl exec -n $NAMESPACE --container druid druid-coordinator-default-0 -- cat /stackable/log/containerdebug-state.json | jq --exit-status
-  - script: kubectl exec -n $NAMESPACE --container druid druid-router-default-0 -- cat /stackable/log/containerdebug-state.json | jq --exit-status
-  - script: kubectl exec -n $NAMESPACE --container druid druid-middlemanager-default-0 -- cat /stackable/log/containerdebug-state.json | jq --exit-status
-  - script: kubectl exec -n $NAMESPACE --container druid druid-router-default-0 -- cat /stackable/log/containerdebug-state.json | jq --exit-status
-  - script: kubectl exec -n $NAMESPACE --container druid druid-historical-default-0 -- cat /stackable/log/containerdebug-state.json | jq --exit-status
diff --git a/tests/templates/kuttl/smoke/51-assert.yaml b/tests/templates/kuttl/smoke/51-assert.yaml
new file mode 100644
index 00000000..9d9898af
--- /dev/null
+++ b/tests/templates/kuttl/smoke/51-assert.yaml
@@ -0,0 +1,11 @@
+---
+# This test checks if the containerdebug-state.json file is present and valid
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+timeout: 600
+commands:
+  - script: kubectl exec -n $NAMESPACE --container druid druid-coordinator-default-0 -- cat /stackable/log/containerdebug-state.json | jq --exit-status '"valid JSON"'
+  - script: kubectl exec -n $NAMESPACE --container druid druid-router-default-0 -- cat /stackable/log/containerdebug-state.json | jq --exit-status '"valid JSON"'
+  - script: kubectl exec -n $NAMESPACE --container druid druid-middlemanager-default-0 -- cat /stackable/log/containerdebug-state.json | jq --exit-status '"valid JSON"'
+  - script: kubectl exec -n $NAMESPACE --container druid druid-router-default-0 -- cat /stackable/log/containerdebug-state.json | jq --exit-status '"valid JSON"'
+  - script: kubectl exec -n $NAMESPACE --container druid druid-historical-default-0 -- cat /stackable/log/containerdebug-state.json | jq --exit-status '"valid JSON"'