Merge pull request #2 from LinuxForHealth/lee-main

add optional ingress.ingressClassName config

Author: lmsurpre

charts/fhir-server/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Helm chart for the LinuxForHealth FHIR Server
 name: fhir-server
-version: 0.8.1
+version: 0.8.2
 appVersion: 5.0.0
 dependencies:
   - name: postgresql
@@ -25,7 +25,7 @@ annotations:
   artifacthub.io/changes: |
     # When using the list of objects option the valid supported kinds are
     # added, changed, deprecated, removed, fixed, and security.
-    - kind: fixed
-      description: schematool should use its own container resources config
+    - kind: added
+      description: optional ingress.ingressClassName config
     - kind: changed
-      description: updated default requests and limits for schematool job
+      description: added user and db secret checksums to deployment

charts/fhir-server/README.md

@@ -1,5 +1,5 @@
 
-![Version: 0.8.1](https://img.shields.io/badge/Version-0.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.0.0](https://img.shields.io/badge/AppVersion-5.0.0-informational?style=flat-square)
+![Version: 0.8.2](https://img.shields.io/badge/Version-0.8.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.0.0](https://img.shields.io/badge/AppVersion-5.0.0-informational?style=flat-square)
 
 # The LinuxForHealth FHIR Server Helm Chart
 
@@ -254,6 +254,7 @@ If a truststore Secret is specified, the default truststore file will be replace
 | ingress.annotations | object | `{}` |  |
 | ingress.enabled | bool | `true` |  |
 | ingress.hostname | string | `"{{ .Release.Name }}.example.com"` | The default cluster hostname, used for both ingress.rules.host and ingress.tls.hosts. If you have more than one, you'll need to set overrides for the rules and tls separately. |
+| ingress.ingressClassName | string | `nil` | The name of the Ingress Class associated with this ingress |
 | ingress.rules[0].host | string | `"{{ tpl $.Values.ingress.hostname $ }}"` |  |
 | ingress.rules[0].paths[0].path | string | `"/"` |  |
 | ingress.rules[0].paths[0].pathType | string | `"Prefix"` |  |

charts/fhir-server/templates/deployment.yaml

@@ -18,6 +18,8 @@ spec:
         app.kubernetes.io/component: server
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configMap.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/fhir-db-secret.yaml") . | sha256sum }}
+        checksum/secret: {{ include (print $.Template.BasePath "/fhir-user-secret.yaml") . | sha256sum }}
     spec:
       volumes:
         - name: fhir-server-config

charts/fhir-server/templates/ingress.yaml

@@ -13,6 +13,9 @@ metadata:
     {{- end }}
   {{- end }}
 spec:
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
   rules:
     {{- range .Values.ingress.rules }}
     - host: {{ tpl .host $ | quote }}

charts/fhir-server/values.yaml

@@ -346,6 +346,8 @@ objectStorage:
   batchIdEncryptionKey:
 ingress:
   enabled: true
+  # -- The name of the Ingress Class associated with this ingress
+  ingressClassName:
   annotations: {}
   # -- The default cluster hostname, used for both ingress.rules.host and ingress.tls.hosts.
   # If you have more than one, you'll need to set overrides for the rules and tls separately.