3.24.6-rc.3

Signed-off-by: Kenneth Hill <ken.hill@nimbix.net>
nimbix · Jul 2, 2024 · 20b055c · 20b055c
2 parents 49ce3a8 + 5219fd3
commit 20b055c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/templates/jarvice-api.yaml b/templates/jarvice-api.yaml
@@ -101,7 +101,7 @@ spec:
       volumes:
       {{- include "jarvice.rootCertVolume" . | indent 6 }}
       hostAliases:
-      {{- include "jarvice.hostAliases" . | indent 8 }}
+      {{- include "jarvice.hostAliases" . | nindent 8 }}
       containers:
       - name: jarvice-api
         image: {{ include "jarvice.registry" . }}/{{ .Values.jarvice.JARVICE_SYSTEM_REPO_BASE }}/jarvice-api:{{ default .Values.jarvice.JARVICE_IMAGES_TAG .Chart.Annotations.tag }}{{- include "jarvice.version" . }}

diff --git a/templates/jarvice-bird.yaml b/templates/jarvice-bird.yaml
@@ -832,13 +832,23 @@ spec:
 ---
 {{- end }}
 {{- if empty .Values.jarvice_bird.conf.configMap }}
+{{ $config := "files/jarvice-bird-config.json" }}
+{{ $bird_env := $.Values.jarvice_bird.env }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: jarvice-bird-config
 data:
-  jarvice-bird-config.json: |-
-{{ .Files.Get "files/jarvice-bird-config.json" | indent 4 }}
+  jarvice-bird-config.json: |
+{{- range $i, $line := splitList "\n" (.Files.Get $config) }}
+{{- if (eq $i 1) }}
+  {{- printf "\n\"keycloakAdminConsole\": \"%s/admin/%s/console/\","
+    $bird_env.KEYCLOAK_URL
+    $bird_env.KEYCLOAK_REALM | indent 10
+  }}
+{{- end }}
+{{ . | indent 4 }}
+{{- end }}
 ---
 {{- end }}
 {{- if empty .Values.jarvice_bird.nginx.configMap }}