fix: run db migrations in helm chart

flanksource · Oct 9, 2023 · 9106fc8 · 9106fc8
1 parent c8c4fed
commit 9106fc8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ make build
 Starting the server will run the migrations and start scraping in background (The `default-schedule` configuration will run scraping every 60 minutes if configuration is not explicitly specified).
 
 ```bash
-DB_URL=postgres://<username>:<password>@localhost:5432/<db_name> ./.bin/config-db serve --run-migrations
+DB_URL=postgres://<username>:<password>@localhost:5432/<db_name> ./.bin/config-db serve --db-migrations
 ```
 
 ### Scape config

diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
@@ -42,6 +42,9 @@ spec:
             - --disable-postgrest={{ .Values.disablePostgrest }}
             - --change-retention-days={{ .Values.configChangeRetentionDays }}
             - --analysis-retention-days={{ .Values.configAnalysisRetentionDays }}
+            {{- if .Values.db.enabled}}
+            - --db-migrations
+            {{- end}}
           {{- if .Values.upstream.enabled}}
           envFrom:
             - secretRef:

diff --git a/chart/templates/postgres.yaml b/chart/templates/postgres.yaml
@@ -63,13 +63,15 @@ stringData:
   {{- $secretData := ( get $secretObj "data" | default dict ) }}
   {{- $user := (( get $secretData "POSTGRES_USER" ) | b64dec ) | default "postgres" }}
   {{- $password := (( get $secretData "POSTGRES_PASSWORD" ) | b64dec ) | default (randAlphaNum 32) }}
+  {{- $dbname := (( get $secretData "POSTGRES_DB" ) | b64dec ) | default "config_db" }}
   {{- $host := print (include "config-db.name" .) "-postgresql." .Release.Namespace  ".svc.cluster.local:5432" }}
   {{- $url := print "postgresql://" $user ":" $password "@" $host }}
-  {{- $configDbUrl := ( get $secretData .Values.db.secretKeyRef.key ) | default ( print $url "/config-db" ) }}
+  {{- $configDbUrl := ( get $secretData .Values.db.secretKeyRef.key ) | default ( print $url "/config_db?sslmode=disable" ) }}
 
   POSTGRES_USER: {{ $user | quote }}
   POSTGRES_PASSWORD: {{ $password | quote }}
   POSTGRES_HOST: {{ $host | quote }}
+  POSTGRES_DB: {{ $dbname | quote }}
   {{ .Values.db.secretKeyRef.key }}: {{ $configDbUrl | quote }}
 
 {{- end }}

diff --git a/fixtures/expected/file-git.json b/fixtures/expected/file-git.json
@@ -27,7 +27,7 @@
               {
                 "name": "httpbin_2xx_count",
                 "type": "counter",
-                "value": "result.code == 200 ? 1 : 0",
+                "value": "code == 200 ? 1 : 0",
                 "labels": [
                   {
                     "name": "name",