fix cluster operation tests

Author: maltesander

deploy/helm/kafka-operator/configs/properties.yaml

@@ -149,19 +149,3 @@ properties:
           required: false
       asOfVersion: "0.0.0"
       description: "The number of seconds after which the OPA authorizer cache expires"
-
-  - property: &logDirs
-      propertyNames:
-        - name: "log.dirs"
-          kind:
-            type: "file"
-            file: "broker.properties"
-      datatype:
-        type: "string"
-      recommendedValues:
-        - value: "/stackable/data/topicdata"
-      roles:
-        - name: "broker"
-          required: true
-      asOfVersion: "0.0.0"
-      description: "A comma separated list of directories under which to store log files"

deploy/helm/kafka-operator/crds/crds.yaml

@@ -609,6 +609,14 @@ spec:
                     - roleGroups
                   type: object
                 clusterConfig:
+                  default:
+                    authentication: []
+                    authorization:
+                      opa: null
+                    tls:
+                      internalSecretClass: tls
+                      serverSecretClass: tls
+                    zookeeperConfigMapName: null
                   description: |-
                     Kafka settings that affect all roles and role groups.
 
@@ -1320,7 +1328,6 @@ spec:
                       type: string
                   type: object
               required:
-                - clusterConfig
                 - image
               type: object
             status:

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

@@ -123,6 +123,7 @@ pub mod versioned {
         /// Kafka settings that affect all roles and role groups.
         ///
         /// The settings in the `clusterConfig` are cluster wide settings that do not need to be configurable at role or role group level.
+        #[serde(default)]
         pub cluster_config: v1alpha1::KafkaClusterConfig,
 
         // no doc - docs in ClusterOperation struct.
@@ -164,6 +165,18 @@ pub mod versioned {
     }
 }
 
+impl Default for v1alpha1::KafkaClusterConfig {
+    fn default() -> Self {
+        Self {
+            authentication: vec![],
+            authorization: KafkaAuthorization::default(),
+            tls: tls::default_kafka_tls(),
+            vector_aggregator_config_map_name: None,
+            zookeeper_config_map_name: None,
+        }
+    }
+}
+
 impl HasStatusCondition for v1alpha1::KafkaCluster {
     fn conditions(&self) -> Vec<ClusterCondition> {
         match &self.status {

…s/kuttl/cluster-operation/10-assert.yaml …uttl/cluster-operation/10-assert.yaml.j2tests/templates/kuttl/cluster-operation/10-assert.yaml renamed to tests/templates/kuttl/cluster-operation/10-assert.yaml.j2 tests/templates/kuttl/cluster-operation/10-assert.yaml renamed to tests/templates/kuttl/cluster-operation/10-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/cluster-operation/10-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 %}

…s/kuttl/cluster-operation/50-assert.yaml …uttl/cluster-operation/20-assert.yaml.j2tests/templates/kuttl/cluster-operation/50-assert.yaml renamed to tests/templates/kuttl/cluster-operation/20-assert.yaml.j2 tests/templates/kuttl/cluster-operation/50-assert.yaml renamed to tests/templates/kuttl/cluster-operation/20-assert.yaml.j2

@@ -12,3 +12,13 @@ metadata:
 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: 1
+  replicas: 1
+{% endif %}

tests/templates/kuttl/cluster-operation/20-install-kafka.yaml.j2

@@ -16,11 +16,23 @@ spec:
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
 {% endif %}
     pullPolicy: IfNotPresent
+{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}    
   clusterConfig:
+{% endif %}
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
+{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
     zookeeperConfigMapName: test-zk
+{% else %}
+  controllers:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+    roleGroups:
+      default:
+        replicas: 1
+{% endif %}
   brokers:
     config:
       logging:

…s/kuttl/cluster-operation/30-assert.yaml …uttl/cluster-operation/30-assert.yaml.j2tests/templates/kuttl/cluster-operation/30-assert.yaml renamed to tests/templates/kuttl/cluster-operation/30-assert.yaml.j2 tests/templates/kuttl/cluster-operation/30-assert.yaml renamed to tests/templates/kuttl/cluster-operation/30-assert.yaml.j2

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

tests/templates/kuttl/cluster-operation/30-stop-kafka.yaml.j2

@@ -16,18 +16,30 @@ spec:
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
 {% endif %}
     pullPolicy: IfNotPresent
+{% if lookup('env', 'VECTOR_AGGREGATOR') or test_scenario['values']['use-kraft-controller'] == 'false' %}    
   clusterConfig:
+{% endif %}
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
+{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
     zookeeperConfigMapName: test-zk
-  clusterOperation:
-    stopped: true
-    reconciliationPaused: false
+{% else %}
+  brokers:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+    roleGroups:
+      default:
+        replicas: 1
+{% endif %}
   brokers:
     config:
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
       default:
         replicas: 1
+  clusterOperation:
+    stopped: true
+    reconciliationPaused: false

…s/kuttl/cluster-operation/40-assert.yaml …uttl/cluster-operation/40-assert.yaml.j2tests/templates/kuttl/cluster-operation/40-assert.yaml renamed to tests/templates/kuttl/cluster-operation/40-assert.yaml.j2 tests/templates/kuttl/cluster-operation/40-assert.yaml renamed to tests/templates/kuttl/cluster-operation/40-assert.yaml.j2

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