Skip to content

Commit 457587e

Browse files
patrick-wernerpatrick-werner
committed
Merge remote-tracking branch 'origin/master' into ja_20250502_improve_dialect_handling
2 parents 92485be + b126457 commit 457587e

File tree

6 files changed

+45
-19
lines changed

6 files changed

+45
-19
lines changed

‎charts/hapi-fhir-jpaserver/Chart.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
dependencies:
22
- name: postgresql
33
repository: oci://registry-1.docker.io/bitnamicharts
4-
version: 16.5.5
4+
version: 16.7.11
55
- name: common
66
repository: oci://registry-1.docker.io/bitnamicharts
7-
version: 2.30.0
8-
digest: sha256:c114b296b53007a7973260de8bad61917fe741c0ad9de15fdbeea5743c8f4910
9-
generated: "2025-03-21T21:44:22.334197366+01:00"
7+
version: 2.31.3
8+
digest: sha256:e8b5591d28c8b420a68c1bef3ac8530f47c0c9c5d22fddec3c73f45ae5ba615a
9+
generated: "2025-06-16T13:22:01.211160104+02:00"

‎charts/hapi-fhir-jpaserver/Chart.yaml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ sources:
77
- https://github.com/hapifhir/hapi-fhir-jpaserver-starter
88
dependencies:
99
- name: postgresql
10-
version: 16.5.5
10+
version: 16.7.11
1111
repository: oci://registry-1.docker.io/bitnamicharts
1212
condition: postgresql.enabled
1313
- name: common
1414
repository: oci://registry-1.docker.io/bitnamicharts
15-
version: 2.30.0
16-
appVersion: 8.0.0
17-
version: 0.19.0
15+
version: 2.31.3
16+
appVersion: 8.2.0
17+
version: 0.20.0
1818
annotations:
1919
artifacthub.io/license: Apache-2.0
2020
artifacthub.io/containsSecurityUpdates: "false"
@@ -27,8 +27,14 @@ annotations:
2727
# When using the list of objects option the valid supported kinds are
2828
# added, changed, deprecated, removed, fixed, and security.
2929
- kind: changed
30-
description: "updated postgresql sub-chart to 16.5.5"
30+
description: "updated postgresql sub-chart to 16.7.11"
3131
- kind: changed
32-
description: "updated curlimages/curl to 8.12.1"
32+
description: "updated common sub-chart to 2.31.3"
3333
- kind: changed
34-
description: "updated hapiproject/hapi to v8.0.0-1"
34+
description: "updated curlimages/curl to 8.14.1"
35+
- kind: changed
36+
description: "updated hapiproject/hapi to v8.2.0-1"
37+
- kind: changed
38+
description: "use ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect dialect"
39+
- kind: changed
40+
description: "made the init container waiting for the database to be ready configurable"

‎charts/hapi-fhir-jpaserver/README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# HAPI FHIR JPA Server Starter Helm Chart
22

3-
![Version: 0.19.0](https://img.shields.io/badge/Version-0.19.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.0.0](https://img.shields.io/badge/AppVersion-8.0.0-informational?style=flat-square)
3+
![Version: 0.20.0](https://img.shields.io/badge/Version-0.20.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.2.0](https://img.shields.io/badge/AppVersion-8.2.0-informational?style=flat-square)
44

55
This helm chart will help you install the HAPI FHIR JPA Server in a Kubernetes environment.
66

@@ -15,8 +15,8 @@ helm install hapi-fhir-jpaserver hapifhir/hapi-fhir-jpaserver
1515

1616
| Repository | Name | Version |
1717
|------------|------|---------|
18-
| oci://registry-1.docker.io/bitnamicharts | common | 2.30.0 |
19-
| oci://registry-1.docker.io/bitnamicharts | postgresql | 16.5.5 |
18+
| oci://registry-1.docker.io/bitnamicharts | common | 2.31.3 |
19+
| oci://registry-1.docker.io/bitnamicharts | postgresql | 16.7.11 |
2020

2121
## Values
2222

@@ -39,7 +39,7 @@ helm install hapi-fhir-jpaserver hapifhir/hapi-fhir-jpaserver
3939
| image.pullPolicy | string | `"IfNotPresent"` | image pullPolicy to use |
4040
| image.registry | string | `"docker.io"` | registry where the HAPI FHIR server image is hosted |
4141
| image.repository | string | `"hapiproject/hapi"` | the path inside the repository |
42-
| image.tag | string | `"v8.0.0-1@sha256:9fbac7b012b4be91ba481e7008f1353ede4598bc99a36f3902b8abf873e70ed8"` | the image tag. As of v5.7.0, this is the `distroless` flavor by default, add `-tomcat` to use the Tomcat-based image. |
42+
| image.tag | string | `"v8.2.0-1@sha256:e85ded02f60e25a66e6d9423ea71f3ebc9494e3a69bdd7d7dbfa31b8aa5b2fe9"` | the image tag. As of v5.7.0, this is the `distroless` flavor by default, add `-tomcat` to use the Tomcat-based image. |
4343
| imagePullSecrets | list | `[]` | image pull secrets to use when pulling the image |
4444
| ingress.annotations | object | `{}` | provide any additional annotations which may be required. Evaluated as a template. |
4545
| ingress.enabled | bool | `false` | whether to create an Ingress to expose the FHIR server HTTP endpoint |
@@ -84,6 +84,7 @@ helm install hapi-fhir-jpaserver hapifhir/hapi-fhir-jpaserver
8484
| tests.resourcesPreset | string | `"nano"` | set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if `resources` is set (`resources` is recommended for production). More information: <https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15> |
8585
| tolerations | list | `[]` | pod tolerations |
8686
| topologySpreadConstraints | list | `[]` | pod topology spread configuration see: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/#api |
87+
| waitForDatabaseInitContainer.image | object | `{"pullPolicy":"IfNotPresent","registry":"docker.io","repository":"bitnami/postgresql","tag":"17.5.0-debian-12-r11@sha256:ac8dd0d6512c4c5fb146c16b1c5f05862bd5f600d73348506ab4252587e7fcc6"}` | image to use for the init container which waits until the database is ready to accept connections |
8788

8889
## Development
8990

‎charts/hapi-fhir-jpaserver/templates/_helpers.tpl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,13 @@ Create the JDBC URL from the host, port and database name.
150150
{{- $appName := .Release.Name -}}
151151
{{ printf "jdbc:postgresql://%s:%d/%s?ApplicationName=%s" $host (int $port) $name $appName }}
152152
{{- end -}}
153+
154+
{{/*
155+
Get the container image for the wait-for-db init container t
156+
*/}}
157+
{{- define "hapi-fhir-jpaserver.waitForDatabaseInitContainerImage" -}}
158+
{{- $registry := .Values.waitForDatabaseInitContainer.image.registry -}}
159+
{{- $repository := .Values.waitForDatabaseInitContainer.image.repository -}}
160+
{{- $tag := .Values.waitForDatabaseInitContainer.image.tag -}}
161+
{{ printf "%s/%s:%s" $registry $repository $tag}}
162+
{{- end -}}

‎charts/hapi-fhir-jpaserver/templates/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
{{- toYaml .Values.podSecurityContext | nindent 8 }}
3232
initContainers:
3333
- name: wait-for-db-to-be-ready
34-
image: docker.io/bitnami/postgresql:17.4.0-debian-12-r10@sha256:7b9af9dd759055265998bbf12368e6d7d6326e6fd23f8157be841fad0915c1a1
34+
image: {{ include "hapi-fhir-jpaserver.waitForDatabaseInitContainerImage" . }}
3535
imagePullPolicy: IfNotPresent
3636
{{- with .Values.restrictedContainerSecurityContext }}
3737
securityContext:
@@ -99,7 +99,7 @@ spec:
9999
- name: SPRING_DATASOURCE_DRIVERCLASSNAME
100100
value: org.postgresql.Driver
101101
- name: spring.jpa.properties.hibernate.dialect
102-
value: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect
102+
value: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect
103103
- name: HAPI_FHIR_USE_APACHE_ADDRESS_STRATEGY
104104
value: "true"
105105
- name: MANAGEMENT_ENDPOINT_HEALTH_PROBES_ADD_ADDITIONAL_PATHS

‎charts/hapi-fhir-jpaserver/values.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ image:
77
# -- the path inside the repository
88
repository: hapiproject/hapi
99
# -- the image tag. As of v5.7.0, this is the `distroless` flavor by default, add `-tomcat` to use the Tomcat-based image.
10-
tag: "v8.0.0-1@sha256:9fbac7b012b4be91ba481e7008f1353ede4598bc99a36f3902b8abf873e70ed8"
10+
tag: "v8.2.0-1@sha256:e85ded02f60e25a66e6d9423ea71f3ebc9494e3a69bdd7d7dbfa31b8aa5b2fe9"
1111
# -- image pullPolicy to use
1212
pullPolicy: IfNotPresent
1313

@@ -241,7 +241,7 @@ curl:
241241
image:
242242
registry: docker.io
243243
repository: curlimages/curl
244-
tag: 8.12.1@sha256:94e9e444bcba979c2ea12e27ae39bee4cd10bc7041a472c4727a558e213744e6
244+
tag: 8.14.1@sha256:9a1ed35addb45476afa911696297f8e115993df459278ed036182dd2cd22b67b
245245

246246
tests:
247247
# -- whether the service account token should be auto-mounted for the test pods
@@ -300,3 +300,12 @@ extraVolumes: []
300300

301301
# -- Optionally specify extra list of additional volumeMounts
302302
extraVolumeMounts: []
303+
304+
waitForDatabaseInitContainer:
305+
# -- image to use for the init container which waits until the database
306+
# is ready to accept connections
307+
image:
308+
registry: docker.io
309+
repository: bitnami/postgresql
310+
tag: 17.5.0-debian-12-r11@sha256:ac8dd0d6512c4c5fb146c16b1c5f05862bd5f600d73348506ab4252587e7fcc6
311+
pullPolicy: IfNotPresent

0 commit comments

Comments
 (0)