v0.27.12: migration scripts in the image itself

kamu-data · Jul 2, 2024 · d1830bc · d1830bc
1 parent 5018c2c
commit d1830bc
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 68 deletions.
diff --git a/charts/kamu-api-server/Chart.yaml b/charts/kamu-api-server/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kamu-api-server
 description: API server component of the Kamu Compute Node
 type: application
-version: 0.27.11
+version: 0.27.12
 appVersion: "0.27.1"
 home: https://kamu.dev
 icon: https://www.kamu.dev/images/kamu_logo_icon_bg_square.png

diff --git a/charts/kamu-api-server/scripts/fetch-db-secret.sh b/charts/kamu-api-server/scripts/fetch-db-secret.sh
diff --git a/charts/kamu-api-server/scripts/run-db-migrations.sh b/charts/kamu-api-server/scripts/run-db-migrations.sh
diff --git a/charts/kamu-api-server/templates/configmap-db-scripts.yaml b/charts/kamu-api-server/templates/configmap-db-scripts.yaml
diff --git a/charts/kamu-api-server/templates/deployment.yaml b/charts/kamu-api-server/templates/deployment.yaml
@@ -39,8 +39,8 @@ spec:
             - "/bin/sh"
             - "-c"
             - |
-              /bin/sh /fetch-db-secret.sh {{ .Values.imageMigrations.databaseSecretName }} $AWS_REGION {{ .Values.imageMigrations.databaseHost }} {{ .Values.imageMigrations.databasePort }} {{ .Values.imageMigrations.databaseName }} &&
-              /bin/sh /run-db-migrations.sh {{ .Values.imageMigrations.migrationsPath }}
+              /scripts/fetch-db-secret.sh {{ .Values.imageMigrations.databaseSecretName }} $AWS_REGION {{ .Values.imageMigrations.databaseProvider }} {{ .Values.imageMigrations.databaseHost }} {{ .Values.imageMigrations.databasePort }} {{ .Values.imageMigrations.databaseName }} &&
+              /scripts/run-db-migrations.sh {{ .Values.imageMigrations.migrationsPath }}
           env:
             - name: RUST_BACKTRACE
               value: "1"
@@ -69,13 +69,6 @@ spec:
             {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-          volumeMounts:
-            - name: fetch-db-secret
-              mountPath: /fetch-db-secret.sh
-              subPath: fetch-db-secret.sh
-            - name: run-db-migrations
-              mountPath: /run-db-migrations.sh
-              subPath: run-db-migrations.sh
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
@@ -144,18 +137,6 @@ spec:
         - name: configs
           configMap:
             name: {{ include "kamu-api-server.fullname" . }}-{{ template "kamu-api-server.config.sha" . }}
-        - name: fetch-db-secret
-          configMap:
-            name: db-scripts
-            items:
-              - key: fetch-db-secret.sh
-                path: fetch-db-secret.sh
-        - name: run-db-migrations
-          configMap:
-            name: db-scripts
-            items:
-              - key: run-db-migrations.sh
-                path: run-db-migrations.sh
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/kamu-api-server/values.yaml b/charts/kamu-api-server/values.yaml
@@ -40,6 +40,7 @@ imageMigrations:
   tag: ""
   migrationsPath: ""
   databaseSecretName: ""
+  databaseProvider: postgresql
   databaseHost: ""
   databasePort: 5432
   databaseName: ""