fix zk crd changes in integration tests (#526)

stackabletech · Nov 7, 2023 · 8a96402 · 8a96402
1 parent d664aa3
commit 8a96402
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 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
@@ -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/ldap/10-install-zk.yaml.j2 b/tests/templates/kuttl/ldap/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/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/orphaned_resources/01-install-zk.yaml.j2 b/tests/templates/kuttl/orphaned_resources/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/resources/01-install-zk.yaml.j2 b/tests/templates/kuttl/resources/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/smoke/20-install-zk.yaml.j2 b/tests/templates/kuttl/smoke/20-install-zk.yaml.j2
@@ -9,8 +9,7 @@ spec:
   clusterConfig:
     listenerClass: {{ test_scenario['values']['listener-class'] }}
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
-    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
@@ -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: