From 945ecf81c7550c00953769848824a34e421d47cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Vidal=20Garc=C3=ADa?= <marco.vidal@cern.ch>
Date: Tue, 23 Jun 2020 14:52:56 +0200
Subject: [PATCH] helm: add reana-ui configmap

closes reanahub/reana-ui#103
addresses https://github.com/reanahub/reana/issues/277
---
 helm/reana/templates/announcement-config.yaml |  8 --------
 helm/reana/templates/reana-server.yaml        | 11 ++++++-----
 helm/reana/templates/ui-config.yaml           | 15 +++++++++++++++
 helm/reana/values.yaml                        |  5 ++---
 4 files changed, 23 insertions(+), 16 deletions(-)
 delete mode 100644 helm/reana/templates/announcement-config.yaml
 create mode 100644 helm/reana/templates/ui-config.yaml

diff --git a/helm/reana/templates/announcement-config.yaml b/helm/reana/templates/announcement-config.yaml
deleted file mode 100644
index e09c96c5..00000000
--- a/helm/reana/templates/announcement-config.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: announcement-config
-  namespace: {{ .Release.Namespace }}
-data:
-  announcement: ""
diff --git a/helm/reana/templates/reana-server.yaml b/helm/reana/templates/reana-server.yaml
index da09072b..22dfe7f0 100644
--- a/helm/reana/templates/reana-server.yaml
+++ b/helm/reana/templates/reana-server.yaml
@@ -55,6 +55,8 @@ spec:
             name: reana-shared-volume
           - name: uwsgi-config
             mountPath: '/var/reana/uwsgi'
+          - name: ui-config
+            mountPath: '/var/reana/config'
         env:
           - name: REANA_COMPONENT_PREFIX
             value: {{ include "reana.prefix" . }}
@@ -104,11 +106,6 @@ spec:
               secretKeyRef:
                 name: {{ include "reana.prefix" . }}-secrets
                 key: REANA_SECRET_KEY
-          - name: REANA_UI_ANNOUNCEMENT
-            valueFrom:
-              configMapKeyRef:
-                name: announcement-config
-                key: announcement
           {{- if .Values.debug.enabled }}
           # Disable CORS in development environment, for example
           # to connect from an external React application.
@@ -234,3 +231,7 @@ spec:
         configMap:
           defaultMode: 420
           name: uwsgi-config
+      - name: ui-config
+        configMap:
+          defaultMode: 420
+          name: ui-config
diff --git a/helm/reana/templates/ui-config.yaml b/helm/reana/templates/ui-config.yaml
new file mode 100644
index 00000000..b82cca90
--- /dev/null
+++ b/helm/reana/templates/ui-config.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ui-config
+  namespace: {{ .Release.Namespace }}
+data:
+  ui-config.yaml: |
+    announcement: {{ .Values.components.reana_ui.announcement | default "" | quote }}
+    pooling_secs: {{ .Values.components.reana_ui.pooling_secs | default 15 }}
+    docs_url: {{ .Values.components.reana_ui.docs_url | default "http://docs.reana.io/" | quote }}
+    forum_url: {{ .Values.components.reana_ui.forum_url | default "https://forum.reana.io/" | quote }}
+    mattermost_url: {{ .Values.components.reana_ui.mattermost_url | default "https://mattermost.web.cern.ch/it-dep/channels/reana" | quote }}
+    cern_sso: {{ .Values.components.reana_ui.cern_sso | default | default false }}
+    local_users: {{ .Values.components.reana_ui.local_users | default | default false }}
diff --git a/helm/reana/values.yaml b/helm/reana/values.yaml
index b5307deb..91c15e01 100644
--- a/helm/reana/values.yaml
+++ b/helm/reana/values.yaml
@@ -49,6 +49,8 @@ db_env_config:
 components:
   reana_ui:
     enabled: false
+    imagePullPolicy: IfNotPresent
+    image: reanahub/reana-ui:0.6.0-59-g9dacae5
   reana_db:
     enabled: true
   reana_server:
@@ -75,9 +77,6 @@ components:
   reana_message_broker:
     imagePullPolicy: IfNotPresent
     image: reanahub/reana-message-broker:0.6.0-1-gac35315
-  reana_ui:
-    imagePullPolicy: IfNotPresent
-    image: reanahub/reana-ui:0.6.0-59-g9dacae5
 
 notifications:
   enabled: false