fix configuration tests

Author: maltesander

tests/templates/kuttl/configuration/10-assert.yaml

@@ -6,7 +6,7 @@ timeout: 300
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: test-kafka-broker-default
+  name: test-kafka-controller-default
 spec:
   template:
     spec:
@@ -23,6 +23,39 @@ spec:
               cpu: 250m
               # value set in the rolegroup configuration
               memory: 2Gi
+{% if lookup('env', 'VECTOR_AGGREGATOR') %}
+        - name: vector
+{% endif %}
+  volumeClaimTemplates:
+    - metadata:
+        name: log-dirs
+      spec:
+        resources:
+          requests:
+            # value set in the role configuration and overridden in
+            # the rolegroup configuration
+            storage: 1Gi
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-kafka-broker-default
+spec:
+  template:
+    spec:
+      containers:
+        - name: kafka
+          resources:
+            limits:
+              # value set in the role configuration
+              cpu: 500m
+              # value set in the rolegroup configuration
+              memory: 3Gi
+            requests:
+              # default value set by the operator
+              cpu: 250m
+              # value set in the rolegroup configuration
+              memory: 3Gi
         - name: kcat-prober
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
         - name: vector

…es/kuttl/configuration/20-assert.yaml.j2 …es/kuttl/configuration/10-assert.yaml.j2tests/templates/kuttl/configuration/20-assert.yaml.j2 renamed to tests/templates/kuttl/configuration/10-assert.yaml.j2 tests/templates/kuttl/configuration/20-assert.yaml.j2 renamed to tests/templates/kuttl/configuration/10-assert.yaml.j2

@@ -18,10 +18,10 @@ spec:
     pullPolicy: IfNotPresent
   clusterConfig:
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
+  clusterConfig:
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
-    zookeeperConfigMapName: test-zk
-  brokers:
+  controllers:
     config:
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
@@ -37,7 +37,7 @@ spec:
         storage:
           logDirs:
             # Override the default value '2Gi' set by the operator
-            capacity: '1Gi'
+            capacity: '1.5Gi'
     roleGroups:
       default:
         config:
@@ -50,6 +50,40 @@ spec:
             memory:
               # Override the default value '1Gi' set by the operator
               limit: '2Gi'
+            storage:
+              logDirs:
+                # Override the value '1.5Gi' set in the role configuration
+                capacity: '1Gi'
+        replicas: 1
+  brokers:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+      resources:
+        cpu:
+          # Inherit the default value '250m' set by the operator
+          # min: '250m'
+          # Override the default value '1' set by the operator
+          max: '500m'
+        # memory:
+          # Inherit the default value '2Gi' set by the operator
+          # limit: '2Gi'
+        storage:
+          logDirs:
+            # Override the default value '2Gi' set by the operator
+            capacity: '1.5Gi'
+    roleGroups:
+      default:
+        config:
+          resources:
+            # cpu:
+              # Inherit the default value '250m' set by the operator
+              # min: '250m'
+              # Inherit the value '1000m' set in the role configuration
+              # max: '1000m'
+            memory:
+              # Override the default value '2Gi' set by the operator
+              limit: '3Gi'
             storage:
               logDirs:
                 # Override the value '2Gi' set in the role configuration

…l/configuration/20-install-kafka.yaml.j2 …l/configuration/10-install-kafka.yaml.j2tests/templates/kuttl/configuration/20-install-kafka.yaml.j2 renamed to tests/templates/kuttl/configuration/10-install-kafka.yaml.j2 tests/templates/kuttl/configuration/20-install-kafka.yaml.j2 renamed to tests/templates/kuttl/configuration/10-install-kafka.yaml.j2

@@ -77,7 +77,6 @@ tests:
   - name: configuration
     dimensions:
       - kafka-latest
-      - zookeeper-latest
       - openshift
   - name: upgrade
     dimensions: