Merge pull request #176 from Carrotzpc/main

feat(bff-server): add global-configs and fix logos path issue
kubebb · Mar 8, 2024 · a9e544a · a9e544a
2 parents 35b096d + 9e47bd7
commit a9e544a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/charts/u4a-component/Chart.yaml b/charts/u4a-component/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.5
+version: 0.2.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/u4a-component/templates/bff-server/bff-server-config.yaml b/charts/u4a-component/templates/bff-server/bff-server-config.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.bffServer.enabled -}}
 apiVersion: v1
 data:
   config.yaml: |
@@ -128,3 +129,4 @@ kind: ConfigMap
 metadata:
   name: bff-server-config
   namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/charts/u4a-component/templates/bff-server/bff-server.yaml b/charts/u4a-component/templates/bff-server/bff-server.yaml
@@ -38,9 +38,12 @@ spec:
         - name: cluster-configs-secret
           secret:
             secretName: cluster-configs
-        - name: logos
+        - name: portal-logos-volume
           configMap:
             name: portal-logos
+        - name: portal-global-configs-volume
+          configMap:
+            name: portal-global-configs
         - name: bff-server-config-volume
           configMap:
             name: bff-server-config
@@ -101,12 +104,15 @@ spec:
             - mountPath: /usr/src/app/configs/cluster-configs
               name: cluster-configs-secret
               readOnly: true
-            - mountPath: /usr/src/app/public/profile/img
-              name: logos
+            - mountPath: /usr/src/app/public/bff-public/profile/img
+              name: portal-logos-volume
               readOnly: true
             - name: bff-server-config-volume
               mountPath: /usr/src/app/configs/config.yaml
               subPath: config.yaml
+            - name: portal-global-configs-volume
+              mountPath: /usr/src/app/configs/global-configs
+              subPath: global-configs
 ---
 apiVersion: v1
 kind: Service

diff --git a/charts/u4a-component/templates/bff-server/portal-global-configs.yaml b/charts/u4a-component/templates/bff-server/portal-global-configs.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.bffServer.enabled -}}
+apiVersion: v1
+data:
+  global-configs: |
+    {
+      "theme": {
+        "primaryColor": "#4461eb"
+      },
+      "hideI18n": false
+    }
+kind: ConfigMap
+metadata:
+  name: portal-global-configs
+  namespace: {{ .Release.Namespace }}
+{{- end }}