From 564a24c65bb224cd468ef2478cf12a256a3499e8 Mon Sep 17 00:00:00 2001
From: alfredeen <johan.alfredeen@gmail.com>
Date: Fri, 5 Jul 2024 15:04:28 +0200
Subject: [PATCH] Shiny proxy chart v1.2.2. Added configmap to force use of
 IPv4.

---
 apps/shinyproxy/Chart.yaml                    |  2 +-
 apps/shinyproxy/templates/configmap.yaml      | 15 ++++++++++
 .../shinyproxy/templates/shiny-configmap.yaml | 29 +++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 apps/shinyproxy/templates/shiny-configmap.yaml

diff --git a/apps/shinyproxy/Chart.yaml b/apps/shinyproxy/Chart.yaml
index 58227cb..b5fcec8 100644
--- a/apps/shinyproxy/Chart.yaml
+++ b/apps/shinyproxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: shinyproxy
 description: A Helm chart to install Shinyproxy
 type: application
-version: 1.2.1
+version: 1.2.2
 appVersion: "0.1"
 maintainers:
   - name: Team Whale
diff --git a/apps/shinyproxy/templates/configmap.yaml b/apps/shinyproxy/templates/configmap.yaml
index 200dd0c..e38e0cc 100644
--- a/apps/shinyproxy/templates/configmap.yaml
+++ b/apps/shinyproxy/templates/configmap.yaml
@@ -56,4 +56,19 @@ data:
               runAsNonRoot: true
               allowPrivilegeEscalation: false
               privileged: false
+          - op: add
+              path: /spec/volumes
+              value:
+                - name: {{ .Release.Name }}-shiny-configmap
+                  configMap:
+                    name: {{ .Release.Name }}-shiny-configmap
+                    items:
+                    - key: shiny-server.conf
+                      path: shiny-server.conf
+            - op: add
+              path: /spec/containers/0/volumeMounts
+              value:
+                - mountPath: /etc/shiny-server/shiny-server.conf
+                  subPath: shiny-server.conf
+                  name: {{ .Release.Name }}-shiny-configmap
       title: Serve Shiny Proxy
diff --git a/apps/shinyproxy/templates/shiny-configmap.yaml b/apps/shinyproxy/templates/shiny-configmap.yaml
new file mode 100644
index 0000000..1531c11
--- /dev/null
+++ b/apps/shinyproxy/templates/shiny-configmap.yaml
@@ -0,0 +1,29 @@
+# This configmap relates to the shiny app pod spawned by the shinyproxy deployment
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-shiny-configmap
+  namespace: {{ .Release.Namespace }}
+data:
+  shiny-server.conf: |-
+    # Instruct Shiny Server to run applications as the user "shiny"
+    run_as shiny;
+    http_keepalive_timeout 600;
+    # Define a server that listens on user defined port
+    server {
+      listen {{ .Values.appconfig.port }} 0.0.0.0;
+      # Define a location at the base URL
+      location / {
+        # Host the directory of Shiny Apps stored in this directory
+        site_dir /srv/shiny-server;
+        # Log all Shiny output to files in this directory
+        log_dir /var/log/shiny-server;
+        # When a user visits the base URL rather than a particular application,
+        # an index of the applications available in this directory will be shown.
+        directory_index on;
+        app_init_timeout 600;
+        app_idle_timeout 600;
+      }
+      app_init_timeout 600;
+      app_idle_timeout 600;
+    }