Update tests with "replicas" directly under "executor".

stackabletech · Sep 21, 2023 · 96edda9 · 96edda9
1 parent ed452e2
commit 96edda9
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 13 deletions.
diff --git a/tests/templates/kuttl/logging/05-deploy-automatic-log-config-spark-app.yaml.j2 b/tests/templates/kuttl/logging/05-deploy-automatic-log-config-spark-app.yaml.j2
@@ -69,8 +69,8 @@ spec:
               ROOT:
                 level: INFO
   executor:
+    replicas: 1
     config:
-      replicas: 1
       logging:
         enableVectorAgent: true
         containers:

diff --git a/tests/templates/kuttl/logging/06-deploy-custom-log-config-spark-app.yaml.j2 b/tests/templates/kuttl/logging/06-deploy-custom-log-config-spark-app.yaml.j2
@@ -69,8 +69,8 @@ spec:
             custom:
               configMap: spark-log-config
   executor:
+    replicas: 1
     config:
-      replicas: 1
       logging:
         enableVectorAgent: true
         containers:

diff --git a/tests/templates/kuttl/logging/07-deploy-automatic-log-config-pyspark-app.yaml.j2 b/tests/templates/kuttl/logging/07-deploy-automatic-log-config-pyspark-app.yaml.j2
@@ -70,8 +70,8 @@ spec:
               ROOT:
                 level: INFO
   executor:
+    replicas: 1
     config:
-      replicas: 1
       logging:
         enableVectorAgent: true
         containers:

diff --git a/tests/templates/kuttl/logging/08-deploy-custom-log-config-pyspark-app.yaml.j2 b/tests/templates/kuttl/logging/08-deploy-custom-log-config-pyspark-app.yaml.j2
@@ -70,8 +70,8 @@ spec:
             custom:
               configMap: pyspark-log-config
   executor:
+    replicas: 1
     config:
-      replicas: 1
       logging:
         enableVectorAgent: true
         containers:

diff --git a/tests/templates/kuttl/pod_overrides/10-deploy-spark-app.yaml.j2 b/tests/templates/kuttl/pod_overrides/10-deploy-spark-app.yaml.j2
@@ -48,8 +48,7 @@ spec:
                 cpu: 1500m
                 memory: 1024Mi
   executor:
-    config:
-      replicas: 1
+    replicas: 1
     podOverrides:
       spec:
         containers:

diff --git a/tests/templates/kuttl/resources/10-deploy-spark-app.yaml.j2 b/tests/templates/kuttl/resources/10-deploy-spark-app.yaml.j2
@@ -44,8 +44,8 @@ spec:
         memory:
           limit: 1024Mi
   executor:
+    replicas: 1
     config:
-      replicas: 1
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
       resources:

diff --git a/tests/templates/kuttl/smoke/10-deploy-spark-app.yaml.j2 b/tests/templates/kuttl/smoke/10-deploy-spark-app.yaml.j2
@@ -35,7 +35,7 @@ spec:
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
   executor:
+    replicas: 1
     config:
-      replicas: 1
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
diff --git a/tests/templates/kuttl/spark-examples/10-deploy-spark-app.yaml.j2 b/tests/templates/kuttl/spark-examples/10-deploy-spark-app.yaml.j2
@@ -28,7 +28,7 @@ spec:
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
   executor:
+    replicas: 1
     config:
-      replicas: 1
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
diff --git a/tests/templates/kuttl/spark-history-server/10-deploy-spark-app.yaml.j2 b/tests/templates/kuttl/spark-history-server/10-deploy-spark-app.yaml.j2
@@ -35,7 +35,7 @@ spec:
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
   executor:
+    replicas: 1
     config:
-      replicas: 1
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
diff --git a/tests/templates/kuttl/spark-history-server/12-deploy-spark-app.yaml.j2 b/tests/templates/kuttl/spark-history-server/12-deploy-spark-app.yaml.j2
@@ -35,7 +35,7 @@ spec:
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
   executor:
+    replicas: 1
     config:
-      replicas: 1
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
diff --git a/tests/templates/kuttl/spark-pi-private-s3/10-deploy-spark-app.yaml.j2 b/tests/templates/kuttl/spark-pi-private-s3/10-deploy-spark-app.yaml.j2
@@ -35,7 +35,7 @@ spec:
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
   executor:
+    replicas: 1
     config:
-      replicas: 1
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
diff --git a/tests/templates/kuttl/spark-pi-public-s3/10-deploy-spark-app.yaml.j2 b/tests/templates/kuttl/spark-pi-public-s3/10-deploy-spark-app.yaml.j2
@@ -33,7 +33,7 @@ spec:
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
   executor:
+    replicas: 1
     config:
-      replicas: 1
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}