remove obsolete zk/kraft checks

Author: maltesander

…uttl/cluster-operation/10-assert.yaml.j2 …s/kuttl/cluster-operation/10-assert.yamltests/templates/kuttl/cluster-operation/10-assert.yaml.j2 renamed to tests/templates/kuttl/cluster-operation/10-assert.yaml tests/templates/kuttl/cluster-operation/10-assert.yaml.j2 renamed to tests/templates/kuttl/cluster-operation/10-assert.yaml

@@ -1,4 +1,3 @@
-{% if test_scenario['values']['zookeeper-latest'] != 'false' %}
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
@@ -11,4 +10,3 @@ metadata:
 status:
   readyReplicas: 1
   replicas: 1
-{% endif %}

tests/templates/kuttl/cluster-operation/10-install-zk.yaml.j2

@@ -1,4 +1,3 @@
-{% if test_scenario['values']['zookeeper-latest'] != 'false' %}
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1
 kind: ZookeeperCluster
@@ -19,4 +18,3 @@ spec:
     roleGroups:
       default:
         replicas: 1
-{% endif %}

…uttl/cluster-operation/20-assert.yaml.j2 …s/kuttl/cluster-operation/20-assert.yamltests/templates/kuttl/cluster-operation/20-assert.yaml.j2 renamed to tests/templates/kuttl/cluster-operation/20-assert.yaml tests/templates/kuttl/cluster-operation/20-assert.yaml.j2 renamed to tests/templates/kuttl/cluster-operation/20-assert.yaml

@@ -16,23 +16,11 @@ spec:
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
 {% endif %}
     pullPolicy: IfNotPresent
-{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['zookeeper-latest'] != 'false' %}
   clusterConfig:
-{% endif %}
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
-{% if test_scenario['values']['zookeeper-latest'] != 'false' %}
     zookeeperConfigMapName: test-zk
-{% else %}
-  controllers:
-    config:
-      logging:
-        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-    roleGroups:
-      default:
-        replicas: 1
-{% endif %}
   brokers:
     config:
       logging:

tests/templates/kuttl/cluster-operation/20-install-kafka.yaml.j2

@@ -16,23 +16,11 @@ spec:
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
 {% endif %}
     pullPolicy: IfNotPresent
-{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['zookeeper-latest'] != 'false' %}
   clusterConfig:
-{% endif %}
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
-{% if test_scenario['values']['zookeeper-latest'] != 'false' %}
     zookeeperConfigMapName: test-zk
-{% else %}
-  brokers:
-    config:
-      logging:
-        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-    roleGroups:
-      default:
-        replicas: 1
-{% endif %}
   brokers:
     config:
       logging:

…uttl/cluster-operation/30-assert.yaml.j2 …s/kuttl/cluster-operation/30-assert.yamltests/templates/kuttl/cluster-operation/30-assert.yaml.j2 renamed to tests/templates/kuttl/cluster-operation/30-assert.yaml tests/templates/kuttl/cluster-operation/30-assert.yaml.j2 renamed to tests/templates/kuttl/cluster-operation/30-assert.yaml

@@ -16,23 +16,11 @@ spec:
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
 {% endif %}
     pullPolicy: IfNotPresent
-{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['zookeeper-latest'] != 'false' %}
   clusterConfig:
-{% endif %}
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
-{% if test_scenario['values']['zookeeper-latest'] != 'false' %}
     zookeeperConfigMapName: test-zk
-{% else %}
-  controllers:
-    config:
-      logging:
-        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-    roleGroups:
-      default:
-        replicas: 1
-{% endif %}
   brokers:
     config:
       logging:

tests/templates/kuttl/cluster-operation/30-stop-kafka.yaml.j2

@@ -15,23 +15,11 @@ spec:
 {% else %}
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
 {% endif %}
-{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['zookeeper-latest'] != 'false' %}
   clusterConfig:
-{% endif %}
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
-{% if test_scenario['values']['zookeeper-latest'] != 'false' %}
     zookeeperConfigMapName: test-zk
-{% else %}
-  controllers:
-    config:
-      logging:
-        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-    roleGroups:
-      default:
-        replicas: 1
-{% endif %}
   brokers:
     config:
       logging: