Skip to content

Commit

Permalink
make ttl value configurable instead of just enable/disable
Browse files Browse the repository at this point in the history
Signed-off-by: Lee Surprenant <[email protected]>
lmsurpre committed Dec 15, 2021
1 parent 2e30bb4 commit c333dd6
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion charts/ibm-fhir-server/README.md
Original file line number Diff line number Diff line change
@@ -329,13 +329,13 @@ If a truststore Secret is specified, the default truststore file will be replace
| resources.requests.ephemeral-storage | string | `"1Gi"` | |
| resources.requests.memory | string | `"1Gi"` | |
| restrictEndpoints | bool | `false` | Set to true to restrict the API to a particular set of resource type endpoints |
| schemaMigration.enableJobAutoremove | bool | `true` | Whether to add a TTL to the finished job - disable if it interferes with CI tools like ArgoCD |
| schemaMigration.enabled | bool | `true` | Whether to execute a schema creation/migration job as part of the deploy |
| schemaMigration.image.pullPolicy | string | `"Always"` | When to pull the image |
| schemaMigration.image.pullSecret | string | `"all-icr-io"` | |
| 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"` | |
4 changes: 1 addition & 3 deletions charts/ibm-fhir-server/templates/schematool.yaml
Original file line number Diff line number Diff line change
@@ -8,9 +8,7 @@ metadata:
app.kubernetes.io/component: schematool
spec:
{{- if semverCompare ">=1.21" .Capabilities.KubeVersion.Version }}
{{- if .Values.schemaMigration.enableJobAutoremove }}
ttlSecondsAfterFinished: 100
{{- end }}
ttlSecondsAfterFinished: {{ .Values.schemaMigration.ttlSecondsAfterFinished }}
{{- end }}
template:
metadata:
6 changes: 4 additions & 2 deletions charts/ibm-fhir-server/values.yaml
Original file line number Diff line number Diff line change
@@ -235,8 +235,10 @@ schemaMigration:
pullSecret: all-icr-io
# -- container resources for the schema migration job
resources: {}
# -- Whether to add a TTL to the finished job - disable if it interferes with CI tools like ArgoCD
enableJobAutoremove: true
# -- 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:

0 comments on commit c333dd6

Please sign in to comment.