Merge pull request #83 from Alvearie/lee-main

bump dependency versions

.ct/config.yaml

@@ -7,7 +7,7 @@ validate-yaml: true
 check-version-increment: true
 chart-dirs:
   - charts
-helm-extra-args: --timeout 10m
+kubectl-timeout: "10m"
 upgrade: true
 skip-missing-values: true
 release-label: release

.github/workflows/chart.yaml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -20,17 +20,17 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
       - name: Install Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v3
         with:
-          version: v3.4.0
+          version: v3.7.1
 
       - name: Install dependency repo
         run: |
           helm repo add bitnami https://charts.bitnami.com/bitnami
           helm repo add codecentric https://codecentric.github.io/helm-charts
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.2.1
+        uses: helm/chart-releaser-action@v1.4.0
         with:
           charts_repo_url: https://alvearie.io/alvearie-helm
         env:

.github/workflows/lint-and-test.yaml

@@ -6,12 +6,12 @@ on:
 
 jobs:
   pre-commit-check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Install helm-docs
         working-directory: /tmp
         env:
-          HELM_DOCS_URL: https://github.com/norwoodj/helm-docs/releases/download/v1.5.0/helm-docs_1.5.0_Linux_x86_64.tar.gz
+          HELM_DOCS_URL: https://github.com/norwoodj/helm-docs/releases/download/v1.11.0/helm-docs_1.11.0_Linux_x86_64.tar.gz
         run: |
           curl -LSs $HELM_DOCS_URL | tar xz && \
           mv ./helm-docs /usr/local/bin/helm-docs && \
@@ -31,7 +31,7 @@ jobs:
         run: pre-commit run --all-files --show-diff-on-failure
 
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container: quay.io/helmpack/chart-testing:v3.4.0
     steps:
       - name: Checkout
@@ -52,7 +52,7 @@ jobs:
           ct lint --config .ct/config.yaml
 
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs:
       - lint
       - pre-commit-check
@@ -63,7 +63,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v3
         with:
           version: v3.7.1
 
@@ -79,7 +79,7 @@ jobs:
           fi
 
       - name: Create k8s Kind Cluster
-        uses: helm/kind-action@v1.2.0
+        uses: helm/kind-action@v1.3.0
         if: steps.list-changed.outputs.changed == 'true'
 
       - name: Run chart-testing (install)

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/norwoodj/helm-docs
-    rev: v1.5.0
+    rev: v1.11.0
     hooks:
       - id: helm-docs
         args:

charts/ibm-fhir-server/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 10.13.15
+  version: 10.16.2
 - name: keycloak
   repository: https://codecentric.github.io/helm-charts
-  version: 18.1.1
-digest: sha256:65c21dfb08018acdbe1c1c910c535ba7b6c33f1eaec33b8245a37f9975007b4b
-generated: "2022-05-02T15:47:23.728536-04:00"
+  version: 18.3.0
+digest: sha256:6608e389e9fecee483c76eb1f61534211e461c7c79140b2aaedcf8be9adc34a6
+generated: "2022-09-27T12:21:15.687118-04:00"

charts/ibm-fhir-server/Chart.yaml

@@ -1,15 +1,15 @@
 apiVersion: v2
 description: Helm chart for the IBM FHIR Server
 name: ibm-fhir-server
-version: 0.7.1
+version: 0.7.2
 appVersion: 4.11.1
 dependencies:
   - name: postgresql
-    version: 10.13.15
+    version: 10.16.2
     repository: https://charts.bitnami.com/bitnami
     condition: postgresql.enabled
   - name: keycloak
-    version: 18.1.1
+    version: 18.3.0
     repository: https://codecentric.github.io/helm-charts
     condition: keycloak.enabled
 sources:
@@ -26,4 +26,6 @@ annotations:
     # When using the list of objects option the valid supported kinds are
     # added, changed, deprecated, removed, fixed, and security.
     - kind: changed
-      description: use db.certPath for the postgres batch dataSource when db.enableTls is true
+      description: bumped keycloak subchart from 18.1.1 to 18.3.0
+    - kind changed
+      description: bumped postgresql subchart from 10.13.15 to 10.16.2

charts/ibm-fhir-server/README.md

@@ -1,5 +1,5 @@
 
-![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.11.1](https://img.shields.io/badge/AppVersion-4.11.1-informational?style=flat-square)
+![Version: 0.7.2](https://img.shields.io/badge/Version-0.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.11.1](https://img.shields.io/badge/AppVersion-4.11.1-informational?style=flat-square)
 
 # The IBM FHIR Server Helm Chart
 
@@ -333,7 +333,7 @@ If a truststore Secret is specified, the default truststore file will be replace
 | postgresql.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` |  |
 | postgresql.enabled | bool | `true` | enable an included PostgreSQL DB. if set to `false`, the connection settings under the `db` key are used |
 | postgresql.existingSecret | string | `""` | Name of existing secret to use for PostgreSQL passwords. The secret must contain the keys `postgresql-password` (the password for `postgresqlUsername` when it is different from `postgres`), `postgresql-postgres-password` (which will override `postgresqlPassword`), `postgresql-replication-password` (which will override `replication.password`), and `postgresql-ldap-password` (used to authenticate on LDAP). The value is evaluated as a template. |
-| postgresql.image.tag | string | `"14.2.0"` | the tag for the postgresql image |
+| postgresql.image.tag | string | `"14.5.0"` | the tag for the postgresql image |
 | postgresql.postgresqlDatabase | string | `"fhir"` | name of the database to create. see: <https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-on-first-run> |
 | postgresql.postgresqlExtendedConf | object | `{"maxPreparedTransactions":24}` | Extended Runtime Config Parameters (appended to main or default configuration) |
 | replicaCount | int | `2` | The number of replicas for the externally-facing FHIR server pods |
@@ -377,4 +377,4 @@ If a truststore Secret is specified, the default truststore file will be replace
 | trustStoreSecret | string | `nil` | Secret containing the FHIR server truststore file and its password. The secret must contain the keys 'fhirTrustStore' (the truststore file contents in the format specified in trustStoreFormat) and 'fhirTrustStorePassword' (the truststore password) |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
+Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

charts/ibm-fhir-server/templates/_helpers.tpl

@@ -172,3 +172,12 @@ from the flags and resource scopes under .Values.security.oauth
   {{- end }}
   {{- toJson $scopes }}
 {{- end -}}
+
+{{/*
+Override the keycloak.postgresql.fullname template defined by the codecentric keycloak chart.
+https://github.com/codecentric/helm-charts/issues/648
+*/}}
+{{- define "keycloak.postgresql.fullname" -}}
+{{- $postgresContext := dict "Values" .Values.postgresql "Release" .Release "Chart" (dict "Name" "postgresql") -}}
+{{ include "postgresql.primary.fullname" $postgresContext }}
+{{- end }}

charts/ibm-fhir-server/values.yaml

@@ -62,7 +62,7 @@ postgresql:
   enabled: true
   image:
     # -- the tag for the postgresql image
-    tag: 14.2.0
+    tag: 14.5.0
   # -- name of the database to create.
   # see: <https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md#creating-a-database-on-first-run>
   postgresqlDatabase: "fhir"