setup an initContainer for flyway to run migrations for tefca

CDCgov · Sep 18, 2024 · 8582c28 · 8582c28
1 parent baa4423
commit 8582c28
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 13 deletions.
diff --git a/charts/ecr-viewer/Chart.yaml b/charts/ecr-viewer/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: ecr-viewer
 description: A Helm chart for the DIBBs eCR Viewer
 type: application
-version: 0.2.0
+version: 0.2.1
diff --git a/charts/ecr-viewer/templates/tests/test-connection.yaml b/charts/ecr-viewer/templates/tests/test-connection.yaml
@@ -12,6 +12,6 @@ spec:
       image: busybox
       command: ['wget']
       args: [
-        "{{.Release.Name}}-{{.Values.serviceName}}:{{ .Values.service.port}}"
+        "{{.Release.Name}}-{{.Values.serviceName}}:{{ .Values.service.port}}/ecr-viewer"
       ]
   restartPolicy: Never
diff --git a/charts/fhir-converter/Chart.yaml b/charts/fhir-converter/Chart.yaml
@@ -3,4 +3,4 @@ apiVersion: v2
 name: fhir-converter
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.0
+version: 0.3.0
diff --git a/charts/ingestion/Chart.yaml b/charts/ingestion/Chart.yaml
@@ -3,4 +3,4 @@ apiVersion: v2
 name: ingestion
 description: A Helm chart for the DIBBs ingestion service
 type: application
-version: 0.2.0
+version: 0.2.1
diff --git a/charts/message-parser/Chart.yaml b/charts/message-parser/Chart.yaml
@@ -3,4 +3,4 @@ apiVersion: v2
 name: message-parser
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.0
+version: 0.2.1
diff --git a/charts/orchestration/Chart.yaml b/charts/orchestration/Chart.yaml
@@ -3,4 +3,4 @@ apiVersion: v2
 name: orchestration
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.0
+version: 0.2.1
diff --git a/charts/tefca-viewer/Chart.yaml b/charts/tefca-viewer/Chart.yaml
@@ -3,4 +3,4 @@ apiVersion: v2
 name: tefca-viewer
 description: A Helm chart for Kubernetes
 type: application
-version: 0.3.0
+version: 0.4.1
diff --git a/charts/tefca-viewer/templates/deployment.yaml b/charts/tefca-viewer/templates/deployment.yaml
@@ -18,7 +18,7 @@ spec:
       imagePullSecrets:
       containers:
         - name: {{.Chart.Name}}
-          image: ghcr.io/cdcgov/phdi/{{.Values.name}}:{{ .Values.image.tag }}
+          image: ghcr.io/cdcgov/phdi/{{.Values.name}}:{{.Values.image.tag}}
           imagePullPolicy: {{.Values.image.pullPolicy}}
           ports:
             - name: {{.Chart.Name | trunc 15}}
@@ -29,4 +29,16 @@ spec:
             - name: cred_manager
               value: {{.Values.credManager}}
             - name: database_url
-              value: {{.Values.databaseUrl}}
+              value: {{.Values.databaseConnectionString}}
+      initContainers:
+        - name: flyway
+          image: flyway/flyway:10.16-alpine
+          command: ["-configFiles=/flyway/conf/flyway.conf", "-schemas=public", "-connectRetries=60", "-url={{.Values.jdbcDatabaseConnectionString}}", "migrate"]
+          volumeMounts:
+            - mountPath: ./flyway/
+              name: {{.Values.appName}}
+      volumes:
+        - name: {{.Values.appName}}
+          image:
+            reference: ghcr.io/cdcgov/phdi/{{.Values.name}}:{{.Values.image.tag}}
+            pullPolicy: Always
diff --git a/charts/tefca-viewer/templates/tests/test-connection.yaml b/charts/tefca-viewer/templates/tests/test-connection.yaml
@@ -12,6 +12,6 @@ spec:
       image: busybox
       command: ["wget"]
       args: [
-        "{{.Release.Name}}-{{.Values.serviceName}}:{{ .Values.service.port}}/tefca-viewer"
+        "{{.Release.Name}}-{{.Values.serviceName}}:{{.Values.service.port}}/tefca-viewer"
       ]
   restartPolicy: Never
diff --git a/charts/tefca-viewer/values.yaml b/charts/tefca-viewer/values.yaml
@@ -12,4 +12,5 @@ service:
 name: tefca-viewer
 appName: tefca-viewer-app
 serviceName: tefca-viewer-service
-databaseUrl: database-url
+jdbcDatabaseConnectionString: jdbc-database-url
+databaseConnectionString: database-url
diff --git a/charts/trigger-code-reference/Chart.yaml b/charts/trigger-code-reference/Chart.yaml
@@ -3,4 +3,4 @@ apiVersion: v2
 name: trigger-code-reference
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.0
+version: 0.2.1
diff --git a/charts/validation/Chart.yaml b/charts/validation/Chart.yaml
@@ -3,5 +3,5 @@ apiVersion: v2
 name: validation
 description: A Helm chart for the DIBBs Validation Service
 type: application
-version: 0.2.0
+version: 0.2.1
 icon: https://commons.wikimedia.org/wiki/File:US_CDC_logo.svg