rebuilt charts, adapted integration tests

stackabletech · Aug 18, 2023 · d3ab0e5 · d3ab0e5
1 parent 23983db
commit d3ab0e5
Show file tree

Hide file tree

Showing 8 changed files with 10,001 additions and 10,012 deletions.
diff --git a/deploy/helm/airflow-operator/crds/crds.yaml b/deploy/helm/airflow-operator/crds/crds.yaml
diff --git a/tests/templates/kuttl/ldap/06-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/ldap/06-install-airflow-cluster.yaml.j2
@@ -64,20 +64,19 @@ commands:
           roleGroups:
             default:
               replicas: 1
-        executor:
 {% if test_scenario['values']['executor'] == 'celery' %}
-          celery:
-            config:
-              logging:
-                enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-            roleGroups:
-              default:
-                replicas: 1
+        celeryExecutors:
+          config:
+            logging:
+              enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+          roleGroups:
+            default:
+              replicas: 1
 {% elif test_scenario['values']['executor'] == 'kubernetes' %}
-          kubernetes:
-            config:
-              logging:
-                enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+        kubernetesExecutors:
+          config:
+            logging:
+              enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
 {% endif %}
         schedulers:
           config:

diff --git a/tests/templates/kuttl/logging/04-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/logging/04-install-airflow-cluster.yaml.j2
@@ -116,40 +116,39 @@ spec:
               airflow:
                 custom:
                   configMap: airflow-log-config
-  executor:
-    celery:
-      roleGroups:
-        automatic-log-config:
-          replicas: 1
-          config:
-            logging:
-              enableVectorAgent: true
-              containers:
-                airflow:
-                  console:
-                    level: INFO
-                  file:
+  celeryExecutors:
+    roleGroups:
+      automatic-log-config:
+        replicas: 1
+        config:
+          logging:
+            enableVectorAgent: true
+            containers:
+              airflow:
+                console:
+                  level: INFO
+                file:
+                  level: DEBUG
+                loggers:
+                  ROOT:
                     level: DEBUG
-                  loggers:
-                    ROOT:
-                      level: DEBUG
-                vector:
-                  console:
-                    level: INFO
-                  file:
+              vector:
+                console:
+                  level: INFO
+                file:
+                  level: INFO
+                loggers:
+                  ROOT:
                     level: INFO
-                  loggers:
-                    ROOT:
-                      level: INFO
-        custom-log-config:
-          replicas: 1
-          config:
-            logging:
-              enableVectorAgent: true
-              containers:
-                airflow:
-                  custom:
-                    configMap: airflow-log-config
+      custom-log-config:
+        replicas: 1
+        config:
+          logging:
+            enableVectorAgent: true
+            containers:
+              airflow:
+                custom:
+                  configMap: airflow-log-config
   schedulers:
     roleGroups:
       automatic-log-config:

diff --git a/tests/templates/kuttl/mount-dags-configmap/03-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/mount-dags-configmap/03-install-airflow-cluster.yaml.j2
@@ -87,24 +87,23 @@ spec:
         envOverrides:
           AIRFLOW__CORE__DAGS_FOLDER: "/dags"
         replicas: 1
-  executor:
 {% if test_scenario['values']['executor'] == 'celery' %}
-    celery:
-      config:
-        logging:
-          enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-      roleGroups:
-        default:
-          envOverrides:
-            AIRFLOW__CORE__DAGS_FOLDER: "/dags"
-          replicas: 2
+  celeryExecutors:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+    roleGroups:
+      default:
+        envOverrides:
+          AIRFLOW__CORE__DAGS_FOLDER: "/dags"
+        replicas: 2
 {% elif test_scenario['values']['executor'] == 'kubernetes' %}
-    kubernetes:
-      config:
-        logging:
-          enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-      envOverrides:
-            AIRFLOW__CORE__DAGS_FOLDER: "/dags"
+  kubernetesExecutors:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+    envOverrides:
+          AIRFLOW__CORE__DAGS_FOLDER: "/dags"
 {% endif %}
   schedulers:
     config:

diff --git a/tests/templates/kuttl/mount-dags-gitsync/03-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/mount-dags-gitsync/03-install-airflow-cluster.yaml.j2
@@ -48,20 +48,19 @@ spec:
     roleGroups:
       default:
         replicas: 1
-  executor:
 {% if test_scenario['values']['executor'] == 'celery' %}
-    celery:
-      config:
-        logging:
-          enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-      roleGroups:
-        default:
-          replicas: 1
+  celeryExecutors:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+    roleGroups:
+      default:
+        replicas: 1
 {% elif test_scenario['values']['executor'] == 'kubernetes' %}
-    kubernetes:
-      config:
-        logging:
-          enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+  kubernetesExecutors:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
 {% endif %}
   schedulers:
     config:

diff --git a/tests/templates/kuttl/orphaned-resources/03-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/orphaned-resources/03-install-airflow-cluster.yaml.j2
@@ -41,14 +41,13 @@ spec:
     roleGroups:
       default:
         replicas: 1
-  executor:
-    celery:
-      config:
-        logging:
-          enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-      roleGroups:
-        default:
-          replicas: 2
+  celeryExecutors:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+    roleGroups:
+      default:
+        replicas: 2
   schedulers:
     config:
       logging:

diff --git a/tests/templates/kuttl/resources/03-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/resources/03-install-airflow-cluster.yaml.j2
@@ -41,39 +41,38 @@ spec:
     roleGroups:
       default:
         replicas: 1
-  executor:
-    celery:
-      config:
-        logging:
-          enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-        resources:
-          cpu:
-            min: 100m
-            max: "1"
-          memory:
-            limit: 2Gi
-      roleGroups:
-        resources-from-role:
-          replicas: 1
-        resources-from-role-group:
-          config:
-            resources:
-              cpu:
-                min: 200m
-                max: "2"
-              memory:
-                limit: 3Gi
-          replicas: 1
-        resources-from-pod-overrides:
-          podOverrides:
-            spec:
-              containers:
-                - name: airflow
-                  resources:
-                    requests:
-                      cpu: 300m
-                    limits:
-                      cpu: 900m
+  celeryExecutors:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+      resources:
+        cpu:
+          min: 100m
+          max: "1"
+        memory:
+          limit: 2Gi
+    roleGroups:
+      resources-from-role:
+        replicas: 1
+      resources-from-role-group:
+        config:
+          resources:
+            cpu:
+              min: 200m
+              max: "2"
+            memory:
+              limit: 3Gi
+        replicas: 1
+      resources-from-pod-overrides:
+        podOverrides:
+          spec:
+            containers:
+              - name: airflow
+                resources:
+                  requests:
+                    cpu: 300m
+                  limits:
+                    cpu: 900m
   schedulers:
     config:
       logging:

diff --git a/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2
@@ -41,20 +41,19 @@ spec:
     roleGroups:
       default:
         replicas: 1
-  executor:
 {% if test_scenario['values']['executor'] == 'celery' %}
-    celery:
-      config:
-        logging:
-          enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-      roleGroups:
-        default:
-          replicas: 2
+  celeryExecutors:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+    roleGroups:
+      default:
+        replicas: 2
 {% elif test_scenario['values']['executor'] == 'kubernetes' %}
-    kubernetes:
-      config:
-        logging:
-          enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+  kubernetesExecutors:
+    config:
+      logging:
+        enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
 {% endif %}
   schedulers:
     config: