consolidate cluster operation tests

maltesander · maltesander · commit 34f6c67f9eef · 2025-09-11T14:37:40.000+02:00
diff --git a/tests/templates/kuttl/cluster-operation/10-assert.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-assert.yaml.j2
@@ -1,4 +1,4 @@
-{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
+{% if test_scenario['values']['zookeeper-latest'] != 'false' %}
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
diff --git a/tests/templates/kuttl/cluster-operation/10-install-zk.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-install-zk.yaml.j2
@@ -1,4 +1,4 @@
-{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
+{% if test_scenario['values']['zookeeper-latest'] != 'false' %}
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1
 kind: ZookeeperCluster
diff --git a/tests/templates/kuttl/cluster-operation/20-assert.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-assert.yaml.j2
@@ -12,7 +12,7 @@ metadata:
 status:
   readyReplicas: 1
   replicas: 1
-{% if test_scenario['values']['use-kraft-controller'] == 'true' %}
+{% if test_scenario['values']['zookeeper-latest'] == 'false' %}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
diff --git a/tests/templates/kuttl/cluster-operation/20-install-kafka.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-install-kafka.yaml.j2
@@ -16,13 +16,13 @@ spec:
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
 {% endif %}
     pullPolicy: IfNotPresent
-{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}
+{% 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']['use-kraft-controller'] == 'false' %}
+{% if test_scenario['values']['zookeeper-latest'] != 'false' %}
     zookeeperConfigMapName: test-zk
 {% else %}
   controllers:
diff --git a/tests/templates/kuttl/cluster-operation/30-assert.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-assert.yaml.j2
@@ -11,7 +11,7 @@ metadata:
   name: test-kafka-broker-default
 status:
   replicas: 0
-{% if test_scenario['values']['use-kraft-controller'] == 'true' %}
+{% if test_scenario['values']['zookeeper-latest'] == 'false' %}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
diff --git a/tests/templates/kuttl/cluster-operation/30-stop-kafka.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-stop-kafka.yaml.j2
@@ -16,13 +16,13 @@ spec:
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
 {% endif %}
     pullPolicy: IfNotPresent
-{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}
+{% 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']['use-kraft-controller'] == 'false' %}
+{% if test_scenario['values']['zookeeper-latest'] != 'false' %}
     zookeeperConfigMapName: test-zk
 {% else %}
   brokers:
diff --git a/tests/templates/kuttl/cluster-operation/40-assert.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-assert.yaml.j2
@@ -11,7 +11,7 @@ metadata:
   name: test-kafka-broker-default
 status:
   replicas: 0
-{% if test_scenario['values']['use-kraft-controller'] == 'true' %}
+{% if test_scenario['values']['zookeeper-latest'] == 'false' %}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
diff --git a/tests/templates/kuttl/cluster-operation/40-pause-kafka.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-pause-kafka.yaml.j2
@@ -16,13 +16,13 @@ spec:
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
 {% endif %}
     pullPolicy: IfNotPresent
-{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}
+{% 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']['use-kraft-controller'] == 'false' %}
+{% if test_scenario['values']['zookeeper-latest'] != 'false' %}
     zookeeperConfigMapName: test-zk
 {% else %}
   controllers:
diff --git a/tests/templates/kuttl/cluster-operation/50-assert.yaml.j2 b/tests/templates/kuttl/cluster-operation/50-assert.yaml.j2
@@ -12,7 +12,7 @@ metadata:
 status:
   readyReplicas: 1
   replicas: 1
-{% if test_scenario['values']['use-kraft-controller'] == 'true' %}
+{% if test_scenario['values']['zookeeper-latest'] == 'false' %}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
diff --git a/tests/templates/kuttl/cluster-operation/50-restart-kafka.yaml.j2 b/tests/templates/kuttl/cluster-operation/50-restart-kafka.yaml.j2
@@ -15,13 +15,13 @@ spec:
 {% else %}
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
 {% endif %}
-{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}
+{% 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']['use-kraft-controller'] == 'false' %}
+{% if test_scenario['values']['zookeeper-latest'] != 'false' %}
     zookeeperConfigMapName: test-zk
 {% else %}
   controllers:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% if test_scenario['values']['use-kraft-controller'] == 'false' %}`
	`1`	`+{% if test_scenario['values']['zookeeper-latest'] != 'false' %}`
`2`	`2`	`---`
`3`	`3`	`apiVersion: kuttl.dev/v1beta1`
`4`	`4`	`kind: TestAssert`