consolidate delete rolegroup

maltesander · maltesander · commit 98307edad9fd · 2025-09-11T14:49:20.000+02:00
diff --git a/tests/templates/kuttl/delete-rolegroup/01-assert.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/01-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/delete-rolegroup/01-install-zk.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/01-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/delete-rolegroup/02-assert.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/02-assert.yaml.j2
@@ -18,7 +18,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/delete-rolegroup/02-install-kafka.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/02-install-kafka.yaml.j2
@@ -20,7 +20,7 @@ spec:
 {% 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/delete-rolegroup/03-assert.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/03-assert.yaml.j2
@@ -10,7 +10,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/delete-rolegroup/03-delete-secondary.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/03-delete-secondary.yaml.j2
@@ -19,7 +19,7 @@ spec:
 {% 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/delete-rolegroup/03-errors.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/03-errors.yaml.j2
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: test-kafka-broker-secondary
-{% if test_scenario['values']['use-kraft-controller'] == 'true' %}
+{% if test_scenario['values']['zookeeper-latest'] == 'false' %}
 ---
 apiVersion: apps/v1
 kind: StatefulSet

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`