fix containerdebug log dir

Author: razvan

rust/crd/src/lib.rs

@@ -675,7 +675,7 @@ impl SparkApplication {
         submit_cmd.extend(self.spec.args.clone());
 
         Ok(vec![
-            format!("CONTAINERDEBUG_LOG_DIRECTORY={VOLUME_MOUNT_PATH_LOG}/containerdebug containerdebug --output={VOLUME_MOUNT_PATH_LOG}/containerdebug-state.json --loop &"),
+            format!("containerdebug --output={VOLUME_MOUNT_PATH_LOG}/containerdebug/containerdebug-state.json --loop &"),
             submit_cmd.join(" "),
         ])
     }

rust/operator-binary/src/history/history_controller.rs

@@ -757,7 +757,7 @@ fn command_args(logdir: &ResolvedLogDir) -> Vec<String> {
     }
 
     command.extend(vec![
-        format!("CONTAINERDEBUG_LOG_DIRECTORY={VOLUME_MOUNT_PATH_LOG}/containerdebug containerdebug --output={VOLUME_MOUNT_PATH_LOG}/containerdebug-state.json --loop &"),
+        format!("containerdebug --output={VOLUME_MOUNT_PATH_LOG}/containerdebug/containerdebug-state.json --loop &"),
         format!("/stackable/spark/sbin/start-history-server.sh --properties-file {VOLUME_MOUNT_PATH_CONFIG}/{SPARK_DEFAULTS_FILE_NAME}"),
     ]);
     vec![command.join("\n")]

rust/operator-binary/src/spark_k8s_controller.rs

@@ -614,7 +614,7 @@ fn pod_template(
 
     cb.add_env_var(
         "_STACKABLE_PRE_HOOK",
-        format!("CONTAINERDEBUG_LOG_DIRECTORY={VOLUME_MOUNT_PATH_LOG}/containerdebug containerdebug --output={VOLUME_MOUNT_PATH_LOG}/containerdebug-state.json --loop &"),
+        format!("containerdebug --output={VOLUME_MOUNT_PATH_LOG}/containerdebug/containerdebug-state.json --loop &"),
     );
 
     if config.logging.enable_vector_agent {

tests/templates/kuttl/smoke/40-assert.yaml

@@ -15,4 +15,4 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 60
 commands:
-  - script: kubectl exec -n $NAMESPACE --container spark-history spark-history-node-default-0 -- cat /stackable/log/containerdebug-state.json | jq --exit-status
+  - script: kubectl exec -n $NAMESPACE --container spark-history spark-history-node-default-0 -- cat /stackable/log/containerdebug/containerdebug-state.json | jq --exit-status

tests/templates/kuttl/smoke/50-assert.yaml

@@ -3,6 +3,7 @@
 #
 # It needs to run as soon as the spark application has been submitted because
 # once it is completed the pods are terminated.
+#
 # Unfortunately it's impossible to test the driver and the executor pods in a
 # reliable way.
 #
@@ -11,10 +12,4 @@ kind: TestAssert
 commands:
   - script: |
       SPARK_SUBMIT_POD=$(kubectl get -n $NAMESPACE pods --field-selector=status.phase=Running --selector batch.kubernetes.io/job-name=spark-pi-s3-1 -o jsonpath='{.items[0].metadata.name}')
-      kubectl exec -n $NAMESPACE --container spark-submit $SPARK_SUBMIT_POD -- cat /stackable/log/containerdebug-state.json | jq --exit-status
-  #- script: |
-  #    SPARK_DRIVER_POD=$(kubectl get -n $NAMESPACE pod --field-selector=status.phase=Running --selector=spark-role=driver,spark-app-name=spark-pi -o jsonpath='{.items[0].metadata.name}')
-  #    kubectl exec -n $NAMESPACE --container spark-submit $SPARK_DRIVER_POD -- cat /stackable/log/containerdebug-state.json | jq --exit-status
-  #- script: |
-  #    SPARK_EXECUTOR_POD=$(kubectl get -n $NAMESPACE pods --field-selector=status.phase=Running --selector spark-role=executor,spark-app-name=spark-pi -o jsonpath='{.items[0].metadata.name}')
-  #    kubectl exec -n $NAMESPACE --container spark-submit $SPARK_EXECUTOR_POD -- cat /stackable/log/containerdebug-state.json | jq --exit-status
+      kubectl exec -n $NAMESPACE --container spark-submit $SPARK_SUBMIT_POD -- cat /stackable/log/containerdebug/containerdebug-state.json | jq --exit-status