test: Fix the integration tests

Author: siegfriedweber

rust/operator-binary/src/controller/build/role_group_builder.rs

@@ -234,7 +234,7 @@ impl<'a> RoleGroupBuilder<'a> {
                     &self.resource_names.role_name,
                     &self.resource_names.role_group_name,
                     &self.cluster.image,
-                    &LOG_CONFIG_VOLUME_NAME,
+                    &CONFIG_VOLUME_NAME,
                     &LOG_VOLUME_NAME,
                 )
             });
@@ -433,10 +433,6 @@ impl<'a> RoleGroupBuilder<'a> {
 
         new_container_builder(&v1alpha1::Container::OpenSearch.to_container_name())
             .image_from_product_image(&self.cluster.image)
-            .command(vec![format!(
-                "{opensearch_home}/opensearch-docker-entrypoint.sh"
-            )])
-            .args(self.role_group_config.cli_overrides_to_vec())
             .command(vec![
                 "/bin/bash".to_string(),
                 "-x".to_string(),
@@ -448,8 +444,12 @@ impl<'a> RoleGroupBuilder<'a> {
                 "{COMMON_BASH_TRAP_FUNCTIONS}\n\
                 {remove_vector_shutdown_file_command}\n\
                 prepare_signal_handlers\n\
+                if command --search containerdebug >/dev/null 2>&1; then\n\
                 containerdebug --output={STACKABLE_LOG_DIR}/containerdebug-state.json --loop &\n\
-                {opensearch_home}/opensearch-docker-entrypoint.sh {extra_args} &\n\
+                else\n\
+                echo >&2 \"containerdebug not installed; Proceed without it.\"\n\
+                fi\n\
+                ./opensearch-docker-entrypoint.sh {extra_args} &\n\
                 wait_for_termination $!\n\
                 {create_vector_shutdown_file_command}",
                 extra_args = self.role_group_config.cli_overrides_to_vec().join(" "),

tests/templates/kuttl/logging/10_opensearch-vector-aggregator-values.yaml.j2

@@ -22,91 +22,50 @@ customConfig:
   transforms:
     validEvents:
       type: filter
-      inputs: [vector]
+      inputs:
+        - vector
       condition: is_null(.errors)
-    filteredAutomaticLogConfigMasterHbase:
-      type: filter
-      inputs: [validEvents]
-      condition: >-
-        .pod == "test-opensearch-master-automatic-log-config-0" &&
-        .container == "opensearch"
-    filteredAutomaticLogConfigMasterVector:
-      type: filter
-      inputs: [validEvents]
-      condition: >-
-        .pod == "test-opensearch-master-automatic-log-config-0" &&
-        .container == "vector"
-    filteredCustomLogConfigMasterHbase:
-      type: filter
-      inputs: [validEvents]
-      condition: >-
-        .pod == "test-opensearch-master-custom-log-config-0" &&
-        .container == "opensearch"
-    filteredCustomLogConfigMasterVector:
-      type: filter
-      inputs: [validEvents]
-      condition: >-
-        .pod == "test-opensearch-master-custom-log-config-0" &&
-        .container == "vector"
-    filteredAutomaticLogConfigRegionserverHbase:
+    filteredAutomaticLogConfigOpenSearch:
       type: filter
-      inputs: [validEvents]
-      condition: >-
-        .pod == "test-opensearch-regionserver-automatic-log-config-0" &&
-        .container == "opensearch"
-    filteredAutomaticLogConfigRegionserverVector:
-      type: filter
-      inputs: [validEvents]
-      condition: >-
-        .pod == "test-opensearch-regionserver-automatic-log-config-0" &&
-        .container == "vector"
-    filteredCustomLogConfigRegionserverHbase:
-      type: filter
-      inputs: [validEvents]
-      condition: >-
-        .pod == "test-opensearch-regionserver-custom-log-config-0" &&
-        .container == "opensearch"
-    filteredCustomLogConfigRegionserverVector:
-      type: filter
-      inputs: [validEvents]
-      condition: >-
-        .pod == "test-opensearch-regionserver-custom-log-config-0" &&
-        .container == "vector"
-    filteredAutomaticLogConfigRestserverHbase:
-      type: filter
-      inputs: [validEvents]
+      inputs:
+        - validEvents
       condition: >-
-        .pod == "test-opensearch-restserver-automatic-log-config-0" &&
+        .pod == "opensearch-nodes-automatic-0" &&
         .container == "opensearch"
-    filteredAutomaticLogConfigRestserverVector:
+    filteredAutomaticLogConfigVector:
       type: filter
-      inputs: [validEvents]
+      inputs:
+        - validEvents
       condition: >-
-        .pod == "test-opensearch-restserver-automatic-log-config-0" &&
+        .pod == "opensearch-nodes-automatic-0" &&
         .container == "vector"
-    filteredCustomLogConfigRestserverHbase:
+    filteredCustomLogConfigOpenSearch:
       type: filter
-      inputs: [validEvents]
+      inputs:
+        - validEvents
       condition: >-
-        .pod == "test-opensearch-restserver-custom-log-config-0" &&
+        .pod == "opensearch-nodes-custom-0" &&
         .container == "opensearch"
-    filteredCustomLogConfigRestserverVector:
+    filteredCustomLogConfigVector:
       type: filter
-      inputs: [validEvents]
+      inputs:
+        - validEvents
       condition: >-
-        .pod == "test-opensearch-restserver-custom-log-config-0" &&
+        .pod == "opensearch-nodes-custom-0" &&
         .container == "vector"
     filteredInvalidEvents:
       type: filter
-      inputs: [vector]
+      inputs:
+        - vector
       condition: |-
         .timestamp == from_unix_timestamp!(0) ||
         is_null(.level) ||
         is_null(.logger) ||
         is_null(.message)
   sinks:
     test:
-      inputs: [filtered*]
+      inputs:
+        - filtered*
       type: blackhole
     stdout:
       inputs:
@@ -116,7 +75,8 @@ customConfig:
         codec: json
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     aggregator:
-      inputs: [vector]
+      inputs:
+        - vector
       type: vector
       address: {{ lookup('env', 'VECTOR_AGGREGATOR') }}
       buffer: