tests: remove zookeeper=false tests

Author: razvan

tests/templates/kuttl/smoke/20-install-zk.yaml.j2

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

tests/templates/kuttl/smoke/30-assert.yaml.j2

@@ -86,55 +86,3 @@ status:
   expectedPods: 1
   currentHealthy: 1
   disruptionsAllowed: 1
-{% if test_scenario['values']['zookeeper'] == 'false' %}
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: test-kafka-controller-default
-status:
-  readyReplicas: 3
-  replicas: 3
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: log-dirs-test-kafka-controller-default-0
-spec:
-  resources:
-    requests:
-      storage: 2Gi
-status:
-  phase: Bound
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: log-dirs-test-kafka-controller-default-1
-spec:
-  resources:
-    requests:
-      storage: 2Gi
-status:
-  phase: Bound
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: log-dirs-test-kafka-controller-default-2
-spec:
-  resources:
-    requests:
-      storage: 2Gi
-status:
-  phase: Bound
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  name: test-kafka-controller
-status:
-  expectedPods: 3
-  currentHealthy: 3
-  disruptionsAllowed: 1
-{% endif %}

tests/templates/kuttl/smoke/30-install-kafka.yaml.j2

@@ -26,21 +26,7 @@ spec:
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
-{% if test_scenario['values']['zookeeper'] != 'false' %}
     zookeeperConfigMapName: test-zk
-{% else %}
-  controllers:
-    envOverrides:
-      COMMON_VAR: role-value # overridden by role group below
-      ROLE_VAR: role-value   # only defined here at role level
-    config:
-      logging:
-        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-      requestedSecretLifetime: 7d
-    roleGroups:
-      default:
-        replicas: 3
-{% endif %}
   brokers:
     configOverrides:
       broker.properties:

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

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

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

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

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

@@ -10,13 +10,3 @@ metadata:
 status:
   readyReplicas: 1
   replicas: 1
-{% if test_scenario['values']['zookeeper'] == 'false' %}
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: test-kafka-controller-default
-status:
-  readyReplicas: 3
-  replicas: 3
-{% endif %}

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

@@ -1,4 +1,3 @@
-{% if test_scenario['values']['zookeeper'] != 'false' %}
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1
 kind: ZookeeperZnode
@@ -7,7 +6,6 @@ metadata:
 spec:
   clusterRef:
     name: test-zk
-{% endif %}
 {% if test_scenario['values']['use-client-auth-tls'] == 'true' %}
 ---
 apiVersion: authentication.stackable.tech/v1alpha1
@@ -55,18 +53,7 @@ spec:
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
-{% if test_scenario['values']['zookeeper'] != 'false' %}
     zookeeperConfigMapName: test-zk
-{% else %}
-  controllers:
-    config:
-      gracefulShutdownTimeout: 30s # speed up tests
-      logging:
-        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-    roleGroups:
-      default:
-        replicas: 3
-{% endif %}
   brokers:
     config:
       gracefulShutdownTimeout: 30s # speed up tests

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

@@ -14,17 +14,3 @@ status:
   replicas: 1
   currentReplicas: 1
   updatedReplicas: 1
-{% if test_scenario['values']['zookeeper'] == 'false' %}
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: test-kafka-controller-default
-  labels:
-    app.kubernetes.io/version: "{{ test_scenario['values']['upgrade_new'] }}-stackable0.0.0-dev"
-status:
-  readyReplicas: 3
-  replicas: 3
-  currentReplicas: 3
-  updatedReplicas: 3
-{% endif %}

tests/test-definition.yaml

@@ -25,8 +25,6 @@ dimensions:
   - name: zookeeper
     values:
       - 3.9.3
-      # This enables KRaft mode
-      - "false"
   - name: zookeeper-latest
     values:
       - 3.9.3
@@ -163,18 +161,3 @@ suites:
             expr: "true"
           - name: use-client-auth-tls
             expr: "true"
-  - name: kraft
-    patch:
-      - dimensions:
-          - name: zookeeper
-            expr: "false"
-          - name: zookeeper-latest
-            expr: "false"
-          - name: use-client-tls
-            expr: "true"
-          - name: use-client-auth-tls
-            expr: "true"
-          - name: bootstrap-listener-class
-            expr: "cluster-internal"
-          - name: kerberos-realm
-            expr: "PROD.MYCORP"