Skip to content

Commit

Permalink
Merge pull request #69 from Alvearie/integration
Browse files Browse the repository at this point in the history
Update versions and introduce new value for controlling job auto-removal
  • Loading branch information
lmsurpre authored Dec 20, 2021
2 parents b8b4c47 + c333dd6 commit 573faca
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 17 deletions.
8 changes: 4 additions & 4 deletions charts/ibm-fhir-server/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies:
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 10.13.8
version: 10.13.14
- name: keycloak
repository: https://codecentric.github.io/helm-charts
version: 15.1.0
digest: sha256:dd6c0256b3884c1359242ffe44d7f9f2f33d998fcaadb992ca086c52195c291a
generated: "2021-11-22T09:59:31.513402-05:00"
version: 16.0.4
digest: sha256:763042151638a4088893779775bae372d39f6e35f9f44188300847dc3b962ac1
generated: "2021-12-14T16:00:04.240664-05:00"
20 changes: 9 additions & 11 deletions charts/ibm-fhir-server/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apiVersion: v2
description: Helm chart for the IBM FHIR Server
name: ibm-fhir-server
version: 0.5.1
appVersion: 4.10.1
version: 0.5.2
appVersion: 4.10.2
dependencies:
- name: postgresql
version: 10.13.8
version: 10.13.14
repository: https://charts.bitnami.com/bitnami
condition: postgresql.enabled
- name: keycloak
version: 15.1.0
version: 16.0.4
repository: https://codecentric.github.io/helm-charts
condition: keycloak.enabled
sources:
Expand All @@ -27,13 +27,11 @@ annotations:
artifacthub.io/changes: |
# When using the list of objects option the valid supported kinds are
# added, changed, deprecated, removed, fixed, and security.
- kind: added
description: switch for schema migration job auto-removal
- kind: changed
description: move jvm.options to configDropins to avoid overwriting
- kind: changed
description: upgrade to ibm-fhir-server 4.10.1
description: upgrade to ibm-fhir-server 4.10.2
- kind: changed
description: reduce the default initial heap size and memory request
description: upgrade bitnami/postgresql subchart version to 10.13.14
- kind: changed
description: upgrade postgresql image to 13.5 and subchart to 10.13.8
- kind: added
description: helm values for advanced scheduling (e.g. custom affinity rules)
description: upgrade codecentric/keycloak subchart version to 16.0.4
3 changes: 2 additions & 1 deletion charts/ibm-fhir-server/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

![Version: 0.5.1](https://img.shields.io/badge/Version-0.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.10.1](https://img.shields.io/badge/AppVersion-4.10.1-informational?style=flat-square)
![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.10.2](https://img.shields.io/badge/AppVersion-4.10.2-informational?style=flat-square)

# The IBM FHIR Server Helm Chart

Expand Down Expand Up @@ -335,6 +335,7 @@ If a truststore Secret is specified, the default truststore file will be replace
| schemaMigration.image.repository | string | `"ibmcom/ibm-fhir-schematool"` | The repository to pull the IBM FHIR Schema Tool image from |
| schemaMigration.image.tag | string | this chart's appVersion | IBM FHIR Schema Tool container image tag |
| schemaMigration.resources | object | `{}` | container resources for the schema migration job |
| schemaMigration.ttlSecondsAfterFinished | int | `100` | How many seconds to wait before cleaning up a finished schema migration job. This automatic clean-up can have unintended interactions with CI tools like ArgoCD; setting this value to nil will disable the feature. |
| security.jwtValidation.audience | string | `"https://{{ tpl $.Values.ingress.hostname $ }}/fhir-server/api/v4"` | |
| security.jwtValidation.enabled | bool | `false` | |
| security.jwtValidation.groupNameAttribute | string | `"group"` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/ibm-fhir-server/templates/schematool.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/component: schematool
spec:
{{- if semverCompare ">=1.21" .Capabilities.KubeVersion.Version }}
ttlSecondsAfterFinished: 100
ttlSecondsAfterFinished: {{ .Values.schemaMigration.ttlSecondsAfterFinished }}
{{- end }}
template:
metadata:
Expand Down
4 changes: 4 additions & 0 deletions charts/ibm-fhir-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,10 @@ schemaMigration:
pullSecret: all-icr-io
# -- container resources for the schema migration job
resources: {}
# -- How many seconds to wait before cleaning up a finished schema migration job.
# This automatic clean-up can have unintended interactions with CI tools like ArgoCD;
# setting this value to nil will disable the feature.
ttlSecondsAfterFinished: 100
# -- The name of a Secret from which to retrieve fhirUserPassword and fhirAdminPassword.
# If this value is set, it is expected that fhirUserPasswordSecretKey and fhirAdminPasswordSecretKey will also be set.
fhirPasswordSecret:
Expand Down

0 comments on commit 573faca

Please sign in to comment.