Merge pull request #302 from mintel/INFRA-31618-py-dba-pre-sync

bump py-dba version and set logLevel env var
mintel · Oct 2, 2023 · 3ce867b · 3ce867b
2 parents 2480d0c + 2abade6
commit 3ce867b
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 9 deletions.
diff --git a/charts/standard-application-stack/CHANGELOG.md b/charts/standard-application-stack/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v5.16.0] - 2023-10-02
+### Changed
+- Bumped py-dba to `v0.2.0`
+- Added `logLevel` variable to py-dba jobs
+
 ## [v5.15.0] - 2023-09-27
 ### Changed
 - Changed keda `maxReplicaCount` to 30

diff --git a/charts/standard-application-stack/Chart.yaml b/charts/standard-application-stack/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 5.15.0
+version: 5.16.0
 
 dependencies:
   - name: redis

diff --git a/charts/standard-application-stack/README.md b/charts/standard-application-stack/README.md
@@ -1,6 +1,6 @@
 # standard-application-stack
 
-![Version: 5.15.0](https://img.shields.io/badge/Version-5.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 5.16.0](https://img.shields.io/badge/Version-5.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A generic chart to support most common application requirements
 
@@ -214,7 +214,7 @@ A generic chart to support most common application requirements
 | mariadb.client.resources.requests.cpu | string | `"100m"` |  |
 | mariadb.client.resources.requests.memory | string | `"64Mi"` |  |
 | mariadb.enabled | bool | `false` |  |
-| mariadb.extraUsers | object | `{"enabled":false,"users":[]}` | set up extra users for a database and table that already exist |
+| mariadb.extraUsers | object | `{"enabled":false,"job":{"logLevel":"INFO"},"users":[]}` | set up extra users for a database and table that already exist |
 | mariadb.metrics.enabled | bool | `false` |  |
 | mariadb.metrics.resources.limits.cpu | string | `"300m"` |  |
 | mariadb.metrics.resources.limits.memory | string | `"128Mi"` |  |
@@ -307,6 +307,7 @@ A generic chart to support most common application requirements
 | postgresql.client.resources.requests.memory | string | `"64Mi"` |  |
 | postgresql.enabled | bool | `false` |  |
 | postgresql.extraUsers.enabled | bool | `false` |  |
+| postgresql.extraUsers.job.logLevel | string | `"INFO"` |  |
 | postgresql.extraUsers.users | list | `[]` |  |
 | postgresql.image.tag | string | `"13.5.0-debian-10-r52"` |  |
 | postgresql.metrics.enabled | bool | `false` |  |

diff --git a/charts/standard-application-stack/templates/mariadb-py-dba.yaml b/charts/standard-application-stack/templates/mariadb-py-dba.yaml
@@ -12,6 +12,7 @@ metadata:
     {{ if .argo }}
     {{ include "mintel_common.argoAnnotations" .argo | nindent 4 }}
     {{ end }}
+    argocd.argoproj.io/hook: PreSync
   namespace: {{ $.Release.Namespace }}
 spec:
   ttlSecondsAfterFinished: 600
@@ -25,9 +26,11 @@ spec:
       restartPolicy: "Never"
       containers:
       - name: main
-        image: 551844124467.dkr.ecr.us-east-2.amazonaws.com/gitlab/mintel/satoshi/tools/py-dba:v0.1.3
+        image: 551844124467.dkr.ecr.us-east-2.amazonaws.com/gitlab/mintel/satoshi/tools/py-dba:v0.2.0
         imagePullPolicy: IfNotPresent
         env:
+        - name: 'LOG_LEVEL'
+          value: {{ $.Values.mariadb.extraUsers.job.logLevel }}
         - name: 'CONFIG_FILE'
           value: '/etc/config/py-dba-config'
         - name: DB_ENGINE

diff --git a/charts/standard-application-stack/templates/postgresql-py-dba.yaml b/charts/standard-application-stack/templates/postgresql-py-dba.yaml
@@ -12,6 +12,7 @@ metadata:
     {{ if .argo }}
     {{ include "mintel_common.argoAnnotations" .argo | nindent 4 }}
     {{ end }}
+    argocd.argoproj.io/hook: PreSync
   namespace: {{ $.Release.Namespace }}
 spec:
   ttlSecondsAfterFinished: 600
@@ -25,9 +26,11 @@ spec:
       restartPolicy: "Never"
       containers:
       - name: main
-        image: 551844124467.dkr.ecr.us-east-2.amazonaws.com/gitlab/mintel/satoshi/tools/py-dba:v0.1.3
+        image: 551844124467.dkr.ecr.us-east-2.amazonaws.com/gitlab/mintel/satoshi/tools/py-dba:v0.2.0
         imagePullPolicy: IfNotPresent
         env:
+        - name: 'LOG_LEVEL'
+          value: {{ $.Values.postgresql.extraUsers.job.logLevel }}
         - name: 'CONFIG_FILE'
           value: '/etc/config/py-dba-config'
         - name: DB_ENGINE

diff --git a/charts/standard-application-stack/tests/__snapshot__/mariadb_py_dba_test.yaml.snap b/charts/standard-application-stack/tests/__snapshot__/mariadb_py_dba_test.yaml.snap
@@ -5,6 +5,7 @@ adds correct config to configmap:
     metadata:
       annotations:
         app.mintel.com/placeholder: placeholder
+        argocd.argoproj.io/hook: PreSync
       labels:
         app.kubernetes.io/component: app
         app.kubernetes.io/managed-by: Helm
@@ -21,6 +22,8 @@ adds correct config to configmap:
         spec:
           containers:
             - env:
+                - name: LOG_LEVEL
+                  value: INFO
                 - name: CONFIG_FILE
                   value: /etc/config/py-dba-config
                 - name: DB_ENGINE
@@ -30,7 +33,7 @@ adds correct config to configmap:
               envFrom:
                 - secretRef:
                     name: test-app-mariadb
-              image: 551844124467.dkr.ecr.us-east-2.amazonaws.com/gitlab/mintel/satoshi/tools/py-dba:v0.1.3
+              image: 551844124467.dkr.ecr.us-east-2.amazonaws.com/gitlab/mintel/satoshi/tools/py-dba:v0.2.0
               imagePullPolicy: IfNotPresent
               name: main
               resources:
@@ -96,6 +99,7 @@ extraUsers adds job and configmap:
     metadata:
       annotations:
         app.mintel.com/placeholder: placeholder
+        argocd.argoproj.io/hook: PreSync
       labels:
         app.kubernetes.io/component: app
         app.kubernetes.io/managed-by: Helm
@@ -112,6 +116,8 @@ extraUsers adds job and configmap:
         spec:
           containers:
             - env:
+                - name: LOG_LEVEL
+                  value: INFO
                 - name: CONFIG_FILE
                   value: /etc/config/py-dba-config
                 - name: DB_ENGINE
@@ -121,7 +127,7 @@ extraUsers adds job and configmap:
               envFrom:
                 - secretRef:
                     name: test-app-mariadb
-              image: 551844124467.dkr.ecr.us-east-2.amazonaws.com/gitlab/mintel/satoshi/tools/py-dba:v0.1.3
+              image: 551844124467.dkr.ecr.us-east-2.amazonaws.com/gitlab/mintel/satoshi/tools/py-dba:v0.2.0
               imagePullPolicy: IfNotPresent
               name: main
               resources:

diff --git a/charts/standard-application-stack/tests/__snapshot__/postgresql_py_dba_test.yaml.snap b/charts/standard-application-stack/tests/__snapshot__/postgresql_py_dba_test.yaml.snap
@@ -5,6 +5,7 @@ adds correct config to configmap:
     metadata:
       annotations:
         app.mintel.com/placeholder: placeholder
+        argocd.argoproj.io/hook: PreSync
       labels:
         app.kubernetes.io/component: app
         app.kubernetes.io/managed-by: Helm
@@ -21,6 +22,8 @@ adds correct config to configmap:
         spec:
           containers:
             - env:
+                - name: LOG_LEVEL
+                  value: INFO
                 - name: CONFIG_FILE
                   value: /etc/config/py-dba-config
                 - name: DB_ENGINE
@@ -30,7 +33,7 @@ adds correct config to configmap:
               envFrom:
                 - secretRef:
                     name: test-app-postgresql
-              image: 551844124467.dkr.ecr.us-east-2.amazonaws.com/gitlab/mintel/satoshi/tools/py-dba:v0.1.3
+              image: 551844124467.dkr.ecr.us-east-2.amazonaws.com/gitlab/mintel/satoshi/tools/py-dba:v0.2.0
               imagePullPolicy: IfNotPresent
               name: main
               resources:
@@ -96,6 +99,7 @@ extraUsers adds job and configmap:
     metadata:
       annotations:
         app.mintel.com/placeholder: placeholder
+        argocd.argoproj.io/hook: PreSync
       labels:
         app.kubernetes.io/component: app
         app.kubernetes.io/managed-by: Helm
@@ -112,6 +116,8 @@ extraUsers adds job and configmap:
         spec:
           containers:
             - env:
+                - name: LOG_LEVEL
+                  value: INFO
                 - name: CONFIG_FILE
                   value: /etc/config/py-dba-config
                 - name: DB_ENGINE
@@ -121,7 +127,7 @@ extraUsers adds job and configmap:
               envFrom:
                 - secretRef:
                     name: test-app-postgresql
-              image: 551844124467.dkr.ecr.us-east-2.amazonaws.com/gitlab/mintel/satoshi/tools/py-dba:v0.1.3
+              image: 551844124467.dkr.ecr.us-east-2.amazonaws.com/gitlab/mintel/satoshi/tools/py-dba:v0.2.0
               imagePullPolicy: IfNotPresent
               name: main
               resources:

diff --git a/charts/standard-application-stack/values.yaml b/charts/standard-application-stack/values.yaml
@@ -1078,6 +1078,9 @@ mariadb:
     #   tables:
     #   - table: "table1"
     #     permissions: ["DELETE"]
+    job:
+      logLevel: "INFO"
+      # Log level for the py-dba job, must be one of ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
 
 
 memcached:
@@ -1143,6 +1146,9 @@ postgresql:
     #   tables:
     #   - table: "table1"
     #     permissions: ["DELETE"]
+    job:
+      logLevel: "INFO"
+      # Log level for the py-dba job, must be one of ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
 
 redis:
   enabled: false