Database, Image, and chart changes (#56)

* pull only tefca-viewer changes from upgrade dibbs charts to 1.6.4 and added latest image location and tag * fix linting * code is not obsolete
CDCgov · Oct 18, 2024 · f526b4e · f526b4e
1 parent e89139d
commit f526b4e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
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.26
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,3 +28,5 @@ spec:
               value: {{.Values.fhirUrl}}
             - name: cred_manager
               value: {{.Values.credManager}}
+            - name: DATABASE_URL
+              value: "{{.Values.databaseConnectionString}}"
diff --git a/charts/tefca-viewer/templates/tests/serviceAccount.yaml b/charts/tefca-viewer/templates/tests/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,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
+  restartPolicy: Never
diff --git a/charts/tefca-viewer/values.yaml b/charts/tefca-viewer/values.yaml
@@ -12,3 +12,10 @@ service:
 name: tefca-viewer
 appName: tefca-viewer-app
 serviceName: tefca-viewer-service
+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