setup an initContainer for flyway to run migrations for tefca

CDCgov · Sep 21, 2024 · 6784c1a · 6784c1a
1 parent baa4423
commit 6784c1a
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 15 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.13
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}}
@@ -28,5 +28,10 @@ spec:
               value: {{.Values.fhirUrl}}
             - name: cred_manager
               value: {{.Values.credManager}}
-            - name: database_url
-              value: {{.Values.databaseUrl}}
+            - name: DATABASE_URL
+              value: {{.Values.databaseConnectionString}}
+        - name: flyway
+          image: ghcr.io/cdcgov/phdi/{{.Values.name}}-flyway:{{.Values.image.tag}}
+          imagePullPolicy: {{.Values.image.pullPolicy}}
+          args: ["-schemas=public", "-connectRetries=10", "-url={{.Values.jdbcDatabaseUrl}}", "-user={{.Values.jdbcDatabaseUser}}", "-password={{.Values.jdbcDatabasePassword}}", "-locations=filesystem:/flyway/sql", "migrate"]
+          restartPolicy: Never
diff --git a/charts/tefca-viewer/templates/serviceAccount.yaml b/charts/tefca-viewer/templates/serviceAccount.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{.Values.name}}
+  annotations:
+    eks.amazonaws.com/role-arn: {{.Values.tefcaViewerDBRoleArn}}
diff --git a/charts/tefca-viewer/templates/tests/test-connection.yaml b/charts/tefca-viewer/templates/tests/test-connection.yaml
@@ -12,6 +12,18 @@ spec:
       image: busybox
       command: ["wget"]
       args: [
-        "{{.Release.Name}}-{{.Values.serviceName}}:{{ .Values.service.port}}/tefca-viewer"
+        "{{.Release.Name}}-{{.Values.serviceName}}:{{.Values.service.port}}/tefca-viewer"
       ]
+  # initContainers:
+  #   - name: db
+  #     image: postgres:alpine
+  #     ports:
+  #       - containerPort: 5432
+  #     env:
+  #       - name: POSTGRES_DB
+  #         value: tefca_db
+  #       - name: POSTGRES_USER
+  #         value: postgres
+  #       - name: POSTGRES_PASSWORD
+  #         value: pw
   restartPolicy: Never
diff --git a/charts/tefca-viewer/values.yaml b/charts/tefca-viewer/values.yaml
@@ -4,12 +4,18 @@ replicaCount: 1
 image:
     repository: ghcr.io/cdcgov/phdi/tefca-viewer
     pullPolicy: Always
-    tag: dev
+    tag: v1.6.6
 
 service:
     port: 3000
 
 name: tefca-viewer
 appName: tefca-viewer-app
 serviceName: tefca-viewer-service
-databaseUrl: database-url
+tefcaViewerDBRoleArn: placeholder-arn
+jdbcDatabaseUrl: jdbc-placeholder-string
+jdbcDatabaseUser: postgres
+jdbcDatabasePassword: pw
+#jdbc:postgresql://db:5432/tefca_db?user=postgres&password=pw&ssl=true
+databaseConnectionString: jdbc-placeholder-string
+#postgres://postgres:pw@db:5432/tefca_db
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