fix(tests): shorten rolegroup names

Author: maltesander

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

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

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

@@ -55,7 +55,7 @@ spec:
     vectorAggregatorConfigMapName: hive-vector-aggregator-discovery
   metastore:
     roleGroups:
-      automatic-log-config:
+      automatic-log:
         replicas: 1
         config:
           logging:
@@ -90,7 +90,7 @@ spec:
               - name: prepared-logs
                 configMap:
                   name: prepared-logs
-      custom-log-config:
+      custom-log:
         replicas: 1
         config:
           logging:

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

@@ -28,25 +28,25 @@ customConfig:
       type: filter
       inputs: [validEvents]
       condition: >-
-        .pod == "test-hive-metastore-automatic-log-config-0" &&
+        .pod == "test-hive-metastore-automatic-log-0" &&
         .container == "hive"
     filteredAutomaticLogConfigMetastoreVector:
       type: filter
       inputs: [validEvents]
       condition: >-
-        .pod == "test-hive-metastore-automatic-log-config-0" &&
+        .pod == "test-hive-metastore-automatic-log-0" &&
         .container == "vector"
     filteredCustomLogConfigMetastoreHive:
       type: filter
       inputs: [validEvents]
       condition: >-
-        .pod == "test-hive-metastore-custom-log-config-0" &&
+        .pod == "test-hive-metastore-custom-log-0" &&
         .container == "hive"
     filteredCustomLogConfigMetastoreVector:
       type: filter
       inputs: [validEvents]
       condition: >-
-        .pod == "test-hive-metastore-custom-log-config-0" &&
+        .pod == "test-hive-metastore-custom-log-0" &&
         .container == "vector"
     filteredInvalidEvents:
       type: filter

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

@@ -6,7 +6,7 @@ timeout: 900
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: hive-metastore-resources-from-role
+  name: hive-metastore-from-role
 spec:
   template:
     spec:
@@ -29,7 +29,7 @@ status:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: hive-metastore-resources-from-role-group
+  name: hive-metastore-from-role-group
 spec:
   template:
     spec:
@@ -52,7 +52,7 @@ status:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: hive-metastore-resources-from-pod-overrides
+  name: hive-metastore-pod-overrides
 spec:
   template:
     spec:

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

@@ -29,9 +29,9 @@ spec:
         memory:
           limit: 4Gi
     roleGroups:
-      resources-from-role:
+      from-role:
         replicas: 1
-      resources-from-role-group:
+      from-role-group:
         replicas: 1
         config:
           resources:
@@ -40,7 +40,7 @@ spec:
               max: "3"
             memory:
               limit: 3Gi
-      resources-from-pod-overrides:
+      pod-overrides:
         podOverrides:
           spec:
             containers:

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

@@ -3,5 +3,5 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 600
 commands:
-  - script: kubectl -n "$NAMESPACE" get sts hive-metastore-resources-from-role -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "hive") | .env[] | select (.name == "HADOOP_HEAPSIZE" and .value == "3276")'
-  - script: kubectl -n "$NAMESPACE" get sts hive-metastore-resources-from-role-group -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "hive") | .env[] | select (.name == "HADOOP_HEAPSIZE" and .value == "2457")'
+  - script: kubectl -n "$NAMESPACE" get sts hive-metastore-from-role -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "hive") | .env[] | select (.name == "HADOOP_HEAPSIZE" and .value == "3276")'
+  - script: kubectl -n "$NAMESPACE" get sts hive-metastore-from-role-group -o yaml | yq -e '.spec.template.spec.containers[] | select (.name == "hive") | .env[] | select (.name == "HADOOP_HEAPSIZE" and .value == "2457")'