Fix some errors in the tests (#582)

Author: siegfriedweber

tests/templates/kuttl/oidc/00-druid-secrets.j2

@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: druid-oidc
-timeout: 240
 stringData:
   DRUID_OIDC_CLIENT: druid
   DRUID_OIDC_CLIENT_SECRET: R1bxHUD569vHeQdw
@@ -13,6 +12,5 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: druid-internal-password
-timeout: 240
 stringData:
   DRUID_INTERNAL_PASSWORD: mBcrsG328ox25fs3Fse

tests/templates/kuttl/oidc/00-s3-secret.yaml.j2

@@ -5,7 +5,6 @@ metadata:
   name: minio-credentials
   labels:
     secrets.stackable.tech/class: s3-credentials-class
-timeout: 240
 stringData:
   accessKey: minioAccessKey
   secretKey: minioSecretKey

tests/templates/kuttl/oidc/20-zookeeper.yaml renamed to tests/templates/kuttl/oidc/20-zookeeper.yaml.j2

@@ -7,7 +7,14 @@ spec:
   image:
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
     pullPolicy: IfNotPresent
+{% if lookup('env', 'VECTOR_AGGREGATOR') %}
+  clusterConfig:
+    vectorAggregatorConfigMapName: vector-aggregator-discovery
+{% endif %}
   servers:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
       default:
         replicas: 1

tests/templates/kuttl/oidc/40_druid.yaml.j2

@@ -25,7 +25,7 @@ metadata:
   name: druid
 spec:
   image:
-    productVersion: "{{ test_scenario['values']['druid-latest'] }}"
+    productVersion: "{{ test_scenario['values']['druid'] }}"
     pullPolicy: IfNotPresent
   clusterConfig:
     additionalExtensions:
@@ -56,8 +56,14 @@ spec:
       connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true
       host: localhost
       port: 1527
+{% if lookup('env', 'VECTOR_AGGREGATOR') %}
+    vectorAggregatorConfigMapName: vector-aggregator-discovery
+{% endif %}
     zookeeperConfigMapName: druid-znode
   brokers:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
       default:
         replicas: 1
@@ -115,20 +121,29 @@ spec:
                     name: druid-internal-password
                     key: DRUID_INTERNAL_PASSWORD
   coordinators:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
       default:
         replicas: 1
     configOverrides:
       runtime.properties: *runtime-properties
     podOverrides: *pod-overrides
   historicals:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
       default:
         replicas: 1
     configOverrides:
       runtime.properties: *runtime-properties
     podOverrides: *pod-overrides
   middleManagers:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
       default:
         replicas: 1
@@ -152,6 +167,9 @@ spec:
                     name: druid-internal-password
                     key: DRUID_INTERNAL_PASSWORD
   routers:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
     roleGroups:
       default:
         replicas: 1

tests/templates/kuttl/resources/00-s3-secret.yaml.j2

@@ -5,7 +5,6 @@ metadata:
   name: minio-credentials
   labels:
     secrets.stackable.tech/class: s3-credentials-class
-timeout: 240
 stringData:
   accessKey: minioAccessKey
   secretKey: minioSecretKey

tests/templates/kuttl/s3-deep-storage/00-s3-secret.yaml.j2

@@ -5,7 +5,6 @@ metadata:
   name: minio-credentials
   labels:
     secrets.stackable.tech/class: s3-credentials-class
-timeout: 240
 stringData:
   accessKey: minioAccessKey
   secretKey: minioSecretKey

tests/templates/kuttl/tls/00-s3-secret.yaml.j2

@@ -5,7 +5,6 @@ metadata:
   name: minio-credentials
   labels:
     secrets.stackable.tech/class: s3-credentials-class
-timeout: 240
 stringData:
   accessKey: minioAccessKey
   secretKey: minioSecretKey

tests/test-definition.yaml

@@ -136,7 +136,7 @@ tests:
       - openshift
   - name: oidc
     dimensions:
-      - druid-latest
+      - druid
       - zookeeper-latest
       - s3-use-tls
       - openshift