Revert "fix(tests): shorten rolegroup length"

This reverts commit 09d7646.

Author: maltesander

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

@@ -3,4 +3,4 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 600
 commands:
-  - script: kubectl -n $NAMESPACE rollout status daemonset test-opa-server-automatic-log --timeout 600s
+  - script: kubectl -n $NAMESPACE rollout status daemonset test-opa-server-automatic-log-config --timeout 600s

tests/templates/kuttl/logging/03-install-opa.yaml.j2

@@ -34,7 +34,7 @@ spec:
     vectorAggregatorConfigMapName: opa-vector-aggregator-discovery
   servers:
     roleGroups:
-      automatic-log:
+      automatic-log-config:
         config:
           logging:
             enableVectorAgent: true

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

@@ -28,33 +28,33 @@ customConfig:
       type: filter
       inputs: [validEvents]
       condition: >-
-        starts_with(string!(.pod), "test-opa-server-automatic-log") &&
+        starts_with(string!(.pod), "test-opa-server-automatic-log-config") &&
         .container == "opa" &&
         .logger == "decision"
     filteredAutomaticLogConfigServerOpa:
       type: filter
       inputs: [validEvents]
       condition: >-
-        starts_with(string!(.pod), "test-opa-server-automatic-log") &&
+        starts_with(string!(.pod), "test-opa-server-automatic-log-config") &&
         .container == "opa" &&
         .logger != "decision"
     filteredAutomaticLogConfigServerBundleBuilder:
       type: filter
       inputs: [validEvents]
       condition: >-
-        starts_with(string!(.pod), "test-opa-server-automatic-log") &&
+        starts_with(string!(.pod), "test-opa-server-automatic-log-config") &&
         .container == "bundle-builder"
     filteredAutomaticLogConfigServerVector:
       type: filter
       inputs: [validEvents]
       condition: >-
-        starts_with(string!(.pod), "test-opa-server-automatic-log") &&
+        starts_with(string!(.pod), "test-opa-server-automatic-log-config") &&
         .container == "vector"
     filteredAutomaticLogConfigServerPrepare:
       type: filter
       inputs: [validEvents]
       condition: >-
-        starts_with(string!(.pod), "test-opa-server-automatic-log") &&
+        starts_with(string!(.pod), "test-opa-server-automatic-log-config") &&
         .container == "prepare"
     filteredInvalidEvents:
       type: filter

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

@@ -3,13 +3,13 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 600
 commands:
-  - script: kubectl -n $NAMESPACE rollout status daemonset opa-server-from-role --timeout 600s
-  - script: kubectl -n $NAMESPACE rollout status daemonset opa-server-from-role-group --timeout 600s
+  - script: kubectl -n $NAMESPACE rollout status daemonset opa-server-resources-from-role --timeout 600s
+  - script: kubectl -n $NAMESPACE rollout status daemonset opa-server-resources-from-role-group --timeout 600s
 ---
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: opa-server-from-role
+  name: opa-server-resources-from-role
 spec:
   template:
     spec:
@@ -30,7 +30,7 @@ spec:
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: opa-server-from-role-group
+  name: opa-server-resources-from-role-group
 spec:
   template:
     spec:
@@ -51,7 +51,7 @@ spec:
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: opa-server-pod-overrides
+  name: opa-server-resources-from-pod-overrides
 spec:
   template:
     spec:

tests/templates/kuttl/resources/10-install-opa.yaml.j2

@@ -27,8 +27,8 @@ spec:
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
-      from-role: {}
-      from-role-group:
+      resources-from-role: {}
+      resources-from-role-group:
         config:
           resources:
             cpu:
@@ -38,7 +38,7 @@ spec:
               limit: 284Mi
           logging:
             enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-      pod-overrides:
+      resources-from-pod-overrides:
         podOverrides:
           spec:
             containers: