diff --git a/charts/ecr-viewer/Chart.yaml b/charts/ecr-viewer/Chart.yaml index eb2f6cd..95419e7 100644 --- 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/deployment.yaml b/charts/ecr-viewer/templates/deployment.yaml index 69e68ac..936ab22 100644 --- a/charts/ecr-viewer/templates/deployment.yaml +++ b/charts/ecr-viewer/templates/deployment.yaml @@ -45,3 +45,18 @@ spec: secretKeyRef: name: "{{.Release.Name}}-{{.Values.secretName}}" key: source + - name: APP_ENV + valueFrom: + secretKeyRef: + name: "{{.Release.Name}}-{{.Values.secretName}}" + key: app-env + - name: NODE_ENV + valueFrom: + secretKeyRef: + name: "{{.Release.Name}}-{{.Values.secretName}}" + key: node-env + - name: NEXT_PUBLIC_BASEPATH + valueFrom: + secretKeyRef: + name: "{{.Release.Name}}-{{.Values.secretName}}" + key: next-public-basepath diff --git a/charts/ecr-viewer/templates/secrets.yaml b/charts/ecr-viewer/templates/secrets.yaml index af46243..47dfaa4 100644 --- a/charts/ecr-viewer/templates/secrets.yaml +++ b/charts/ecr-viewer/templates/secrets.yaml @@ -9,3 +9,6 @@ stringData: nbs-pub-key: {{.Values.nbsPubKey | quote }} ecr-bucket-name: {{.Values.ecrBucketName | quote }} source: {{.Values.source | quote }} + app-env: {{.Values.appEnv | quote }} + node-env: {{.Values.nodeEnv | quote }} + next-public-basepath: {{.Values.nextPublicBasepath | quote }} diff --git a/charts/ecr-viewer/templates/tests/test-connection.yaml b/charts/ecr-viewer/templates/tests/test-connection.yaml index 76f8337..ae7ace8 100644 --- 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/ecr-viewer/values.yaml b/charts/ecr-viewer/values.yaml index bdeb8e3..7ba6b75 100644 --- a/charts/ecr-viewer/values.yaml +++ b/charts/ecr-viewer/values.yaml @@ -4,7 +4,7 @@ replicaCount: 1 image: repository: ghcr.io/cdcgov/phdi/ecr-viewer pullPolicy: IfNotPresent - tag: v1.2.1 + tag: v1.6.4 service: port: 3000 @@ -21,3 +21,6 @@ ecrViewerS3RoleArn: placeholder-arn nbsPubKey: placeholder-key ecrBucketName: placeholder-bucket source: placeholder-source +appEnv: test +nodeEnv: production +nextPublicBasepath: /ecr-viewer diff --git a/charts/fhir-converter/Chart.yaml b/charts/fhir-converter/Chart.yaml index ab23573..a1633f7 100644 --- 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/fhir-converter/values.yaml b/charts/fhir-converter/values.yaml index 661829d..2306786 100644 --- a/charts/fhir-converter/values.yaml +++ b/charts/fhir-converter/values.yaml @@ -4,7 +4,7 @@ replicaCount: 1 image: repository: ghcr.io/cdcgov/phdi/fhir-converter pullPolicy: IfNotPresent - tag: v1.2.1 + tag: v1.6.4 service: port: 8080 diff --git a/charts/ingestion/Chart.yaml b/charts/ingestion/Chart.yaml index 7f41298..454f21d 100644 --- 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/ingestion/values.yaml b/charts/ingestion/values.yaml index ad52d59..d9982e8 100644 --- a/charts/ingestion/values.yaml +++ b/charts/ingestion/values.yaml @@ -3,7 +3,7 @@ replicaCount: 1 image: repository: ghcr.io/cdcgov/phdi/ingestion pullPolicy: IfNotPresent - tag: v1.2.1 + tag: v1.6.4 service: port: 8080 diff --git a/charts/message-parser/Chart.yaml b/charts/message-parser/Chart.yaml index ee90038..9271b66 100644 --- 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/message-parser/values.yaml b/charts/message-parser/values.yaml index 922bf09..1d18a35 100644 --- a/charts/message-parser/values.yaml +++ b/charts/message-parser/values.yaml @@ -3,7 +3,7 @@ replicaCount: 1 image: repository: ghcr.io/cdcgov/phdi/message-parser pullPolicy: IfNotPresent - tag: v1.2.1 + tag: v1.6.4 service: port: 8080 diff --git a/charts/orchestration/Chart.yaml b/charts/orchestration/Chart.yaml index aab42d1..2268a98 100644 --- 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/orchestration/values.yaml b/charts/orchestration/values.yaml index 00fa120..2bd385c 100644 --- a/charts/orchestration/values.yaml +++ b/charts/orchestration/values.yaml @@ -4,7 +4,7 @@ replicaCount: 1 image: repository: ghcr.io/cdcgov/phdi/orchestration pullPolicy: IfNotPresent - tag: v1.2.1 + tag: v1.6.4 service: port: 8080 diff --git a/charts/tefca-viewer/Chart.yaml b/charts/tefca-viewer/Chart.yaml index b83bc6c..8d759c1 100644 --- 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.21 diff --git a/charts/tefca-viewer/templates/deployment.yaml b/charts/tefca-viewer/templates/deployment.yaml index 4825a4a..f64d22a 100644 --- 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,12 @@ spec: value: {{.Values.fhirUrl}} - name: cred_manager value: {{.Values.credManager}} + - name: DATABASE_URL + value: {{.Values.databaseConnectionString}} + command: ["/bin/sh"] + args: ["-c", "echo DATABASE_URL={{.Values.databaseConnectionString}} > containers/tefca-viewer/tefca.env && docker-entrypoint.sh node containers/tefca-viewer/server.js"] + # initContainers: + # - name: flyway + # image: ghcr.io/cdcgov/phdi/{{.Values.name}}-flyway:v1.6.6 + # imagePullPolicy: {{.Values.image.pullPolicy}} + # args: ["-schemas=public", "-connectRetries=10", "-url={{.Values.jdbcDatabaseUrl}}", "-user={{.Values.jdbcDatabaseUser}}", "-password={{.Values.jdbcDatabasePassword}}", "-locations=filesystem:/flyway/sql", "migrate"] diff --git a/charts/tefca-viewer/templates/serviceAccount.yaml b/charts/tefca-viewer/templates/serviceAccount.yaml new file mode 100644 index 0000000..11ba63a --- /dev/null +++ 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}} \ No newline at end of file diff --git a/charts/tefca-viewer/templates/tests/test-connection.yaml b/charts/tefca-viewer/templates/tests/test-connection.yaml index f96b202..e272cad 100644 --- 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 index 0df17ef..f119189 100644 --- a/charts/tefca-viewer/values.yaml +++ b/charts/tefca-viewer/values.yaml @@ -4,7 +4,7 @@ replicaCount: 1 image: repository: ghcr.io/cdcgov/phdi/tefca-viewer pullPolicy: Always - tag: dev + tag: v1.6.3 service: port: 3000 @@ -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 diff --git a/charts/trigger-code-reference/Chart.yaml b/charts/trigger-code-reference/Chart.yaml index acd483f..3607c78 100644 --- 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/trigger-code-reference/values.yaml b/charts/trigger-code-reference/values.yaml index d49676e..cce30b0 100644 --- a/charts/trigger-code-reference/values.yaml +++ b/charts/trigger-code-reference/values.yaml @@ -3,7 +3,7 @@ replicaCount: 1 image: repository: ghcr.io/cdcgov/phdi/trigger-code-reference pullPolicy: IfNotPresent - tag: v1.4.1 + tag: v1.6.4 service: port: 8080 diff --git a/charts/validation/Chart.yaml b/charts/validation/Chart.yaml index 55866be..8f0418e 100644 --- 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 diff --git a/charts/validation/values.yaml b/charts/validation/values.yaml index dd6d512..4df6dfd 100644 --- a/charts/validation/values.yaml +++ b/charts/validation/values.yaml @@ -9,7 +9,7 @@ replicaCount: 1 image: repository: ghcr.io/cdcgov/phdi/validation pullPolicy: IfNotPresent - tag: v1.2.1 + tag: v1.6.4 service: port: 80