Skip to content

Commit eae61fd

Browse files
committed
Merge remote-tracking branch 'origin/master' into ja_20231203_hapi_7_0
2 parents 164e0a9 + 9e21d80 commit eae61fd

27 files changed

+362
-182
lines changed

.github/workflows/chart-test.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
lint:
1212
runs-on: ubuntu-22.04
13-
container: quay.io/helmpack/chart-testing:v3.8.0@sha256:f058c660a28d99a9394ae081d98921efe068079531f247c86b8054e3c9d407aa
13+
container: quay.io/helmpack/chart-testing:v3.10.1@sha256:7d8a7f99fc5840142249cc33ed6d9752fc66b92f9e1bf792d987ee85227d84da
1414
steps:
1515
- name: Install helm-docs
1616
working-directory: /tmp
@@ -27,7 +27,7 @@ jobs:
2727
git config --global --add safe.directory /__w/hapi-fhir-jpaserver-starter/hapi-fhir-jpaserver-starter
2828
2929
- name: Checkout
30-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
30+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3131
with:
3232
fetch-depth: 0
3333

@@ -41,17 +41,17 @@ jobs:
4141
runs-on: ubuntu-22.04
4242
strategy:
4343
matrix:
44-
k8s-version: [1.25.9, 1.26.4, 1.27.2]
44+
k8s-version: [1.25.11, 1.26.6, 1.27.3, 1.28.0, 1.29.0]
4545
needs:
4646
- lint
4747
steps:
4848
- name: Checkout
49-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
49+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5050
with:
5151
fetch-depth: 0
5252

5353
- name: Set up chart-testing
54-
uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76 # v2.4.0
54+
uses: helm/chart-testing-action@e6669bcd63d7cb57cb4380c33043eebe5d111992 # v2.6.1
5555

5656
- name: Run chart-testing (list-changed)
5757
id: list-changed
@@ -62,7 +62,7 @@ jobs:
6262
fi
6363
6464
- name: Create k8s Kind Cluster
65-
uses: helm/kind-action@fa81e57adff234b2908110485695db0f181f3c67 # v1.7.0
65+
uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.8.0
6666
if: ${{ steps.list-changed.outputs.changed == 'true' }}
6767
with:
6868
cluster_name: kind-cluster-k8s-${{ matrix.k8s-version }}

charts/hapi-fhir-jpaserver/Chart.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: postgresql
33
repository: oci://registry-1.docker.io/bitnamicharts
4-
version: 12.5.6
5-
digest: sha256:4d21dbc02bbdb55b957b0093e37376853727de82396abfadfaf1d738bd51b8e6
6-
generated: "2023-06-03T20:58:45.922102213+02:00"
4+
version: 13.2.27
5+
digest: sha256:6374f6f32d32adbe6763c48e2d817d85ec20a1784b2aea1fb0312c658f8e58e9
6+
generated: "2024-01-10T17:56:36.521957926+01:00"

charts/hapi-fhir-jpaserver/Chart.yaml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,25 @@ sources:
77
- https://github.com/hapifhir/hapi-fhir-jpaserver-starter
88
dependencies:
99
- name: postgresql
10-
version: 12.5.6
10+
version: 13.2.27
1111
repository: oci://registry-1.docker.io/bitnamicharts
1212
condition: postgresql.enabled
13-
appVersion: 6.8.3
14-
version: 0.14.0
13+
appVersion: 6.10.1
14+
version: 0.15.0
1515
annotations:
1616
artifacthub.io/license: Apache-2.0
17+
artifacthub.io/containsSecurityUpdates: "false"
18+
artifacthub.io/operator: "false"
19+
artifacthub.io/prerelease: "false"
20+
artifacthub.io/recommendations: |
21+
- url: https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack
22+
- url: https://artifacthub.io/packages/helm/bitnami/postgresql
1723
artifacthub.io/changes: |
1824
# When using the list of objects option the valid supported kinds are
1925
# added, changed, deprecated, removed, fixed, and security.
20-
- kind: added
21-
description: updated starter image to 6.8.3
22-
- kind: fixed
23-
description: incorrect handling of existing secret database config
24-
- kind: added
25-
description: support for using a non-admin user for the postgres database
26-
- kind: added
27-
description: ability to create a dedicated ServiceAccount
26+
- kind: changed
27+
description: updated starter image to 6.10.1
28+
- kind: changed
29+
description: updated curlimages/curl to 8.5.0
30+
- kind: changed
31+
description: "updated postgresql sub-chart to 13.2.27. ⚠️: this updates the used PostgreSQL image from v15 to v16."

charts/hapi-fhir-jpaserver/README.md

Lines changed: 3 additions & 7 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.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.8.3](https://img.shields.io/badge/AppVersion-6.8.3-informational?style=flat-square)
3+
![Version: 0.15.0](https://img.shields.io/badge/Version-0.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.10.1](https://img.shields.io/badge/AppVersion-6.10.1-informational?style=flat-square)
44

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

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

1616
| Repository | Name | Version |
1717
|------------|------|---------|
18-
| oci://registry-1.docker.io/bitnamicharts | postgresql | 12.5.6 |
18+
| oci://registry-1.docker.io/bitnamicharts | postgresql | 13.2.27 |
1919

2020
## Values
2121

@@ -36,7 +36,7 @@ helm install hapi-fhir-jpaserver hapifhir/hapi-fhir-jpaserver
3636
| image.pullPolicy | string | `"IfNotPresent"` | image pullPolicy to use |
3737
| image.registry | string | `"docker.io"` | registry where the HAPI FHIR server image is hosted |
3838
| image.repository | string | `"hapiproject/hapi"` | the path inside the repository |
39-
| image.tag | string | `"v6.8.3@sha256:6195f1116ebabfb0a608addde043b3e524c456c4d4f35b3d25025afd7dcd2e27"` | the image tag. As of v5.7.0, this is the `distroless` flavor by default, add `-tomcat` to use the Tomcat-based image. |
39+
| image.tag | string | `"v6.10.1@sha256:4eac1b3481180b028616d1fab7e657e368538063d75f7ed3be2032e34c657dd4"` | the image tag. As of v5.7.0, this is the `distroless` flavor by default, add `-tomcat` to use the Tomcat-based image. |
4040
| imagePullSecrets | list | `[]` | image pull secrets to use when pulling the image |
4141
| ingress.annotations | object | `{}` | provide any additional annotations which may be required. Evaluated as a template. |
4242
| ingress.enabled | bool | `false` | whether to create an Ingress to expose the FHIR server HTTP endpoint |
@@ -57,10 +57,6 @@ helm install hapi-fhir-jpaserver hapifhir/hapi-fhir-jpaserver
5757
| postgresql.auth.database | string | `"fhir"` | name for a custom database to create |
5858
| postgresql.auth.existingSecret | string | `""` | Name of existing secret to use for PostgreSQL credentials `auth.postgresPassword`, `auth.password`, and `auth.replicationPassword` will be ignored and picked up from this secret The secret must contain the keys `postgres-password` (which is the password for "postgres" admin user), `password` (which is the password for the custom user to create when `auth.username` is set), and `replication-password` (which is the password for replication user). The secret might also contains the key `ldap-password` if LDAP is enabled. `ldap.bind_password` will be ignored and picked from this secret in this case. The value is evaluated as a template. |
5959
| postgresql.enabled | bool | `true` | enable an included PostgreSQL DB. see <https://github.com/bitnami/charts/tree/master/bitnami/postgresql> for details if set to `false`, the values under `externalDatabase` are used |
60-
| postgresql.primary.containerSecurityContext.allowPrivilegeEscalation | bool | `false` | |
61-
| postgresql.primary.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` | |
62-
| postgresql.primary.containerSecurityContext.runAsNonRoot | bool | `true` | |
63-
| postgresql.primary.containerSecurityContext.seccompProfile.type | string | `"RuntimeDefault"` | |
6460
| replicaCount | int | `1` | number of replicas to deploy |
6561
| resources | object | `{}` | configure the FHIR server's resource requests and limits |
6662
| securityContext.allowPrivilegeEscalation | bool | `false` | |

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

Lines changed: 1 addition & 1 deletion
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:15.3.0-debian-11-r7@sha256:cc301eef743685f4f69d1d719853988e8a9650c90fd9521f4742ce400b3fdf6a
34+
image: docker.io/bitnami/postgresql:16.1.0-debian-11-r18@sha256:06f1f2297f6241a02bd8e8c025b31625254ca66784ac75a4a62e945fa611d045
3535
imagePullPolicy: IfNotPresent
3636
{{- with .Values.restrictedContainerSecurityContext }}
3737
securityContext:

charts/hapi-fhir-jpaserver/values.yaml

Lines changed: 2 additions & 11 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: "v6.8.3@sha256:6195f1116ebabfb0a608addde043b3e524c456c4d4f35b3d25025afd7dcd2e27"
10+
tag: "v6.10.1@sha256:4eac1b3481180b028616d1fab7e657e368538063d75f7ed3be2032e34c657dd4"
1111
# -- image pullPolicy to use
1212
pullPolicy: IfNotPresent
1313

@@ -121,15 +121,6 @@ postgresql:
121121
# picked from this secret in this case.
122122
# The value is evaluated as a template.
123123
existingSecret: ""
124-
primary:
125-
containerSecurityContext:
126-
allowPrivilegeEscalation: false
127-
capabilities:
128-
drop:
129-
- ALL
130-
runAsNonRoot: true
131-
seccompProfile:
132-
type: RuntimeDefault
133124

134125
# -- readiness probe
135126
# @ignored
@@ -240,7 +231,7 @@ curl:
240231
image:
241232
registry: docker.io
242233
repository: curlimages/curl
243-
tag: 8.4.0@sha256:4a3396ae573c44932d06ba33f8696db4429c419da87cbdc82965ee96a37dd0af
234+
tag: 8.6.0@sha256:c3b8bee303c6c6beed656cfc921218c529d65aa61114eb9e27c62047a1271b9b
244235

245236
tests:
246237
# -- configure the test pods resource requests and limits

configs/app/index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<p>
2+
Greetings from the custom web app page!
3+
</p>

custom/about.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<p>
2+
<b>This is a custom about page! It means you have configured 'custom_content_path: ./custom' in the application.yaml</b>
3+
</p>
4+
<p>
5+
This server provides a complete implementation of the FHIR Specification
6+
using a 100% open source software stack.
7+
</p>
8+
<p>
9+
This server is built
10+
from a number of modules of the
11+
<a href="https://github.com/hapifhir/hapi-fhir/">HAPI FHIR</a>
12+
project, which is a 100% open-source (Apache 2.0 Licensed) Java based
13+
implementation of the FHIR specification.
14+
</p>

custom/logo.jpg

47.2 KB
Loading

custom/welcome.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<p>
2+
<b>This is a custom welcome page! It means you have configured 'custom_content_path: ./custom' in the application.yaml</b>
3+
</p>
4+
<p>
5+
This server provides a complete implementation of the FHIR Specification
6+
using a 100% open source software stack.
7+
</p>
8+
<p>
9+
This server is built
10+
from a number of modules of the
11+
<a href="https://github.com/hapifhir/hapi-fhir/">HAPI FHIR</a>
12+
project, which is a 100% open-source (Apache 2.0 Licensed) Java based
13+
implementation of the FHIR specification.
14+
</p>

0 commit comments

Comments
 (0)