fix upgrade tests

Author: maltesander

tests/templates/kuttl/upgrade/01-assert.yaml.j2

@@ -1,4 +1,4 @@
-{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
+{% if test_scenario['values']['zookeeper'] != 'false' %}
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert

tests/templates/kuttl/upgrade/01-install-zk.yaml.j2

@@ -1,4 +1,4 @@
-{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
+{% if test_scenario['values']['zookeeper'] != 'false' %}
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1
 kind: ZookeeperCluster

tests/templates/kuttl/upgrade/02-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'] == 'false' %}
 ---
 apiVersion: apps/v1
 kind: StatefulSet

tests/templates/kuttl/upgrade/02-install-kafka.yaml.j2

@@ -1,3 +1,4 @@
+{% if test_scenario['values']['zookeeper'] != 'false' %}
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1
 kind: ZookeeperZnode
@@ -6,6 +7,7 @@ metadata:
 spec:
   clusterRef:
     name: test-zk
+{% endif %}
 {% if test_scenario['values']['use-client-auth-tls'] == 'true' %}
 ---
 apiVersion: authentication.stackable.tech/v1alpha1
@@ -53,7 +55,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'] != 'false' %}
     zookeeperConfigMapName: test-zk
 {% else %}
   controllers:

tests/templates/kuttl/upgrade/04-assert.yaml.j2

@@ -14,7 +14,7 @@ status:
   replicas: 1
   currentReplicas: 1
   updatedReplicas: 1
-{% if test_scenario['values']['use-kraft-controller'] == 'true' %}
+{% if test_scenario['values']['zookeeper'] == 'false' %}
 ---
 apiVersion: apps/v1
 kind: StatefulSet

tests/test-definition.yaml

@@ -21,9 +21,13 @@ dimensions:
   - name: zookeeper
     values:
       - 3.9.3
+      # This enables KRaft mode
+      - "false"
   - name: zookeeper-latest
     values:
       - 3.9.3
+      # This enables KRaft mode
+      - "false"
   - name: upgrade_old
     values:
       - 3.7.2
@@ -62,17 +66,12 @@ dimensions:
       - "cluster-internal"
       - "external-stable"
       - "external-unstable"
-  - name: use-kraft-controller
-    values:
-      - "true"
-      - "false"
 tests:
   - name: smoke
     dimensions:
       - kafka
       - zookeeper
       - use-client-tls
-      - use-kraft-controller
       - openshift
   - name: configuration
     dimensions:
@@ -85,33 +84,28 @@ tests:
       - upgrade_old
       - use-client-tls
       - use-client-auth-tls
-      - use-kraft-controller
       - openshift
   - name: tls
     dimensions:
       - kafka
       - zookeeper-latest
       - use-client-tls
       - use-client-auth-tls
-      - use-kraft-controller
       - openshift
   - name: delete-rolegroup
     dimensions:
       - kafka
       - zookeeper-latest
-      - use-kraft-controller
       - openshift
   - name: logging
     dimensions:
       - kafka
       - zookeeper-latest
-      - use-kraft-controller
       - openshift
   - name: cluster-operation
     dimensions:
       - zookeeper-latest
       - kafka-latest
-      - use-kraft-controller
       - openshift
   - name: kerberos
     dimensions:
@@ -123,7 +117,6 @@ tests:
       - openshift
       - broker-listener-class
       - bootstrap-listener-class
-      - use-kraft-controller
 
 suites:
   - name: nightly