From b126457e2d4bc8cd948b4c4e825f237a80e6571b Mon Sep 17 00:00:00 2001 From: chgl Date: Thu, 26 Jun 2025 15:46:10 +0200 Subject: [PATCH 1/2] Updated hapi fhir version and all dependencies in the helm chart (#835) Co-authored-by: chgl <5307555+chgl@users.noreply.github.com> --- charts/hapi-fhir-jpaserver/Chart.lock | 8 ++++---- charts/hapi-fhir-jpaserver/Chart.yaml | 20 ++++++++++++------- charts/hapi-fhir-jpaserver/README.md | 9 +++++---- .../templates/_helpers.tpl | 10 ++++++++++ .../templates/deployment.yaml | 4 ++-- charts/hapi-fhir-jpaserver/values.yaml | 13 ++++++++++-- 6 files changed, 45 insertions(+), 19 deletions(-) diff --git a/charts/hapi-fhir-jpaserver/Chart.lock b/charts/hapi-fhir-jpaserver/Chart.lock index 5f47846..c4e5b45 100644 --- a/charts/hapi-fhir-jpaserver/Chart.lock +++ b/charts/hapi-fhir-jpaserver/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: postgresql repository: oci://registry-1.docker.io/bitnamicharts - version: 16.5.5 + version: 16.7.11 - name: common repository: oci://registry-1.docker.io/bitnamicharts - version: 2.30.0 -digest: sha256:c114b296b53007a7973260de8bad61917fe741c0ad9de15fdbeea5743c8f4910 -generated: "2025-03-21T21:44:22.334197366+01:00" + version: 2.31.3 +digest: sha256:e8b5591d28c8b420a68c1bef3ac8530f47c0c9c5d22fddec3c73f45ae5ba615a +generated: "2025-06-16T13:22:01.211160104+02:00" diff --git a/charts/hapi-fhir-jpaserver/Chart.yaml b/charts/hapi-fhir-jpaserver/Chart.yaml index e1193c0..dac5171 100644 --- a/charts/hapi-fhir-jpaserver/Chart.yaml +++ b/charts/hapi-fhir-jpaserver/Chart.yaml @@ -7,14 +7,14 @@ sources: - https://github.com/hapifhir/hapi-fhir-jpaserver-starter dependencies: - name: postgresql - version: 16.5.5 + version: 16.7.11 repository: oci://registry-1.docker.io/bitnamicharts condition: postgresql.enabled - name: common repository: oci://registry-1.docker.io/bitnamicharts - version: 2.30.0 -appVersion: 8.0.0 -version: 0.19.0 + version: 2.31.3 +appVersion: 8.2.0 +version: 0.20.0 annotations: artifacthub.io/license: Apache-2.0 artifacthub.io/containsSecurityUpdates: "false" @@ -27,8 +27,14 @@ annotations: # When using the list of objects option the valid supported kinds are # added, changed, deprecated, removed, fixed, and security. - kind: changed - description: "updated postgresql sub-chart to 16.5.5" + description: "updated postgresql sub-chart to 16.7.11" - kind: changed - description: "updated curlimages/curl to 8.12.1" + description: "updated common sub-chart to 2.31.3" - kind: changed - description: "updated hapiproject/hapi to v8.0.0-1" + description: "updated curlimages/curl to 8.14.1" + - kind: changed + description: "updated hapiproject/hapi to v8.2.0-1" + - kind: changed + description: "use ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect dialect" + - kind: changed + description: "made the init container waiting for the database to be ready configurable" diff --git a/charts/hapi-fhir-jpaserver/README.md b/charts/hapi-fhir-jpaserver/README.md index c896d05..30a0e2f 100644 --- a/charts/hapi-fhir-jpaserver/README.md +++ b/charts/hapi-fhir-jpaserver/README.md @@ -1,6 +1,6 @@ # HAPI FHIR JPA Server Starter Helm Chart -![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) +![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) This helm chart will help you install the HAPI FHIR JPA Server in a Kubernetes environment. @@ -15,8 +15,8 @@ helm install hapi-fhir-jpaserver hapifhir/hapi-fhir-jpaserver | Repository | Name | Version | |------------|------|---------| -| oci://registry-1.docker.io/bitnamicharts | common | 2.30.0 | -| oci://registry-1.docker.io/bitnamicharts | postgresql | 16.5.5 | +| oci://registry-1.docker.io/bitnamicharts | common | 2.31.3 | +| oci://registry-1.docker.io/bitnamicharts | postgresql | 16.7.11 | ## Values @@ -39,7 +39,7 @@ helm install hapi-fhir-jpaserver hapifhir/hapi-fhir-jpaserver | image.pullPolicy | string | `"IfNotPresent"` | image pullPolicy to use | | image.registry | string | `"docker.io"` | registry where the HAPI FHIR server image is hosted | | image.repository | string | `"hapiproject/hapi"` | the path inside the repository | -| 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. | +| 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. | | imagePullSecrets | list | `[]` | image pull secrets to use when pulling the image | | ingress.annotations | object | `{}` | provide any additional annotations which may be required. Evaluated as a template. | | 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 | 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: | | tolerations | list | `[]` | pod tolerations | | topologySpreadConstraints | list | `[]` | pod topology spread configuration see: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/#api | +| 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 | ## Development diff --git a/charts/hapi-fhir-jpaserver/templates/_helpers.tpl b/charts/hapi-fhir-jpaserver/templates/_helpers.tpl index 954d1e9..ab33753 100644 --- a/charts/hapi-fhir-jpaserver/templates/_helpers.tpl +++ b/charts/hapi-fhir-jpaserver/templates/_helpers.tpl @@ -150,3 +150,13 @@ Create the JDBC URL from the host, port and database name. {{- $appName := .Release.Name -}} {{ printf "jdbc:postgresql://%s:%d/%s?ApplicationName=%s" $host (int $port) $name $appName }} {{- end -}} + +{{/* +Get the container image for the wait-for-db init container t +*/}} +{{- define "hapi-fhir-jpaserver.waitForDatabaseInitContainerImage" -}} +{{- $registry := .Values.waitForDatabaseInitContainer.image.registry -}} +{{- $repository := .Values.waitForDatabaseInitContainer.image.repository -}} +{{- $tag := .Values.waitForDatabaseInitContainer.image.tag -}} +{{ printf "%s/%s:%s" $registry $repository $tag}} +{{- end -}} diff --git a/charts/hapi-fhir-jpaserver/templates/deployment.yaml b/charts/hapi-fhir-jpaserver/templates/deployment.yaml index f079c85..02d9943 100644 --- a/charts/hapi-fhir-jpaserver/templates/deployment.yaml +++ b/charts/hapi-fhir-jpaserver/templates/deployment.yaml @@ -31,7 +31,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: - name: wait-for-db-to-be-ready - image: docker.io/bitnami/postgresql:17.4.0-debian-12-r10@sha256:7b9af9dd759055265998bbf12368e6d7d6326e6fd23f8157be841fad0915c1a1 + image: {{ include "hapi-fhir-jpaserver.waitForDatabaseInitContainerImage" . }} imagePullPolicy: IfNotPresent {{- with .Values.restrictedContainerSecurityContext }} securityContext: @@ -99,7 +99,7 @@ spec: - name: SPRING_DATASOURCE_DRIVERCLASSNAME value: org.postgresql.Driver - name: spring.jpa.properties.hibernate.dialect - value: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect + value: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect - name: HAPI_FHIR_USE_APACHE_ADDRESS_STRATEGY value: "true" - name: MANAGEMENT_ENDPOINT_HEALTH_PROBES_ADD_ADDITIONAL_PATHS diff --git a/charts/hapi-fhir-jpaserver/values.yaml b/charts/hapi-fhir-jpaserver/values.yaml index 422b693..ee5db16 100644 --- a/charts/hapi-fhir-jpaserver/values.yaml +++ b/charts/hapi-fhir-jpaserver/values.yaml @@ -7,7 +7,7 @@ image: # -- the path inside the repository repository: hapiproject/hapi # -- the image tag. As of v5.7.0, this is the `distroless` flavor by default, add `-tomcat` to use the Tomcat-based image. - tag: "v8.0.0-1@sha256:9fbac7b012b4be91ba481e7008f1353ede4598bc99a36f3902b8abf873e70ed8" + tag: "v8.2.0-1@sha256:e85ded02f60e25a66e6d9423ea71f3ebc9494e3a69bdd7d7dbfa31b8aa5b2fe9" # -- image pullPolicy to use pullPolicy: IfNotPresent @@ -241,7 +241,7 @@ curl: image: registry: docker.io repository: curlimages/curl - tag: 8.12.1@sha256:94e9e444bcba979c2ea12e27ae39bee4cd10bc7041a472c4727a558e213744e6 + tag: 8.14.1@sha256:9a1ed35addb45476afa911696297f8e115993df459278ed036182dd2cd22b67b tests: # -- whether the service account token should be auto-mounted for the test pods @@ -300,3 +300,12 @@ extraVolumes: [] # -- Optionally specify extra list of additional volumeMounts extraVolumeMounts: [] + +waitForDatabaseInitContainer: + # -- image to use for the init container which waits until the database + # is ready to accept connections + image: + registry: docker.io + repository: bitnami/postgresql + tag: 17.5.0-debian-12-r11@sha256:ac8dd0d6512c4c5fb146c16b1c5f05862bd5f600d73348506ab4252587e7fcc6 + pullPolicy: IfNotPresent From 2bd96d7332b36099e590e6aba77116b0dad68f2e Mon Sep 17 00:00:00 2001 From: Patrick Werner Date: Tue, 8 Jul 2025 17:42:33 +0200 Subject: [PATCH 2/2] Update revision number --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7c4f12..47654e6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 17 - 1 + 2 3.22.0