Merge pull request #24 from DataKitchen/release/2.3.2

Release/2.3.2

Author: datakitchen-devops

.gitignore

@@ -169,3 +169,6 @@ observability_ui/node_modules/
 
 # Terraform
 .terraform*
+
+# Helm
+**/*.tgz

common/apscheduler_extensions.py

@@ -58,7 +58,7 @@ def validate_cron_expression(expression: str) -> list[str]:
     if len(values) != 5:
         errors.append(f"Got {len(values)} fields. Expected 5.")
 
-    for (field_name, field_class), value in zip(CRON_EXPRESSION_FIELDS, values, strict=True):
+    for (field_name, field_class), value in zip(CRON_EXPRESSION_FIELDS, values, strict=False):
         try:
             field_class(field_name, value)
         except ValueError:

common/entity_services/project_service.py

@@ -58,7 +58,7 @@ def get_test_outcomes_with_rules(
         query = TestOutcome.select(TestOutcome).where(TestOutcome.component.in_(project.components))
         if rules.search is not None:
             query = query.where(
-                ((TestOutcome.name ** f"%{rules.search}%") | (TestOutcome.description ** f"%{rules.search}%"))
+                (TestOutcome.name ** f"%{rules.search}%") | (TestOutcome.description ** f"%{rules.search}%")
             )
         if filters:
             if statuses := filters.statuses:

deploy/charts/observability-app/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: dataops-observability-app
 type: application
 appVersion: "2.x.x"
-version: "2.1.0"
+version: "2.2.0"
 
 description: DataOps Observability
 home: https://datakitchen.io

deploy/charts/observability-app/templates/agent-api.yaml

@@ -61,6 +61,10 @@ spec:
                   name: {{ .Values.observability.keys_secrets_name | quote }}
                   key: AGENT_API_KEY_FLASK_SECRET
             {{- end }}
+          {{- with .Values.extraVolumeMounts }}
+          volumeMounts:
+            {{ toYaml . | nindent 12 }}
+          {{- end }}
           command: [ "/dk/bin/gunicorn" ]
           args: [ "-c", "/dk/gunicorn.conf.py", "agent_api.app:app" ]
           readinessProbe:
@@ -74,6 +78,10 @@ spec:
                 - name: Host
                   value: {{ tpl .Values.agent_api.hostname . | quote }}
                 {{- end }}
+      {{- with .Values.extraVolumes }}
+      volumes:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.agent_api.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

deploy/charts/observability-app/templates/cli-tool-hook.yaml

@@ -1,22 +1,23 @@
-{{- range .Values.cli_hook.enable }}
+{{- range $index, $job := .Values.cli_hook.enable }}
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: "cli-job"
+  name: cli-job-{{ default $index .name }}
   annotations:
     "helm.sh/hook": {{ join ", " .phases }}
     "helm.sh/hook-weight": {{ default 0 .weight | quote }}
     "helm.sh/hook-delete-policy": hook-succeeded, before-hook-creation
 spec:
   template:
     metadata:
-      name: "cli-job"
+      name: cli-job-{{ default $index .name }}
     spec:
       restartPolicy: Never
       {{- with $.Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      serviceAccountName: {{ include "observability.serviceAccountName" $ }}
       containers:
         - name: cli-hook
           image: {{ include "observability.cli_hook.image" $ | quote }}
@@ -25,9 +26,21 @@ spec:
             {{- include "observability.environment.base" $ | nindent 12 }}
             {{- include "observability.environment.database" $ | nindent 12 }}
             {{- include "observability.environment.pythonpath" $ | nindent 12 }}
+          {{- with $.Values.extraVolumeMounts }}
+          volumeMounts:
+            {{ toYaml . | nindent 12 }}
+          {{- end }}
           command:
             {{- range .command }}
             - {{ . | quote -}}
             {{- end }}
+          args:
+            {{- range .args }}
+            - {{ . | quote -}}
+            {{- end }}
+      {{- with $.Values.extraVolumes }}
+      volumes:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
 ---
 {{- end }}

deploy/charts/observability-app/templates/event-api.yaml

@@ -62,6 +62,10 @@ spec:
                   name: {{ .Values.observability.keys_secrets_name | quote }}
                   key: EVENTS_KEY_FLASK_SECRET
             {{- end }}
+          {{- with .Values.extraVolumeMounts }}
+          volumeMounts:
+            {{ toYaml . | nindent 12 }}
+          {{- end }}
           command: [ "/dk/bin/gunicorn" ]
           args: [ "-c", "/dk/gunicorn.conf.py", "event_api.app:app" ]
           readinessProbe:
@@ -75,7 +79,10 @@ spec:
                 - name: Host
                   value: {{ tpl .Values.event_api.hostname . | quote }}
                 {{- end }}
-
+      {{- with .Values.extraVolumes }}
+      volumes:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.event_api.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

deploy/charts/observability-app/templates/observability-api.yaml

@@ -61,6 +61,10 @@ spec:
                   name: {{ .Values.observability.keys_secrets_name | quote }}
                   key: OBSERVABILITY_KEY_FLASK_SECRET
             {{- end }}
+          {{- with .Values.extraVolumeMounts }}
+          volumeMounts:
+            {{ toYaml . | nindent 12 }}
+          {{- end }}
           command: [ "/dk/bin/gunicorn" ]
           args: [ "-c", "/dk/gunicorn.conf.py", "observability_api.app:app" ]
           readinessProbe:
@@ -74,6 +78,10 @@ spec:
                 - name: Host
                   value: {{ tpl .Values.observability_api.hostname . | quote }}
                 {{- end }}
+      {{- with .Values.extraVolumes }}
+      volumes:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.observability_api.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

deploy/charts/observability-app/templates/rules-engine.yaml

@@ -45,8 +45,16 @@ spec:
             {{- include "observability.environment.database" . | nindent 12 }}
             {{- include "observability.environment.kafka" . | nindent 12 }}
             {{- include "observability.environment.smtp" . | nindent 12 }}
+          {{- with .Values.extraVolumeMounts }}
+          volumeMounts:
+            {{ toYaml . | nindent 12 }}
+          {{- end }}
           command: [ "/dk/bin/rules-engine" ]
           {{- include "observability.probes.readiness_cmd" "rules-engine" | nindent 10 -}}
+      {{- with .Values.extraVolumes }}
+      volumes:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.rules_engine.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

deploy/charts/observability-app/templates/run-manager.yaml

@@ -44,8 +44,16 @@ spec:
             {{- include "observability.environment.base" . | nindent 12 }}
             {{- include "observability.environment.database" . | nindent 12 }}
             {{- include "observability.environment.kafka" . | nindent 12 }}
+          {{- with .Values.extraVolumeMounts }}
+          volumeMounts:
+            {{ toYaml . | nindent 12 }}
+          {{- end }}
           command: ["/dk/bin/run-manager"]
           {{- include "observability.probes.readiness_cmd" "run-manager" | nindent 10 -}}
+      {{- with .Values.extraVolumes }}
+      volumes:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.run_manager.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}