fix(tests): reduce resources and logging rolegroup length (<16)

Author: maltesander

tests/templates/kuttl/logging/04-assert.yaml

@@ -6,15 +6,15 @@ timeout: 600
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: test-nifi-node-automatic-log-config
+  name: test-nifi-node-automatic-log
 status:
   readyReplicas: 1
   replicas: 1
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: test-nifi-node-custom-log-config
+  name: test-nifi-node-custom-log
 status:
   readyReplicas: 1
   replicas: 1

tests/templates/kuttl/logging/04-install-nifi.yaml.j2

@@ -110,7 +110,7 @@ spec:
         # Quicker startup, and we only have a single node
         "nifi.cluster.flow.election.max.wait.time": "10 secs"
     roleGroups:
-      automatic-log-config:
+      automatic-log:
         replicas: 1
         config:
           logging:
@@ -151,7 +151,7 @@ spec:
               - name: prepared-logs
                 configMap:
                   name: prepared-logs
-      custom-log-config:
+      custom-log:
         replicas: 1
         config:
           logging:

tests/templates/kuttl/logging/nifi-vector-aggregator-values.yaml.j2

@@ -28,37 +28,37 @@ customConfig:
       type: filter
       inputs: [validEvents]
       condition: >-
-        .pod == "test-nifi-node-automatic-log-config-0" &&
+        .pod == "test-nifi-node-automatic-log-0" &&
         .container == "nifi"
     filteredAutomaticLogConfigNodeGitSync:
       type: filter
       inputs: [validEvents]
       condition: >-
-        .pod == "test-nifi-node-automatic-log-config-0" &&
+        .pod == "test-nifi-node-automatic-log-0" &&
         .container == "git-sync-0"
     filteredAutomaticLogConfigNodeGitSyncInit:
       type: filter
       inputs: [validEvents]
       condition: >-
-        .pod == "test-nifi-node-automatic-log-config-0" &&
+        .pod == "test-nifi-node-automatic-log-0" &&
         .container == "git-sync-0-init"
     filteredAutomaticLogConfigNodeVector:
       type: filter
       inputs: [validEvents]
       condition: >-
-        .pod == "test-nifi-node-automatic-log-config-0" &&
+        .pod == "test-nifi-node-automatic-log-0" &&
         .container == "vector"
     filteredCustomLogConfigNodeNifi:
       type: filter
       inputs: [validEvents]
       condition: >-
-        .pod == "test-nifi-node-custom-log-config-0" &&
+        .pod == "test-nifi-node-custom-log-0" &&
         .container == "nifi"
     filteredCustomLogConfigNodeVector:
       type: filter
       inputs: [validEvents]
       condition: >-
-        .pod == "test-nifi-node-custom-log-config-0" &&
+        .pod == "test-nifi-node-custom-log-0" &&
         .container == "vector"
     filteredInvalidEvents:
       type: filter

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

@@ -7,7 +7,7 @@ timeout: 1800
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: test-nifi-node-resources-from-role
+  name: test-nifi-node-from-role
 spec:
   template:
     spec:
@@ -30,7 +30,7 @@ status:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: test-nifi-node-resources-from-role-group
+  name: test-nifi-node-from-role-group
 spec:
   template:
     spec:
@@ -53,7 +53,7 @@ status:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: test-nifi-node-resources-from-pod-overrides
+  name: test-nifi-node-pod-overrides
 spec:
   template:
     spec:

tests/templates/kuttl/resources/02-install-nifi.yaml.j2

@@ -73,9 +73,9 @@ spec:
         # Quicker startup, and we only have a single node
         "nifi.cluster.flow.election.max.wait.time": "10 secs"
     roleGroups:
-      resources-from-role:
+      from-role:
         replicas: 1
-      resources-from-role-group:
+      from-role-group:
         config:
           resources:
             cpu:
@@ -84,7 +84,7 @@ spec:
             memory:
               limit: 3Gi
         replicas: 1
-      resources-from-pod-overrides:
+      pod-overrides:
         podOverrides:
           spec:
             containers:

tests/templates/kuttl/resources/03-assert.yaml

@@ -5,12 +5,12 @@ metadata:
   name: check-jvm-heap-args
 timeout: 600
 commands:
-  - script: kubectl get cm -n $NAMESPACE test-nifi-node-resources-from-role -o yaml | grep -E 'java.arg..=-Xmx1638m' | xargs test ! -z
+  - script: kubectl get cm -n $NAMESPACE test-nifi-node-from-role -o yaml | grep -E 'java.arg..=-Xmx1638m' | xargs test ! -z
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 metadata:
   name: check-jvm-heap-args
 timeout: 600
 commands:
-  - script: kubectl get cm -n $NAMESPACE test-nifi-node-resources-from-role-group -o yaml | grep -E 'java.arg..=-Xms2457m' | xargs test ! -z
+  - script: kubectl get cm -n $NAMESPACE test-nifi-node-from-role-group -o yaml | grep -E 'java.arg..=-Xms2457m' | xargs test ! -z