start fix remove rolegroup tests

Author: maltesander

rust/operator-binary/src/crd/mod.rs

@@ -258,6 +258,7 @@ impl v1alpha1::KafkaCluster {
     ///
     /// We try to predict the pods here rather than looking at the current cluster state in order to
     /// avoid instance churn.
+    // TODO: this currently only checks within each role, node.id must be unique for all brokers and controllers
     pub fn pod_descriptors(
         &self,
         kafka_role: &KafkaRole,

…es/kuttl/delete-rolegroup/01-assert.yaml …kuttl/delete-rolegroup/01-assert.yaml.j2tests/templates/kuttl/delete-rolegroup/01-assert.yaml renamed to tests/templates/kuttl/delete-rolegroup/01-assert.yaml.j2 tests/templates/kuttl/delete-rolegroup/01-assert.yaml renamed to tests/templates/kuttl/delete-rolegroup/01-assert.yaml.j2

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

tests/templates/kuttl/delete-rolegroup/01-install-zk.yaml.j2

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

tests/templates/kuttl/delete-rolegroup/02-assert.yaml.j2

@@ -0,0 +1,38 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+timeout: 300
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-kafka-broker-default
+status:
+  readyReplicas: 1
+  replicas: 1
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-kafka-broker-secondary
+status:
+  readyReplicas: 1
+  replicas: 1
+{% if test_scenario['values']['use-kraft-controller'] == 'true' %}
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-kafka-controller-default
+status:
+  readyReplicas: 2
+  replicas: 2
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-kafka-controller-secondary
+status:
+  readyReplicas: 1
+  replicas: 1
+{% endif %}  

tests/templates/kuttl/delete-rolegroup/02-install-kafka.yaml.j2

@@ -20,9 +20,23 @@ spec:
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
+{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
     zookeeperConfigMapName: test-zk
+{% else %}
+  controllers:
+    config:
+      gracefulShutdownTimeout: 30s # speed up tests
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}  
+    roleGroups:
+      default:
+        replicas: 2
+      secondary:
+        replicas: 1
+{% endif %}  
   brokers:
     config:
+      gracefulShutdownTimeout: 30s # speed up tests
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:

tests/templates/kuttl/delete-rolegroup/03-assert.yaml

@@ -10,11 +10,13 @@ metadata:
 status:
   readyReplicas: 1
   replicas: 1
+{% if test_scenario['values']['use-kraft-controller'] == 'true' %}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: test-kafka-broker-secondary
+  name: test-kafka-controller-default
 status:
-  readyReplicas: 1
-  replicas: 1
+  readyReplicas: 2
+  replicas: 2
+{% endif %}  

…es/kuttl/delete-rolegroup/02-assert.yaml …kuttl/delete-rolegroup/03-assert.yaml.j2tests/templates/kuttl/delete-rolegroup/02-assert.yaml renamed to tests/templates/kuttl/delete-rolegroup/03-assert.yaml.j2 tests/templates/kuttl/delete-rolegroup/02-assert.yaml renamed to tests/templates/kuttl/delete-rolegroup/03-assert.yaml.j2

@@ -19,9 +19,22 @@ spec:
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
+{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
     zookeeperConfigMapName: test-zk
+{% else %}
+  controllers:
+    config:
+      gracefulShutdownTimeout: 30s # speed up tests
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}  
+    roleGroups:
+      default:
+        replicas: 2
+      secondary: null
+{% endif %}  
   brokers:
     config:
+      gracefulShutdownTimeout: 30s # speed up tests
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:

tests/templates/kuttl/delete-rolegroup/03-delete-secondary.yaml.j2

@@ -0,0 +1,12 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-kafka-broker-secondary
+{% if test_scenario['values']['use-kraft-controller'] == 'true' %}
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-kafka-controller-secondary
+{% endif %}