From 4ebb59472135e87fb9a0ff85391191bbd3f8198f Mon Sep 17 00:00:00 2001
From: Felix Hennig <felix.hennig@stackable.tech>
Date: Fri, 3 Nov 2023 13:26:38 +0100
Subject: [PATCH] Updated integration tests

---
 tests/templates/kuttl/cluster-operation/10-install-zk.yaml.j2 | 3 +--
 tests/templates/kuttl/configuration/10-install-zk.yaml.j2     | 3 +--
 tests/templates/kuttl/delete-rolegroup/01-install-zk.yaml.j2  | 3 +--
 tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2    | 3 +--
 tests/templates/kuttl/smoke/20-install-zk.yaml.j2             | 3 +--
 tests/templates/kuttl/tls/10-install-zookeeper.yaml.j2        | 3 +--
 tests/templates/kuttl/upgrade/01-install-zk.yaml.j2           | 3 +--
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/tests/templates/kuttl/cluster-operation/10-install-zk.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-install-zk.yaml.j2
index 7402a515..b8a893b4 100644
--- a/tests/templates/kuttl/cluster-operation/10-install-zk.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/10-install-zk.yaml.j2
@@ -8,8 +8,7 @@ spec:
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:
-    logging:
-      vectorAggregatorConfigMapName: vector-aggregator-discovery
+    vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
   servers:
     config:
diff --git a/tests/templates/kuttl/configuration/10-install-zk.yaml.j2 b/tests/templates/kuttl/configuration/10-install-zk.yaml.j2
index dc94e964..87d260e5 100644
--- a/tests/templates/kuttl/configuration/10-install-zk.yaml.j2
+++ b/tests/templates/kuttl/configuration/10-install-zk.yaml.j2
@@ -12,8 +12,7 @@ spec:
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:
-    logging:
-      vectorAggregatorConfigMapName: vector-aggregator-discovery
+    vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
   servers:
     config:
diff --git a/tests/templates/kuttl/delete-rolegroup/01-install-zk.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/01-install-zk.yaml.j2
index 7402a515..b8a893b4 100644
--- a/tests/templates/kuttl/delete-rolegroup/01-install-zk.yaml.j2
+++ b/tests/templates/kuttl/delete-rolegroup/01-install-zk.yaml.j2
@@ -8,8 +8,7 @@ spec:
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:
-    logging:
-      vectorAggregatorConfigMapName: vector-aggregator-discovery
+    vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
   servers:
     config:
diff --git a/tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2 b/tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2
index d4f9ade3..f9c858f0 100644
--- a/tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2
+++ b/tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2
@@ -8,8 +8,7 @@ spec:
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:
-    logging:
-      vectorAggregatorConfigMapName: vector-aggregator-discovery
+    vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
   servers:
     config:
diff --git a/tests/templates/kuttl/smoke/20-install-zk.yaml.j2 b/tests/templates/kuttl/smoke/20-install-zk.yaml.j2
index 58dcc324..b8a459b9 100644
--- a/tests/templates/kuttl/smoke/20-install-zk.yaml.j2
+++ b/tests/templates/kuttl/smoke/20-install-zk.yaml.j2
@@ -8,8 +8,7 @@ spec:
     productVersion: "{{ test_scenario['values']['zookeeper'] }}"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:
-    logging:
-      vectorAggregatorConfigMapName: vector-aggregator-discovery
+    vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
   servers:
     config:
diff --git a/tests/templates/kuttl/tls/10-install-zookeeper.yaml.j2 b/tests/templates/kuttl/tls/10-install-zookeeper.yaml.j2
index 7402a515..b8a893b4 100644
--- a/tests/templates/kuttl/tls/10-install-zookeeper.yaml.j2
+++ b/tests/templates/kuttl/tls/10-install-zookeeper.yaml.j2
@@ -8,8 +8,7 @@ spec:
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:
-    logging:
-      vectorAggregatorConfigMapName: vector-aggregator-discovery
+    vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
   servers:
     config:
diff --git a/tests/templates/kuttl/upgrade/01-install-zk.yaml.j2 b/tests/templates/kuttl/upgrade/01-install-zk.yaml.j2
index 58dcc324..b8a459b9 100644
--- a/tests/templates/kuttl/upgrade/01-install-zk.yaml.j2
+++ b/tests/templates/kuttl/upgrade/01-install-zk.yaml.j2
@@ -8,8 +8,7 @@ spec:
     productVersion: "{{ test_scenario['values']['zookeeper'] }}"
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:
-    logging:
-      vectorAggregatorConfigMapName: vector-aggregator-discovery
+    vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
   servers:
     config: