From 6b5801ddd75d19f88a16f9b8de43a0a7c5c2dbf2 Mon Sep 17 00:00:00 2001
From: Farid Bagishev <farid@bagishev.ru>
Date: Thu, 7 Nov 2024 17:20:08 +0500
Subject: [PATCH] Multibox adjustments

---
 aidbox/Chart.yaml               |  2 +-
 aidbox/README.md                |  3 ++-
 aidbox/templates/configmap.yaml |  2 +-
 aidbox/templates/ingress.yaml   | 20 ++++++++++++++++++--
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/aidbox/Chart.yaml b/aidbox/Chart.yaml
index 0a251ee..015f9f4 100644
--- a/aidbox/Chart.yaml
+++ b/aidbox/Chart.yaml
@@ -5,4 +5,4 @@ home: https://www.health-samurai.io/aidbox
 icon: https://aidbox.github.io/helm-charts/icon.png?1712669999
 name: aidbox
 type: application
-version: 0.1.15
+version: 0.1.16
diff --git a/aidbox/README.md b/aidbox/README.md
index 169e139..deabb56 100644
--- a/aidbox/README.md
+++ b/aidbox/README.md
@@ -2,7 +2,7 @@
 
 [Aidbox](https://docs.aidbox.app/) is an efficient and scalable FHIR server built to handle healthcare data effectively, empowering healthcare providers and developers alike with its comprehensive platform for storing, accessing, and exchanging healthcare information in accordance with FHIR standards.
 
-![Version: 0.1.15](https://img.shields.io/badge/Version-0.1.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: edge](https://img.shields.io/badge/AppVersion-edge-informational?style=flat-square)
+![Version: 0.1.16](https://img.shields.io/badge/Version-0.1.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: edge](https://img.shields.io/badge/AppVersion-edge-informational?style=flat-square)
 
 ## Installation
 
@@ -85,5 +85,6 @@ It will install the Aidbox in the `aidbox` namespace, creating that namespace if
 | startupProbe.httpGet.port | string | `"api"` |  |
 | startupProbe.initialDelaySeconds | int | `20` |  |
 | startupProbe.periodSeconds | int | `5` |  |
+| updateStrategy.type | string | `"RollingUpdate"` |  |
 | volumeMounts | list | `[]` |  |
 | volumes | list | `[]` |  |
diff --git a/aidbox/templates/configmap.yaml b/aidbox/templates/configmap.yaml
index 48ee9cb..b0de62e 100644
--- a/aidbox/templates/configmap.yaml
+++ b/aidbox/templates/configmap.yaml
@@ -10,7 +10,7 @@ data:
   {{ $key }}: {{ $val | quote }}
   {{- end }}
   {{- end }}
-  AIDBOX_BASE_URL: {{ required "missing protocol value" .Values.protocol }}://{{ required "missing host value" .Values.host }}
+  AIDBOX_BASE_URL: {{ required "missing protocol value" .Values.protocol }}://{{ or .Values.config.AIDBOX_CLUSTER_DOMAIN (required "missing host value" .Values.host) }}
   {{- if .Values.config.AIDBOX_FHIR_SCHEMA_VALIDATION }}
   AIDBOX_FHIR_SCHEMA_VALIDATION: "true"
   {{- else }}
diff --git a/aidbox/templates/ingress.yaml b/aidbox/templates/ingress.yaml
index 7c568f9..d09efcb 100644
--- a/aidbox/templates/ingress.yaml
+++ b/aidbox/templates/ingress.yaml
@@ -1,5 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "aidbox.fullname" . -}}
+{{- $host := or .Values.config.AIDBOX_CLUSTER_DOMAIN .Values.host }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -17,11 +18,14 @@ spec:
   {{- if eq .Values.protocol "https" }}
   tls:
     - hosts:
-        - {{ .Values.host | quote }}
+        - {{ $host }}
+        {{- if .Values.config.AIDBOX_CLUSTER_DOMAIN }}
+        - "*.{{ .Values.config.AIDBOX_CLUSTER_DOMAIN }}"
+        {{- end }}
       secretName: {{ $fullName }}-tls
   {{- end }}
   rules:
-    - host: {{ .Values.host | quote }}
+    - host: {{ $host }}
       http:
         paths:
           - path: {{ .Values.ingress.defaultPath | default "/" | quote }}
@@ -31,4 +35,16 @@ spec:
                 name: {{ $fullName }}-api
                 port:
                   number: {{ int .Values.service.apiPort }}
+    {{- if .Values.config.AIDBOX_CLUSTER_DOMAIN }}
+    - host: "*.{{ .Values.config.AIDBOX_CLUSTER_DOMAIN }}"
+      http:
+        paths:
+          - path: {{ .Values.ingress.defaultPath | default "/" | quote }}
+            pathType: {{ .Values.ingress.pathType | default "ImplementationSpecific" | quote }}
+            backend:
+              service:
+                name: {{ $fullName }}-api
+                port:
+                  number: {{ int .Values.service.apiPort }}
+    {{- end }}
 {{- end }}